Skip to content

Commit 681334a

Browse files
janardhanvissajanardhanvissa
authored
cleanup: replace dial with newclient (#7943)
1 parent 063d352 commit 681334a

File tree

6 files changed

+63
-48
lines changed

6 files changed

+63
-48
lines changed

‎balancer/rls/balancer_test.go

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,12 @@ func (s) TestConfigUpdate_ChildPolicyConfigs(t *testing.T) {
333333
// Register a manual resolver and push the RLS service config through it.
334334
r := startManualResolverWithConfig(t, rlsConfig)
335335

336-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
336+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
337337
if err != nil {
338-
t.Fatalf("grpc.Dial() failed: %v", err)
338+
t.Fatalf("grpc.NewClient() failed: %v", err)
339339
}
340340
defer cc.Close()
341+
cc.Connect()
341342

342343
// At this point, the RLS LB policy should have received its config, and
343344
// should have created a child policy for the default target.
@@ -448,11 +449,12 @@ func (s) TestConfigUpdate_ChildPolicyChange(t *testing.T) {
448449
// Register a manual resolver and push the RLS service config through it.
449450
r := startManualResolverWithConfig(t, rlsConfig)
450451

451-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
452+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
452453
if err != nil {
453-
t.Fatalf("grpc.Dial() failed: %v", err)
454+
t.Fatalf("grpc.NewClient() failed: %v", err)
454455
}
455456
defer cc.Close()
457+
cc.Connect()
456458

457459
// At this point, the RLS LB policy should have received its config, and
458460
// should have created a child policy for the default target.
@@ -603,11 +605,12 @@ func (s) TestConfigUpdate_DataCacheSizeDecrease(t *testing.T) {
603605
// Register a manual resolver and push the RLS service config through it.
604606
r := startManualResolverWithConfig(t, rlsConfig)
605607

606-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
608+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
607609
if err != nil {
608-
t.Fatalf("grpc.Dial() failed: %v", err)
610+
t.Fatalf("grpc.NewClient() failed: %v", err)
609611
}
610612
defer cc.Close()
613+
cc.Connect()
611614

612615
<-clientConnUpdateDone
613616

@@ -769,11 +772,12 @@ func (s) TestPickerUpdateOnDataCacheSizeDecrease(t *testing.T) {
769772
sc := internal.ParseServiceConfig.(func(string) *serviceconfig.ParseResult)(scJSON)
770773
r.InitialState(resolver.State{ServiceConfig: sc})
771774

772-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
775+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
773776
if err != nil {
774-
t.Fatalf("create grpc.Dial() failed: %v", err)
777+
t.Fatalf("create grpc.NewClient() failed: %v", err)
775778
}
776779
defer cc.Close()
780+
cc.Connect()
777781

778782
<-clientConnUpdateDone
779783

@@ -1151,11 +1155,12 @@ func (s) TestUpdateStatePauses(t *testing.T) {
11511155
sc := internal.ParseServiceConfig.(func(string) *serviceconfig.ParseResult)(scJSON)
11521156
r.InitialState(resolver.State{ServiceConfig: sc})
11531157

1154-
cc, err := grpc.Dial(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
1158+
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
11551159
if err != nil {
1156-
t.Fatalf("grpc.Dial() failed: %v", err)
1160+
t.Fatalf("grpc.NewClient() failed: %v", err)
11571161
}
11581162
defer cc.Close()
1163+
cc.Connect()
11591164

11601165
// Wait for the clientconn update to be processed by the RLS LB policy.
11611166
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)

‎internal/idle/idle_e2e_test.go

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,12 @@ func (s) TestChannelIdleness_Disabled_NoActivity(t *testing.T) {
131131
grpc.WithIdleTimeout(0), // Disable idleness.
132132
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`),
133133
}
134-
cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...)
134+
cc, err := grpc.NewClient(r.Scheme()+":///test.server", dopts...)
135135
if err != nil {
136-
t.Fatalf("grpc.Dial() failed: %v", err)
136+
t.Fatalf("grpc.NewClient() failed: %v", err)
137137
}
138138
defer cc.Close()
139+
cc.Connect()
139140

140141
// Start a test backend and push an address update via the resolver.
141142
backend := stubserver.StartTestService(t, nil)
@@ -177,12 +178,13 @@ func (s) TestChannelIdleness_Enabled_NoActivity(t *testing.T) {
177178
grpc.WithIdleTimeout(defaultTestShortIdleTimeout),
178179
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`),
179180
}
180-
cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...)
181+
cc, err := grpc.NewClient(r.Scheme()+":///test.server", dopts...)
181182
if err != nil {
182-
t.Fatalf("grpc.Dial() failed: %v", err)
183+
t.Fatalf("grpc.NewClient() failed: %v", err)
183184
}
184185
defer cc.Close()
185186

187+
cc.Connect()
186188
// Start a test backend and push an address update via the resolver.
187189
lis := testutils.NewListenerWrapper(t, nil)
188190
backend := stubserver.StartTestService(t, &stubserver.StubServer{Listener: lis})
@@ -265,12 +267,12 @@ func (s) TestChannelIdleness_Enabled_OngoingCall(t *testing.T) {
265267
grpc.WithIdleTimeout(defaultTestShortIdleTimeout),
266268
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`),
267269
}
268-
cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...)
270+
cc, err := grpc.NewClient(r.Scheme()+":///test.server", dopts...)
269271
if err != nil {
270-
t.Fatalf("grpc.Dial() failed: %v", err)
272+
t.Fatalf("grpc.NewClient() failed: %v", err)
271273
}
272274
defer cc.Close()
273-
275+
cc.Connect()
274276
// Start a test backend that keeps the RPC call active by blocking
275277
// on a channel that is closed by the test later on.
276278
blockCh := make(chan struct{})
@@ -354,12 +356,12 @@ func (s) TestChannelIdleness_Enabled_ActiveSinceLastCheck(t *testing.T) {
354356
grpc.WithIdleTimeout(defaultTestShortIdleTimeout),
355357
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`),
356358
}
357-
cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...)
359+
cc, err := grpc.NewClient(r.Scheme()+":///test.server", dopts...)
358360
if err != nil {
359-
t.Fatalf("grpc.Dial() failed: %v", err)
361+
t.Fatalf("grpc.NewClient() failed: %v", err)
360362
}
361363
defer cc.Close()
362-
364+
cc.Connect()
363365
// Start a test backend and push an address update via the resolver.
364366
backend := stubserver.StartTestService(t, nil)
365367
defer backend.Stop()
@@ -423,12 +425,12 @@ func (s) TestChannelIdleness_Enabled_ExitIdleOnRPC(t *testing.T) {
423425
grpc.WithIdleTimeout(defaultTestShortIdleTimeout),
424426
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"round_robin":{}}]}`),
425427
}
426-
cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...)
428+
cc, err := grpc.NewClient(r.Scheme()+":///test.server", dopts...)
427429
if err != nil {
428-
t.Fatalf("grpc.Dial() failed: %v", err)
430+
t.Fatalf("grpc.NewClient() failed: %v", err)
429431
}
430432
defer cc.Close()
431-
433+
cc.Connect()
432434
// Verify that the ClientConn moves to READY.
433435
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
434436
defer cancel()

‎orca/producer_test.go

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,17 @@ func (s) TestProducer(t *testing.T) {
153153
li := &listenerInfo{scChan: make(chan balancer.SubConn, 1), listener: oobLis, opts: lisOpts}
154154
addr := setListenerInfo(resolver.Address{Addr: lis.Addr().String()}, li)
155155
r.InitialState(resolver.State{Addresses: []resolver.Address{addr}})
156-
cc, err := grpc.Dial("whatever:///whatever", grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"customLB":{}}]}`), grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
156+
dopts := []grpc.DialOption{
157+
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"customLB":{}}]}`),
158+
grpc.WithResolvers(r),
159+
grpc.WithTransportCredentials(insecure.NewCredentials()),
160+
}
161+
cc, err := grpc.NewClient("whatever:///whatever", dopts...)
157162
if err != nil {
158-
t.Fatalf("grpc.Dial failed: %v", err)
163+
t.Fatalf("grpc.NewClient() failed: %v", err)
159164
}
160165
defer cc.Close()
161-
166+
cc.Connect()
162167
// Set a few metrics and wait for them on the client side.
163168
smr.SetCPUUtilization(10)
164169
smr.SetMemoryUtilization(0.1)
@@ -319,10 +324,16 @@ func (s) TestProducerBackoff(t *testing.T) {
319324
lisOpts := orca.OOBListenerOptions{ReportInterval: reportInterval}
320325
li := &listenerInfo{scChan: make(chan balancer.SubConn, 1), listener: oobLis, opts: lisOpts}
321326
r.InitialState(resolver.State{Addresses: []resolver.Address{setListenerInfo(resolver.Address{Addr: lis.Addr().String()}, li)}})
322-
cc, err := grpc.Dial("whatever:///whatever", grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"customLB":{}}]}`), grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
327+
dopts := []grpc.DialOption{
328+
grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"customLB":{}}]}`),
329+
grpc.WithResolvers(r),
330+
grpc.WithTransportCredentials(insecure.NewCredentials()),
331+
}
332+
cc, err := grpc.NewClient("whatever:///whatever", dopts...)
323333
if err != nil {
324-
t.Fatalf("grpc.Dial failed: %v", err)
334+
t.Fatalf("grpc.NewClient failed: %v", err)
325335
}
336+
cc.Connect()
326337
defer cc.Close()
327338

328339
// Define a load report to send and expect the client to see.
@@ -431,10 +442,11 @@ func (s) TestProducerMultipleListeners(t *testing.T) {
431442
lisOpts1 := orca.OOBListenerOptions{ReportInterval: reportInterval1}
432443
li := &listenerInfo{scChan: make(chan balancer.SubConn, 1), listener: oobLis1, opts: lisOpts1}
433444
r.InitialState(resolver.State{Addresses: []resolver.Address{setListenerInfo(resolver.Address{Addr: lis.Addr().String()}, li)}})
434-
cc, err := grpc.Dial("whatever:///whatever", grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"customLB":{}}]}`), grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
445+
cc, err := grpc.NewClient("whatever:///whatever", grpc.WithDefaultServiceConfig(`{"loadBalancingConfig": [{"customLB":{}}]}`), grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
435446
if err != nil {
436-
t.Fatalf("grpc.Dial failed: %v", err)
447+
t.Fatalf("grpc.NewClient() failed: %v", err)
437448
}
449+
cc.Connect()
438450
defer cc.Close()
439451

440452
// Ensure the OOB listener is stopped before the client is closed to avoid

‎resolver/manual/manual_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,14 @@ func TestResolver(t *testing.T) {
5959
})
6060

6161
t.Run("happy_path", func(t *testing.T) {
62-
_, err := grpc.Dial("whatever://localhost",
62+
cc, err := grpc.NewClient("whatever://localhost",
6363
grpc.WithTransportCredentials(insecure.NewCredentials()),
6464
grpc.WithResolvers(r))
6565
if err != nil {
66-
t.Errorf("dial setup error: %v", err)
66+
t.Errorf("grpc.NewClient() failed: %v", err)
6767
}
68+
defer cc.Close()
69+
cc.Connect()
6870
r.UpdateState(resolver.State{Addresses: []resolver.Address{
6971
{Addr: "ok"},
7072
}})

‎test/authority_test.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func (s) TestUnixCustomDialer(t *testing.T) {
165165
}
166166
}
167167

168-
// TestColonPortAuthority does an end to end test with the target for grpc.Dial
168+
// TestColonPortAuthority does an end to end test with the target for grpc.NewClient
169169
// being ":[port]". Ensures authority is "localhost:[port]".
170170
func (s) TestColonPortAuthority(t *testing.T) {
171171
expectedAuthority := ""
@@ -189,16 +189,11 @@ func (s) TestColonPortAuthority(t *testing.T) {
189189
authorityMu.Lock()
190190
expectedAuthority = "localhost:" + port
191191
authorityMu.Unlock()
192-
// ss.Start dials, but not the ":[port]" target that is being tested here.
193-
// Dial again, with ":[port]" as the target.
194-
//
195-
// Append "localhost" before calling net.Dial, in case net.Dial on certain
196-
// platforms doesn't work well for address without the IP.
197-
cc, err := grpc.Dial(":"+port, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
198-
return (&net.Dialer{}).DialContext(ctx, "tcp", "localhost"+addr)
199-
}))
192+
// ss.Start dials the server, but we explicitly test with ":[port]"
193+
// as the target.
194+
cc, err := grpc.NewClient(":"+port, grpc.WithTransportCredentials(insecure.NewCredentials()))
200195
if err != nil {
201-
t.Fatalf("grpc.Dial(%q) = %v", ss.Target, err)
196+
t.Fatalf("grpc.NewClient(%q) = %v", ss.Target, err)
202197
}
203198
defer cc.Close()
204199
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)

‎test/roundrobin_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,15 @@ func (s) TestRoundRobin_UpdateAddressAttributes(t *testing.T) {
266266
grpc.WithResolvers(r),
267267
grpc.WithDefaultServiceConfig(rrServiceConfig),
268268
}
269-
cc, err := grpc.Dial(r.Scheme()+":///test.server", dopts...)
269+
// Set an initial resolver update with no address attributes.
270+
addr := resolver.Address{Addr: backend.Address}
271+
r.InitialState(resolver.State{Addresses: []resolver.Address{addr}})
272+
cc, err := grpc.NewClient(r.Scheme()+":///test.server", dopts...)
270273
if err != nil {
271-
t.Fatalf("grpc.Dial() failed: %v", err)
274+
t.Fatalf("grpc.NewClient() failed: %v", err)
272275
}
273276
t.Cleanup(func() { cc.Close() })
274277

275-
// Send a resolver update with no address attributes.
276-
addr := resolver.Address{Addr: backend.Address}
277-
r.UpdateState(resolver.State{Addresses: []resolver.Address{addr}})
278-
279278
// Make an RPC and ensure it does not contain the metadata we are looking for.
280279
client := testgrpc.NewTestServiceClient(cc)
281280
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)

0 commit comments

Comments
 (0)