Use grpc.NewClient instead of deprecated ones

mxpv · mxpv · commit 63b468817535 · 2024-07-18T15:26:02.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/client/client.go b/client/client.go
@@ -115,17 +115,14 @@ func New(address string, opts ...Opt) (*Client, error) {
 	}
 	if address != "" {
 		backoffConfig := backoff.DefaultConfig
-		backoffConfig.MaxDelay = 3 * time.Second
+		backoffConfig.MaxDelay = copts.timeout
 		connParams := grpc.ConnectParams{
 			Backoff: backoffConfig,
 		}
 		gopts := []grpc.DialOption{
-			grpc.WithBlock(),
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
-			grpc.FailOnNonTempDialError(true),
 			grpc.WithConnectParams(connParams),
 			grpc.WithContextDialer(dialer.ContextDialer),
-			grpc.WithReturnConnectionError(),
 		}
 		if len(copts.dialOptions) > 0 {
 			gopts = copts.dialOptions
@@ -143,9 +140,7 @@ func New(address string, opts ...Opt) (*Client, error) {
 		}
 
 		connector := func() (*grpc.ClientConn, error) {
-			ctx, cancel := context.WithTimeout(context.Background(), copts.timeout)
-			defer cancel()
-			conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
+			conn, err := grpc.NewClient(dialer.DialAddress(address), gopts...)
 			if err != nil {
 				return nil, fmt.Errorf("failed to dial %q: %w", address, err)
 			}
diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go
@@ -100,15 +100,11 @@ func connect(address string, d func(context.Context, string) (net.Conn, error))
 		Backoff: backoffConfig,
 	}
 	gopts := []grpc.DialOption{
-		grpc.WithBlock(),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithContextDialer(d),
-		grpc.FailOnNonTempDialError(true),
 		grpc.WithConnectParams(connParams),
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-	defer cancel()
-	conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
+	conn, err := grpc.NewClient(dialer.DialAddress(address), gopts...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to dial %q: %w", address, err)
 	}
diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go
@@ -587,7 +587,7 @@ func (pc *proxyClients) getClient(address string) (*grpc.ClientConn, error) {
 		grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),
 	}
 
-	conn, err := grpc.Dial(dialer.DialAddress(address), gopts...)
+	conn, err := grpc.NewClient(dialer.DialAddress(address), gopts...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to dial %q: %w", address, err)
 	}
diff --git a/core/runtime/v2/shim.go b/core/runtime/v2/shim.go
@@ -275,14 +275,10 @@ func makeConnection(ctx context.Context, id string, params client.BootstrapParam
 
 		return ttrpc.NewClient(conn, ttrpc.WithOnClose(onClose)), nil
 	case "grpc":
-		ctx, cancel := context.WithTimeout(ctx, time.Second*100)
-		defer cancel()
-
 		gopts := []grpc.DialOption{
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
-			grpc.WithBlock(),
 		}
-		return grpcDialContext(ctx, params.Address, onClose, gopts...)
+		return grpcDialContext(params.Address, onClose, gopts...)
 	default:
 		return nil, fmt.Errorf("unexpected protocol: %q", params.Protocol)
 	}
@@ -292,7 +288,6 @@ func makeConnection(ctx context.Context, id string, params client.BootstrapParam
 // so we can have something similar to ttrpc.WithOnClose to have
 // a callback run when the connection is severed or explicitly closed.
 func grpcDialContext(
-	ctx context.Context,
 	address string,
 	onClose func(),
 	gopts ...grpc.DialOption,
@@ -316,7 +311,7 @@ func grpcDialContext(
 	conn.Close()
 
 	target := dialer.DialAddress(address)
-	client, err := grpc.DialContext(ctx, target, gopts...)
+	client, err := grpc.NewClient(target, gopts...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create GRPC connection: %w", err)
 	}
diff --git a/internal/cri/io/helpers.go b/internal/cri/io/helpers.go
@@ -245,14 +245,8 @@ func openStream(ctx context.Context, urlStr string) (streamingapi.Stream, error)
 		return stream, nil
 
 	case "grpc":
-		ctx, cancel := context.WithTimeout(ctx, time.Second*100)
-		defer cancel()
-
-		gopts := []grpc.DialOption{
-			grpc.WithTransportCredentials(insecure.NewCredentials()),
-			grpc.WithBlock(),
-		}
-		conn, err := grpc.DialContext(ctx, realAddress, gopts...)
+		gopts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
+		conn, err := grpc.NewClient(realAddress, gopts...)
 		if err != nil {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -115,17 +115,14 @@ func New(address string, opts ...Opt) (*Client, error) {`
`115`	`115`	`}`
`116`	`116`	`if address != "" {`
`117`	`117`	`backoffConfig := backoff.DefaultConfig`
`118`		`- backoffConfig.MaxDelay = 3 * time.Second`
	`118`	`+ backoffConfig.MaxDelay = copts.timeout`
`119`	`119`	`connParams := grpc.ConnectParams{`
`120`	`120`	`Backoff: backoffConfig,`
`121`	`121`	`}`
`122`	`122`	`gopts := []grpc.DialOption{`
`123`		`- grpc.WithBlock(),`
`124`	`123`	`grpc.WithTransportCredentials(insecure.NewCredentials()),`
`125`		`- grpc.FailOnNonTempDialError(true),`
`126`	`124`	`grpc.WithConnectParams(connParams),`
`127`	`125`	`grpc.WithContextDialer(dialer.ContextDialer),`
`128`		`- grpc.WithReturnConnectionError(),`
`129`	`126`	`}`
`130`	`127`	`if len(copts.dialOptions) > 0 {`
`131`	`128`	`gopts = copts.dialOptions`
`@@ -143,9 +140,7 @@ func New(address string, opts ...Opt) (*Client, error) {`
`143`	`140`	`}`
`144`	`141`
`145`	`142`	`connector := func() (*grpc.ClientConn, error) {`
`146`		`- ctx, cancel := context.WithTimeout(context.Background(), copts.timeout)`
`147`		`- defer cancel()`
`148`		`- conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)`
	`143`	`+ conn, err := grpc.NewClient(dialer.DialAddress(address), gopts...)`
`149`	`144`	`if err != nil {`
`150`	`145`	`return nil, fmt.Errorf("failed to dial %q: %w", address, err)`
`151`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,15 +100,11 @@ func connect(address string, d func(context.Context, string) (net.Conn, error))`
`100`	`100`	`Backoff: backoffConfig,`
`101`	`101`	`}`
`102`	`102`	`gopts := []grpc.DialOption{`
`103`		`- grpc.WithBlock(),`
`104`	`103`	`grpc.WithTransportCredentials(insecure.NewCredentials()),`
`105`	`104`	`grpc.WithContextDialer(d),`
`106`		`- grpc.FailOnNonTempDialError(true),`
`107`	`105`	`grpc.WithConnectParams(connParams),`
`108`	`106`	`}`
`109`		`- ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)`
`110`		`- defer cancel()`
`111`		`- conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)`
	`107`	`+ conn, err := grpc.NewClient(dialer.DialAddress(address), gopts...)`
`112`	`108`	`if err != nil {`
`113`	`109`	`return nil, fmt.Errorf("failed to dial %q: %w", address, err)`
`114`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ func (pc proxyClients) getClient(address string) (grpc.ClientConn, error) {`
`587`	`587`	`grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),`
`588`	`588`	`}`
`589`	`589`
`590`		`- conn, err := grpc.Dial(dialer.DialAddress(address), gopts...)`
	`590`	`+ conn, err := grpc.NewClient(dialer.DialAddress(address), gopts...)`
`591`	`591`	`if err != nil {`
`592`	`592`	`return nil, fmt.Errorf("failed to dial %q: %w", address, err)`
`593`	`593`	`}`