Skip to content

Commit e7a8097

Browse files
hanut19hanut19
authored
cleanup: replace grpc.Dial with grpc.NewClient in tests (#7640)
1 parent bcf9171 commit e7a8097

File tree

5 files changed

+67
-67
lines changed

5 files changed

+67
-67
lines changed

‎balancer/endpointsharding/endpointsharding_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ func (s) TestEndpointShardingBasic(t *testing.T) {
142142
ServiceConfig: sc,
143143
})
144144

145-
cc, err := grpc.Dial(mr.Scheme()+":///", grpc.WithResolvers(mr), grpc.WithTransportCredentials(insecure.NewCredentials()))
145+
cc, err := grpc.NewClient(mr.Scheme()+":///", grpc.WithResolvers(mr), grpc.WithTransportCredentials(insecure.NewCredentials()))
146146
if err != nil {
147-
log.Fatalf("Failed to dial: %v", err)
147+
log.Fatalf("Failed to create new client: %v", err)
148148
}
149149
defer cc.Close()
150150
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)

‎balancer/rls/balancer_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ func (s) TestConfigUpdate_ControlChannel(t *testing.T) {
8080
// Register a manual resolver and push the RLS service config through it.
8181
r := startManualResolverWithConfig(t, rlsConfig)
8282

83-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
83+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
8484
if err != nil {
85-
t.Fatalf("grpc.Dial() failed: %v", err)
85+
t.Fatalf("Failed to create gRPC client: %v", err)
8686
}
8787
defer cc.Close()
8888

@@ -166,9 +166,9 @@ func (s) TestConfigUpdate_ControlChannelWithCreds(t *testing.T) {
166166
// server certificate used for the RLS server and the backend specifies a
167167
// DNS SAN of "*.test.example.com". Hence we use a dial target which is a
168168
// subdomain of the same here.
169-
cc, err := grpc.Dial(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(clientCreds))
169+
cc, err := grpc.NewClient(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(clientCreds))
170170
if err != nil {
171-
t.Fatalf("grpc.Dial() failed: %v", err)
171+
t.Fatalf("Failed to create gRPC client: %v", err)
172172
}
173173
defer cc.Close()
174174

@@ -226,9 +226,9 @@ func (s) TestConfigUpdate_ControlChannelServiceConfig(t *testing.T) {
226226
// Register a manual resolver and push the RLS service config through it.
227227
r := startManualResolverWithConfig(t, rlsConfig)
228228

229-
cc, err := grpc.Dial(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
229+
cc, err := grpc.NewClient(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
230230
if err != nil {
231-
t.Fatalf("grpc.Dial() failed: %v", err)
231+
t.Fatalf("Failed to create gRPC client: %v", err)
232232
}
233233
defer cc.Close()
234234

@@ -263,9 +263,9 @@ func (s) TestConfigUpdate_DefaultTarget(t *testing.T) {
263263
// Register a manual resolver and push the RLS service config through it.
264264
r := startManualResolverWithConfig(t, rlsConfig)
265265

266-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
266+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
267267
if err != nil {
268-
t.Fatalf("grpc.Dial() failed: %v", err)
268+
t.Fatalf("Failed to create gRPC client: %v", err)
269269
}
270270
defer cc.Close()
271271

@@ -537,9 +537,9 @@ func (s) TestConfigUpdate_BadChildPolicyConfigs(t *testing.T) {
537537
// Register a manual resolver and push the RLS service config through it.
538538
r := startManualResolverWithConfig(t, rlsConfig)
539539

540-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
540+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
541541
if err != nil {
542-
t.Fatalf("grpc.Dial() failed: %v", err)
542+
t.Fatalf("Failed to create gRPC client: %v", err)
543543
}
544544
defer cc.Close()
545545

@@ -866,9 +866,9 @@ func (s) TestDataCachePurging(t *testing.T) {
866866
// Register a manual resolver and push the RLS service config through it.
867867
r := startManualResolverWithConfig(t, rlsConfig)
868868

869-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
869+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
870870
if err != nil {
871-
t.Fatalf("grpc.Dial() failed: %v", err)
871+
t.Fatalf("Failed to create gRPC client: %v", err)
872872
}
873873
defer cc.Close()
874874

@@ -957,9 +957,9 @@ func (s) TestControlChannelConnectivityStateMonitoring(t *testing.T) {
957957
// Register a manual resolver and push the RLS service config through it.
958958
r := startManualResolverWithConfig(t, rlsConfig)
959959

960-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
960+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
961961
if err != nil {
962-
t.Fatalf("grpc.Dial() failed: %v", err)
962+
t.Fatalf("Failed to create gRPC client: %v", err)
963963
}
964964
defer cc.Close()
965965

‎balancer/rls/picker_test.go‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ func (s) TestNoNonEmptyTargetsReturnsError(t *testing.T) {
5656
rlsConfig := buildBasicRLSConfigWithChildPolicy(t, t.Name(), rlsServer.Address)
5757
r := startManualResolverWithConfig(t, rlsConfig)
5858

59-
// Dial the backend.
60-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
59+
// Create new client.
60+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
6161
if err != nil {
62-
t.Fatalf("grpc.Dial() failed: %v", err)
62+
t.Fatalf("Failed to create gRPC client: %v", err)
6363
}
6464
defer cc.Close()
6565

@@ -89,9 +89,9 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_ThrottledWithDefaultTarget(t *tes
8989
// Register a manual resolver and push the RLS service config through it.
9090
r := startManualResolverWithConfig(t, rlsConfig)
9191

92-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
92+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
9393
if err != nil {
94-
t.Fatalf("grpc.Dial() failed: %v", err)
94+
t.Fatalf("Failed to create gRPC client: %v", err)
9595
}
9696
defer cc.Close()
9797

@@ -119,10 +119,10 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_ThrottledWithoutDefaultTarget(t *
119119
// Register a manual resolver and push the RLS service config through it.
120120
r := startManualResolverWithConfig(t, rlsConfig)
121121

122-
// Dial the backend.
123-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
122+
// Create new client.
123+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
124124
if err != nil {
125-
t.Fatalf("grpc.Dial() failed: %v", err)
125+
t.Fatalf("Failed to create gRPC client: %v", err)
126126
}
127127
defer cc.Close()
128128

@@ -150,10 +150,10 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_NotThrottled(t *testing.T) {
150150
// Register a manual resolver and push the RLS service config through it.
151151
r := startManualResolverWithConfig(t, rlsConfig)
152152

153-
// Dial the backend.
154-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
153+
// Create new client.
154+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
155155
if err != nil {
156-
t.Fatalf("grpc.Dial() failed: %v", err)
156+
t.Fatalf("Failed to create gRPC client: %v", err)
157157
}
158158
defer cc.Close()
159159

@@ -214,10 +214,10 @@ func (s) TestPick_DataCacheMiss_PendingEntryExists(t *testing.T) {
214214
// through it.
215215
r := startManualResolverWithConfig(t, rlsConfig)
216216

217-
// Dial the backend.
218-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
217+
// Create new client.
218+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
219219
if err != nil {
220-
t.Fatalf("grpc.Dial() failed: %v", err)
220+
t.Fatalf("Failed to create gRPC client: %v", err)
221221
}
222222
defer cc.Close()
223223

@@ -267,10 +267,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ValidEntry(t *testing.T) {
267267
// Register a manual resolver and push the RLS service config through it.
268268
r := startManualResolverWithConfig(t, rlsConfig)
269269

270-
// Dial the backend.
271-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
270+
// Create new client.
271+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
272272
if err != nil {
273-
t.Fatalf("grpc.Dial() failed: %v", err)
273+
t.Fatalf("Failed to create gRPC client: %v", err)
274274
}
275275
defer cc.Close()
276276

@@ -330,10 +330,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ValidEntry_WithHeaderData(t *testi
330330
// Register a manual resolver and push the RLS service config through it.
331331
r := startManualResolverWithConfig(t, rlsConfig)
332332

333-
// Dial the backend.
334-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
333+
// Create new client.
334+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
335335
if err != nil {
336-
t.Fatalf("grpc.Dial() failed: %v", err)
336+
t.Fatalf("Failed to create gRPC client: %v", err)
337337
}
338338
defer cc.Close()
339339

@@ -397,10 +397,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_StaleEntry(t *testing.T) {
397397
// through it.
398398
r := startManualResolverWithConfig(t, rlsConfig)
399399

400-
// Dial the backend.
401-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
400+
// Create new client.
401+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
402402
if err != nil {
403-
t.Fatalf("grpc.Dial() failed: %v", err)
403+
t.Fatalf("Failed to create gRPC client: %v", err)
404404
}
405405
defer cc.Close()
406406

@@ -506,10 +506,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ExpiredEntry(t *testing.T) {
506506
// through it.
507507
r := startManualResolverWithConfig(t, rlsConfig)
508508

509-
// Dial the backend.
510-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
509+
// Create new client.
510+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
511511
if err != nil {
512-
t.Fatalf("grpc.Dial() failed: %v", err)
512+
t.Fatalf("Failed to create gRPC client: %v", err)
513513
}
514514
defer cc.Close()
515515

@@ -604,10 +604,10 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ExpiredEntryInBackoff(t *testing.T
604604
// Register a manual resolver and push the RLS service config through it.
605605
r := startManualResolverWithConfig(t, rlsConfig)
606606

607-
// Dial the backend.
608-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
607+
// Create new client.
608+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
609609
if err != nil {
610-
t.Fatalf("grpc.Dial() failed: %v", err)
610+
t.Fatalf("Failed to create gRPC client: %v", err)
611611
}
612612
defer cc.Close()
613613

@@ -706,10 +706,10 @@ func (s) TestPick_DataCacheHit_PendingEntryExists_StaleEntry(t *testing.T) {
706706
// through it.
707707
r := startManualResolverWithConfig(t, rlsConfig)
708708

709-
// Dial the backend.
710-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
709+
// Create new client.
710+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
711711
if err != nil {
712-
t.Fatalf("grpc.Dial() failed: %v", err)
712+
t.Fatalf("Failed to create gRPC client: %v", err)
713713
}
714714
defer cc.Close()
715715

@@ -804,10 +804,10 @@ func (s) TestPick_DataCacheHit_PendingEntryExists_ExpiredEntry(t *testing.T) {
804804
// through it.
805805
r := startManualResolverWithConfig(t, rlsConfig)
806806

807-
// Dial the backend.
808-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
807+
// Create new client.
808+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
809809
if err != nil {
810-
t.Fatalf("grpc.Dial() failed: %v", err)
810+
t.Fatalf("Failed to create gRPC client: %v", err)
811811
}
812812
defer cc.Close()
813813

‎xds/internal/balancer/clusterresolver/e2e_test/aggregate_cluster_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,9 +1182,9 @@ func (s) TestAggregateCluster_Fallback_EDS_ResourceNotFound(t *testing.T) {
11821182
r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, xdsClient))
11831183

11841184
// Create a ClientConn.
1185-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
1185+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
11861186
if err != nil {
1187-
t.Fatalf("failed to dial local test server: %v", err)
1187+
t.Fatalf("failed to create new client for local test server: %v", err)
11881188
}
11891189
defer cc.Close()
11901190

‎xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ func (s) TestEDS_OneLocality(t *testing.T) {
179179
r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, client))
180180

181181
// Create a ClientConn and make a successful RPC.
182-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
182+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
183183
if err != nil {
184-
t.Fatalf("failed to dial local test server: %v", err)
184+
t.Fatalf("failed to create new client for local test server: %v", err)
185185
}
186186
defer cc.Close()
187187

@@ -314,9 +314,9 @@ func (s) TestEDS_MultipleLocalities(t *testing.T) {
314314
r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, client))
315315

316316
// Create a ClientConn and make a successful RPC.
317-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
317+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
318318
if err != nil {
319-
t.Fatalf("failed to dial local test server: %v", err)
319+
t.Fatalf("failed to create new client for local test server: %v", err)
320320
}
321321
defer cc.Close()
322322

@@ -478,9 +478,9 @@ func (s) TestEDS_EndpointsHealth(t *testing.T) {
478478
r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, client))
479479

480480
// Create a ClientConn and make a successful RPC.
481-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
481+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
482482
if err != nil {
483-
t.Fatalf("failed to dial local test server: %v", err)
483+
t.Fatalf("failed to create new client for local test server: %v", err)
484484
}
485485
defer cc.Close()
486486

@@ -553,9 +553,9 @@ func (s) TestEDS_EmptyUpdate(t *testing.T) {
553553
// Create a ClientConn and ensure that RPCs fail with "all priorities
554554
// removed" error. This is the expected error when the cluster_resolver LB
555555
// policy receives an EDS update with no localities.
556-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
556+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
557557
if err != nil {
558-
t.Fatalf("failed to dial local test server: %v", err)
558+
t.Fatalf("failed to create new client for local test server: %v", err)
559559
}
560560
defer cc.Close()
561561
testClient := testgrpc.NewTestServiceClient(cc)
@@ -951,9 +951,9 @@ func (s) TestEDS_BadUpdateWithoutPreviousGoodUpdate(t *testing.T) {
951951

952952
// Create a ClientConn and verify that RPCs fail with "all priorities
953953
// removed" error.
954-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
954+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
955955
if err != nil {
956-
t.Fatalf("failed to dial local test server: %v", err)
956+
t.Fatalf("failed to create new client for local test server: %v", err)
957957
}
958958
defer cc.Close()
959959
client := testgrpc.NewTestServiceClient(cc)
@@ -1022,9 +1022,9 @@ func (s) TestEDS_BadUpdateWithPreviousGoodUpdate(t *testing.T) {
10221022
r.InitialState(xdsclient.SetClient(resolver.State{ServiceConfig: scpr}, xdsClient))
10231023

10241024
// Create a ClientConn and make a successful RPC.
1025-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
1025+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
10261026
if err != nil {
1027-
t.Fatalf("failed to dial local test server: %v", err)
1027+
t.Fatalf("failed to create new client for local test server: %v", err)
10281028
}
10291029
defer cc.Close()
10301030

@@ -1104,9 +1104,9 @@ func (s) TestEDS_ResourceNotFound(t *testing.T) {
11041104

11051105
// Create a ClientConn and verify that RPCs fail with "all priorities
11061106
// removed" error.
1107-
cc, err := grpc.Dial(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
1107+
cc, err := grpc.NewClient(r.Scheme()+":///test.service", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithResolvers(r))
11081108
if err != nil {
1109-
t.Fatalf("failed to dial local test server: %v", err)
1109+
t.Fatalf("failed to create new client for local test server: %v", err)
11101110
}
11111111
defer cc.Close()
11121112
client := testgrpc.NewTestServiceClient(cc)

0 commit comments

Comments
 (0)