From 6b6aa4c39aea0c72116d9124307d1df3f437a795 Mon Sep 17 00:00:00 2001 From: connorwstein Date: Fri, 4 Oct 2024 13:33:17 -0400 Subject: [PATCH] Pass in creds --- integration-tests/deployment/devenv/build_env.go | 2 ++ integration-tests/deployment/devenv/jd.go | 15 ++------------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/integration-tests/deployment/devenv/build_env.go b/integration-tests/deployment/devenv/build_env.go index 3e5af0866fa..6e06f23aaa2 100644 --- a/integration-tests/deployment/devenv/build_env.go +++ b/integration-tests/deployment/devenv/build_env.go @@ -17,6 +17,7 @@ import ( "github.com/stretchr/testify/require" "github.com/subosito/gotenv" "golang.org/x/sync/errgroup" + "google.golang.org/grpc/credentials/insecure" "github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext" @@ -105,6 +106,7 @@ func CreateDockerEnv(t *testing.T) ( GRPC: jd.Grpc, // we will use internal wsrpc for nodes on same docker network to connect to JD WSRPC: jd.InternalWSRPC, + Creds: insecure.NewCredentials(), } } else { jdConfig = JDConfig{ diff --git a/integration-tests/deployment/devenv/jd.go b/integration-tests/deployment/devenv/jd.go index d939048956d..f8902d7da1c 100644 --- a/integration-tests/deployment/devenv/jd.go +++ b/integration-tests/deployment/devenv/jd.go @@ -2,7 +2,6 @@ package devenv import ( "context" - "crypto/tls" "fmt" "google.golang.org/grpc" @@ -17,22 +16,12 @@ import ( type JDConfig struct { GRPC string WSRPC string - creds credentials.TransportCredentials + Creds credentials.TransportCredentials nodeInfo []NodeInfo } func NewJDConnection(cfg JDConfig) (*grpc.ClientConn, error) { - var opts []grpc.DialOption - // TODO: add auth details - if cfg.creds != nil { - opts = append(opts, grpc.WithTransportCredentials(cfg.creds)) - } else { - opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{ - MinVersion: tls.VersionTLS12, - }))) - } - - conn, err := grpc.NewClient(cfg.GRPC, opts...) + conn, err := grpc.NewClient(cfg.GRPC, grpc.WithTransportCredentials(cfg.Creds)) if err != nil { return nil, fmt.Errorf("failed to connect Job Distributor service. Err: %w", err) }