Skip to content

Commit b0f5027

Browse files
janardhanvissajanardhanvissa
authored
cleanup: replace dial with newclient (#7970)
1 parent 52a257e commit b0f5027

File tree

20 files changed

+36
-33
lines changed

20 files changed

+36
-33
lines changed

‎admin/test/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ func RunRegisterTests(t *testing.T, ec ExpectedStatusCodes) {
6868
server.Serve(lis)
6969
}()
7070

71-
conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
71+
conn, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
7272
if err != nil {
73-
t.Fatalf("cannot connect to server: %v", err)
73+
t.Fatalf("grpc.NewClient(%q) = %v", lis.Addr().String(), err)
7474
}
7575

7676
t.Run("channelz", func(t *testing.T) {

‎balancer/grpclb/grpclb_remote_balancer.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,11 @@ func (lb *lbBalancer) newRemoteBalancerCCWrapper() error {
260260
// The grpclb server addresses will set field ServerName, and creds will
261261
// receive ServerName as authority.
262262
target := lb.manualResolver.Scheme() + ":///grpclb.subClientConn"
263-
cc, err := grpc.Dial(target, dopts...)
263+
cc, err := grpc.NewClient(target, dopts...)
264264
if err != nil {
265-
return fmt.Errorf("grpc.Dial(%s): %v", target, err)
265+
return fmt.Errorf("grpc.NewClient(%s): %v", target, err)
266266
}
267+
cc.Connect()
267268
ccw := &remoteBalancerCCWrapper{
268269
cc: cc,
269270
lb: lb,

‎benchmark/benchmark.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ func NewClientConn(addr string, opts ...grpc.DialOption) *grpc.ClientConn {
340340
}
341341

342342
// NewClientConnWithContext creates a gRPC client connection to addr using ctx.
343-
func NewClientConnWithContext(ctx context.Context, addr string, opts ...grpc.DialOption) *grpc.ClientConn {
344-
conn, err := grpc.DialContext(ctx, addr, opts...)
343+
func NewClientConnWithContext(_ context.Context, addr string, opts ...grpc.DialOption) *grpc.ClientConn {
344+
conn, err := grpc.NewClient(addr, opts...)
345345
if err != nil {
346-
logger.Fatalf("NewClientConn(%q) failed to create a ClientConn: %v", addr, err)
346+
logger.Fatalf("grpc.NewClient(%q) = %v", addr, err)
347347
}
348348
return conn
349349
}

‎credentials/alts/internal/handshaker/service/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func Dial(hsAddress string) (*grpc.ClientConn, error) {
5050
// Disable the service config to avoid unnecessary TXT record lookups that
5151
// cause timeouts with some versions of systemd-resolved.
5252
var err error
53-
hsConn, err = grpc.Dial(hsAddress, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDisableServiceConfig())
53+
hsConn, err = grpc.NewClient(hsAddress, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDisableServiceConfig())
5454
if err != nil {
5555
return nil, err
5656
}

‎internal/stubserver/stubserver.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,11 @@ func (ss *StubServer) StartClient(dopts ...grpc.DialOption) error {
225225
opts = append(opts, grpc.WithResolvers(ss.R))
226226
}
227227

228-
cc, err := grpc.Dial(ss.Target, opts...)
228+
cc, err := grpc.NewClient(ss.Target, opts...)
229229
if err != nil {
230-
return fmt.Errorf("grpc.Dial(%q) = %v", ss.Target, err)
230+
return fmt.Errorf("grpc.NewClient(%q) = %v", ss.Target, err)
231231
}
232+
cc.Connect()
232233
ss.CC = cc
233234
if ss.R != nil {
234235
ss.R.UpdateState(resolver.State{Addresses: []resolver.Address{{Addr: ss.Address}}})

‎interop/alts/client/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func main() {
4848
}
4949
altsTC := alts.NewClientCreds(opts)
5050
// Block until the server is ready.
51-
conn, err := grpc.Dial(*serverAddr, grpc.WithTransportCredentials(altsTC), grpc.WithBlock())
51+
conn, err := grpc.NewClient(*serverAddr, grpc.WithTransportCredentials(altsTC))
5252
if err != nil {
53-
logger.Fatalf("gRPC Client: failed to dial the server at %v: %v", *serverAddr, err)
53+
logger.Fatalf("grpc.NewClient(%q) = %v", *serverAddr, err)
5454
}
5555
defer conn.Close()
5656
grpcClient := testgrpc.NewTestServiceClient(conn)

‎interop/client/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func main() {
280280
}
281281
conn, err := grpc.NewClient(serverAddr, opts...)
282282
if err != nil {
283-
logger.Fatalf("Fail to dial: %v", err)
283+
logger.Fatalf("grpc.NewClient(%q) = %v", serverAddr, err)
284284
}
285285
defer conn.Close()
286286
tc := testgrpc.NewTestServiceClient(conn)

‎interop/grpclb_fallback/client_linux.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ func createTestConn() *grpc.ClientConn {
112112
default:
113113
errorLog.Fatalf("Invalid --custom_credentials_type:%v", *customCredentialsType)
114114
}
115-
conn, err := grpc.Dial(*serverURI, opts...)
115+
conn, err := grpc.NewClient(*serverURI, opts...)
116116
if err != nil {
117-
errorLog.Fatalf("Fail to dial: %v", err)
117+
errorLog.Fatalf("grpc.NewClient(%q) = %v", *serverURI, err)
118118
}
119119
return conn
120120
}

‎interop/http2/negative_http2_client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ func main() {
133133
serverAddr := net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))
134134
var opts []grpc.DialOption
135135
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
136-
conn, err := grpc.Dial(serverAddr, opts...)
136+
conn, err := grpc.NewClient(serverAddr, opts...)
137137
if err != nil {
138-
logger.Fatalf("Fail to dial: %v", err)
138+
logger.Fatalf("grpc.NewClient(%q) = %v", serverAddr, err)
139139
}
140140
defer conn.Close()
141141
tc := testgrpc.NewTestServiceClient(conn)

‎interop/observability/client/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ func main() {
5757
if *serverPort != 0 {
5858
serverAddr = net.JoinHostPort(*serverHost, strconv.Itoa(*serverPort))
5959
}
60-
conn, err := grpc.Dial(serverAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
60+
conn, err := grpc.NewClient(serverAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
6161
if err != nil {
62-
log.Fatalf("Fail to dial: %v", err)
62+
log.Fatalf("grpc.NewClient(%q) = %v", serverAddr, err)
6363
}
6464
defer conn.Close()
6565
tc := testgrpc.NewTestServiceClient(conn)

‎interop/stress/client/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ func newConn(address string, useTLS, testCA bool, tlsServerName string) (*grpc.C
319319
} else {
320320
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
321321
}
322-
return grpc.Dial(address, opts...)
322+
return grpc.NewClient(address, opts...)
323323
}
324324

325325
func main() {

‎interop/stress/metrics_client/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ func main() {
7575
logger.Fatal("-metrics_server_address is unset")
7676
}
7777

78-
conn, err := grpc.Dial(*metricsServerAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
78+
conn, err := grpc.NewClient(*metricsServerAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
7979
if err != nil {
80-
logger.Fatalf("cannot connect to metrics server: %v", err)
80+
logger.Fatalf("grpc.NewClient(%q) = %v", metricsServerAddress, err)
8181
}
8282
defer conn.Close()
8383

‎interop/xds/client/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,9 @@ func main() {
437437

438438
clients := make([]testgrpc.TestServiceClient, *numChannels)
439439
for i := 0; i < *numChannels; i++ {
440-
conn, err := grpc.Dial(*server, grpc.WithTransportCredentials(creds))
440+
conn, err := grpc.NewClient(*server, grpc.WithTransportCredentials(creds))
441441
if err != nil {
442-
logger.Fatalf("Fail to dial: %v", err)
442+
logger.Fatalf("grpc.NewClient(%q) = %v", *server, err)
443443
}
444444
defer conn.Close()
445445
clients[i] = testgrpc.NewTestServiceClient(conn)

‎interop/xds_federation/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func main() {
9595
}
9696
cc, err := grpc.NewClient(uris[i], opts...)
9797
if err != nil {
98-
logger.Fatalf("Fail to dial %v: %v", uris[i], err)
98+
logger.Fatalf("grpc.NewClient(%q) = %v", uris[i], err)
9999
}
100100
defer cc.Close()
101101
clients = append(clients, clientConfig{

‎profiling/cmd/remote.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ func remoteCommand() error {
7979
}
8080

8181
logger.Infof("dialing %s", *flagAddress)
82-
cc, err := grpc.Dial(*flagAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
82+
cc, err := grpc.NewClient(*flagAddress, grpc.WithTransportCredentials(insecure.NewCredentials()))
8383
if err != nil {
84-
logger.Errorf("cannot dial %s: %v", *flagAddress, err)
84+
logger.Fatalf("grpc.NewClient(%q) = %v", *flagAddress, err)
8585
return err
8686
}
8787
defer cc.Close()

‎resolver/manual/manual.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (r *Resolver) UpdateState(s resolver.State) {
110110
defer r.mu.Unlock()
111111
var err error
112112
if r.CC == nil {
113-
panic("cannot update state as grpc.Dial with resolver has not been called")
113+
panic("cannot update state as channel has not exited IDLE state")
114114
}
115115
err = r.CC.UpdateState(s)
116116
r.lastSeenState = &s
@@ -122,7 +122,7 @@ func (r *Resolver) ReportError(err error) {
122122
r.mu.Lock()
123123
defer r.mu.Unlock()
124124
if r.CC == nil {
125-
panic("cannot report error as grpc.Dial with resolver has not been called")
125+
panic("cannot report error as channel has not exited IDLE state")
126126
}
127127
r.CC.ReportError(err)
128128
}

‎resolver/manual/manual_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestResolver(t *testing.T) {
3838

3939
t.Run("update_state_panics", func(t *testing.T) {
4040
defer func() {
41-
want := "cannot update state as grpc.Dial with resolver has not been called"
41+
want := "cannot update state as channel has not exited IDLE state"
4242
if r := recover(); r != want {
4343
t.Errorf("expected panic %q, got %q", want, r)
4444
}
@@ -50,7 +50,7 @@ func TestResolver(t *testing.T) {
5050
})
5151
t.Run("report_error_panics", func(t *testing.T) {
5252
defer func() {
53-
want := "cannot report error as grpc.Dial with resolver has not been called"
53+
want := "cannot report error as channel has not exited IDLE state"
5454
if r := recover(); r != want {
5555
t.Errorf("expected panic %q, got %q", want, r)
5656
}

‎test/goaway_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ func (s) TestGoAwayStreamIDSmallerThanCreatedStreams(t *testing.T) {
677677
}
678678
defer cc.Close()
679679
cc.Connect()
680+
680681
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
681682
defer cancel()
682683

‎test/xds/xds_client_certificate_providers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (s) TestClientSideXDS_WithNoCertificateProvidersInBootstrap_Failure(t *test
169169
// Create a ClientConn and ensure that it moves to TRANSIENT_FAILURE.
170170
cc, err := grpc.NewClient(fmt.Sprintf("xds:///%s", serviceName), grpc.WithTransportCredentials(creds), grpc.WithResolvers(resolverBuilder))
171171
if err != nil {
172-
t.Fatalf("failed to create a client for server: %v", err)
172+
t.Fatalf("grpc.NewClient() failed: %v", err)
173173
}
174174
defer cc.Close()
175175
cc.Connect()

‎xds/internal/test/e2e/e2e.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func newClient(target, binaryPath, bootstrap string, logger io.Writer, flags ...
7171
)
7272
cmd.Start()
7373

74-
cc, err := grpc.Dial(fmt.Sprintf("localhost:%d", clientStatsPort), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions(grpc.WaitForReady(true)))
74+
cc, err := grpc.NewClient(fmt.Sprintf("localhost:%d", clientStatsPort), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions(grpc.WaitForReady(true)))
7575
if err != nil {
7676
return nil, err
7777
}

0 commit comments

Comments
 (0)