diff --git a/balancer/endpointsharding/endpointsharding_test.go b/balancer/endpointsharding/endpointsharding_test.go index 64dd56e4701b..a4f6fe6c6c91 100644 --- a/balancer/endpointsharding/endpointsharding_test.go +++ b/balancer/endpointsharding/endpointsharding_test.go @@ -142,9 +142,9 @@ func (s) TestEndpointShardingBasic(t *testing.T) { ServiceConfig: sc, }) - cc, err := grpc.Dial(mr.Scheme()+":///", grpc.WithResolvers(mr), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(mr.Scheme()+":///", grpc.WithResolvers(mr), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - log.Fatalf("Failed to dial: %v", err) + log.Fatalf("Failed to create new client: %v", err) } defer cc.Close() ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) diff --git a/balancer/rls/balancer_test.go b/balancer/rls/balancer_test.go index 12b5e4c8d490..16fa77354cde 100644 --- a/balancer/rls/balancer_test.go +++ b/balancer/rls/balancer_test.go @@ -80,9 +80,9 @@ func (s) TestConfigUpdate_ControlChannel(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -166,9 +166,9 @@ func (s) TestConfigUpdate_ControlChannelWithCreds(t *testing.T) { // server certificate used for the RLS server and the backend specifies a // DNS SAN of "*.test.example.com". Hence we use a dial target which is a // subdomain of the same here. - cc, err := grpc.Dial(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(clientCreds)) + cc, err := grpc.NewClient(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(clientCreds)) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -226,9 +226,9 @@ func (s) TestConfigUpdate_ControlChannelServiceConfig(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -263,9 +263,9 @@ func (s) TestConfigUpdate_DefaultTarget(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -537,9 +537,9 @@ func (s) TestConfigUpdate_BadChildPolicyConfigs(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -866,9 +866,9 @@ func (s) TestDataCachePurging(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -957,9 +957,9 @@ func (s) TestControlChannelConnectivityStateMonitoring(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() diff --git a/balancer/rls/picker_test.go b/balancer/rls/picker_test.go index d9ce0c2432cb..fb38d9812835 100644 --- a/balancer/rls/picker_test.go +++ b/balancer/rls/picker_test.go @@ -56,10 +56,10 @@ func (s) TestNoNonEmptyTargetsReturnsError(t *testing.T) { rlsConfig := buildBasicRLSConfigWithChildPolicy(t, t.Name(), rlsServer.Address) r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -89,9 +89,9 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_ThrottledWithDefaultTarget(t *tes // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -119,10 +119,10 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_ThrottledWithoutDefaultTarget(t * // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -150,10 +150,10 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_NotThrottled(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -214,10 +214,10 @@ func (s) TestPick_DataCacheMiss_PendingEntryExists(t *testing.T) { // through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -267,10 +267,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ValidEntry(t *testing.T) { // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -330,10 +330,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ValidEntry_WithHeaderData(t *testi // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -397,10 +397,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_StaleEntry(t *testing.T) { // through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -506,10 +506,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ExpiredEntry(t *testing.T) { // through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -604,10 +604,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ExpiredEntryInBackoff(t *testing.T // Register a manual resolver and push the RLS service config through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -706,10 +706,10 @@ func (s) TestPick_DataCacheHit_PendingEntryExists_StaleEntry(t *testing.T) { // through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() @@ -804,10 +804,10 @@ func (s) TestPick_DataCacheHit_PendingEntryExists_ExpiredEntry(t *testing.T) { // through it. r := startManualResolverWithConfig(t, rlsConfig) - // Dial the backend. - cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) + // Create new client. + cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - t.Fatalf("grpc.Dial() failed: %v", err) + t.Fatalf("Failed to create gRPC client: %v", err) } defer cc.Close() diff --git a/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go b/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go index 8bde92bc6556..5f6f6e9ee436 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go +++ b/xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go @@ -1182,9 +1182,9 @@ func (s) TestAggregateCluster_Fallback_EDS_ResourceNotFound(t *testing.T) { r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, xdsClient)) // Create a ClientConn. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() diff --git a/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go b/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go index c54424376d3a..af6224585aca 100644 --- a/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go +++ b/xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go @@ -179,9 +179,9 @@ func (s) TestEDS_OneLocality(t *testing.T) { r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, client)) // Create a ClientConn and make a successful RPC. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() @@ -314,9 +314,9 @@ func (s) TestEDS_MultipleLocalities(t *testing.T) { r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, client)) // Create a ClientConn and make a successful RPC. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() @@ -478,9 +478,9 @@ func (s) TestEDS_EndpointsHealth(t *testing.T) { r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, client)) // Create a ClientConn and make a successful RPC. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() @@ -553,9 +553,9 @@ func (s) TestEDS_EmptyUpdate(t *testing.T) { // Create a ClientConn and ensure that RPCs fail with "all priorities // removed" error. This is the expected error when the cluster_resolver LB // policy receives an EDS update with no localities. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() testClient := testgrpc.NewTestServiceClient(cc) @@ -951,9 +951,9 @@ func (s) TestEDS_BadUpdateWithoutPreviousGoodUpdate(t *testing.T) { // Create a ClientConn and verify that RPCs fail with "all priorities // removed" error. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() client := testgrpc.NewTestServiceClient(cc) @@ -1022,9 +1022,9 @@ func (s) TestEDS_BadUpdateWithPreviousGoodUpdate(t *testing.T) { r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, xdsClient)) // Create a ClientConn and make a successful RPC. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() @@ -1104,9 +1104,9 @@ func (s) TestEDS_ResourceNotFound(t *testing.T) { // Create a ClientConn and verify that RPCs fail with "all priorities // removed" error. - cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) + cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r)) if err != nil { - t.Fatalf("failed to dial local test server: %v", err) + t.Fatalf("failed to create new client for local test server: %v", err) } defer cc.Close() client := testgrpc.NewTestServiceClient(cc)