Use insecure.NewCredentials instead of grpc.WithInsecure

Kazuyoshi Kato · Kazuyoshi Kato · commit 2ee3ce510cf2 · 2021-12-16T23:10:06.000Z
grpc.WithInsecure is being deprecated.

Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/client.go b/client.go
@@ -66,6 +66,7 @@ import (
 	"golang.org/x/sync/semaphore"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/health/grpc_health_v1"
 )
 
@@ -119,7 +120,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 		}
 		gopts := []grpc.DialOption{
 			grpc.WithBlock(),
-			grpc.WithInsecure(),
+			grpc.WithTransportCredentials(insecure.NewCredentials()),
 			grpc.FailOnNonTempDialError(true),
 			grpc.WithConnectParams(connParams),
 			grpc.WithContextDialer(dialer.ContextDialer),
diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go
@@ -32,6 +32,7 @@ import (
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 var publishCommand = cli.Command{
@@ -99,7 +100,7 @@ func connect(address string, d func(gocontext.Context, string) (net.Conn, error)
 	}
 	gopts := []grpc.DialOption{
 		grpc.WithBlock(),
-		grpc.WithInsecure(),
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithContextDialer(d),
 		grpc.FailOnNonTempDialError(true),
 		grpc.WithConnectParams(connParams),
diff --git a/integration/main_test.go b/integration/main_test.go
@@ -43,6 +43,7 @@ import (
 	"github.com/stretchr/testify/require"
 	exec "golang.org/x/sys/execabs"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
@@ -405,7 +406,10 @@ func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
-	conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer))
+	conn, err := grpc.DialContext(ctx, addr,
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+		grpc.WithContextDialer(dialer),
+	)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to connect cri endpoint")
 	}
diff --git a/integration/remote/remote_image.go b/integration/remote/remote_image.go
@@ -39,6 +39,7 @@ import (
 	"time"
 
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"k8s.io/klog/v2"
 
 	internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis"
@@ -64,7 +65,11 @@ func NewImageService(endpoint string, connectionTimeout time.Duration) (internal
 	ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout)
 	defer cancel()
 
-	conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)))
+	conn, err := grpc.DialContext(ctx, addr,
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+		grpc.WithContextDialer(dialer),
+		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)),
+	)
 	if err != nil {
 		klog.Errorf("Connect remote image service %s failed: %v", addr, err)
 		return nil, err
diff --git a/integration/remote/remote_runtime.go b/integration/remote/remote_runtime.go
@@ -40,6 +40,7 @@ import (
 	"time"
 
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"k8s.io/klog/v2"
 
 	internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis"
@@ -73,7 +74,11 @@ func NewRuntimeService(endpoint string, connectionTimeout time.Duration) (intern
 	ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout)
 	defer cancel()
 
-	conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)))
+	conn, err := grpc.DialContext(ctx, addr,
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+		grpc.WithContextDialer(dialer),
+		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)),
+	)
 	if err != nil {
 		klog.Errorf("Connect remote runtime %s failed: %v", addr, err)
 		return nil, err
diff --git a/services/server/server.go b/services/server/server.go
@@ -59,6 +59,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 const (
@@ -548,7 +549,7 @@ func (pc *proxyClients) getClient(address string) (*grpc.ClientConn, error) {
 		Backoff: backoffConfig,
 	}
 	gopts := []grpc.DialOption{
-		grpc.WithInsecure(),
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithConnectParams(connParams),
 		grpc.WithContextDialer(dialer.ContextDialer),
 
diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go
@@ -29,6 +29,7 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 const exporterPlugin = "otlp"
@@ -45,7 +46,7 @@ func init() {
 			}
 			dialOpts := []grpc.DialOption{grpc.WithBlock()}
 			if cfg.Insecure {
-				dialOpts = append(dialOpts, grpc.WithInsecure())
+				dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 			}
 
 			exp, err := otlptracegrpc.New(ic.Context,

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ import (`
`43`	`43`	`"github.com/stretchr/testify/require"`
`44`	`44`	`exec "golang.org/x/sys/execabs"`
`45`	`45`	`"google.golang.org/grpc"`
	`46`	`+ "google.golang.org/grpc/credentials/insecure"`
`46`	`47`	`runtime "k8s.io/cri-api/pkg/apis/runtime/v1"`
`47`	`48`	`)`
`48`	`49`
`@@ -405,7 +406,10 @@ func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {`
`405`	`406`	`}`
`406`	`407`	`ctx, cancel := context.WithTimeout(context.Background(), timeout)`
`407`	`408`	`defer cancel()`
`408`		`- conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer))`
	`409`	`+ conn, err := grpc.DialContext(ctx, addr,`
	`410`	`+ grpc.WithTransportCredentials(insecure.NewCredentials()),`
	`411`	`+ grpc.WithContextDialer(dialer),`
	`412`	`+ )`
`409`	`413`	`if err != nil {`
`410`	`414`	`return nil, errors.Wrap(err, "failed to connect cri endpoint")`
`411`	`415`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ import (`
`59`	`59`	`"google.golang.org/grpc"`
`60`	`60`	`"google.golang.org/grpc/backoff"`
`61`	`61`	`"google.golang.org/grpc/credentials"`
	`62`	`+ "google.golang.org/grpc/credentials/insecure"`
`62`	`63`	`)`
`63`	`64`
`64`	`65`	`const (`
`@@ -548,7 +549,7 @@ func (pc proxyClients) getClient(address string) (grpc.ClientConn, error) {`
`548`	`549`	`Backoff: backoffConfig,`
`549`	`550`	`}`
`550`	`551`	`gopts := []grpc.DialOption{`
`551`		`- grpc.WithInsecure(),`
	`552`	`+ grpc.WithTransportCredentials(insecure.NewCredentials()),`
`552`	`553`	`grpc.WithConnectParams(connParams),`
`553`	`554`	`grpc.WithContextDialer(dialer.ContextDialer),`
`554`	`555`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`sdktrace "go.opentelemetry.io/otel/sdk/trace"`
`30`	`30`	`semconv "go.opentelemetry.io/otel/semconv/v1.4.0"`
`31`	`31`	`"google.golang.org/grpc"`
	`32`	`+ "google.golang.org/grpc/credentials/insecure"`
`32`	`33`	`)`
`33`	`34`
`34`	`35`	`const exporterPlugin = "otlp"`
`@@ -45,7 +46,7 @@ func init() {`
`45`	`46`	`}`
`46`	`47`	`dialOpts := []grpc.DialOption{grpc.WithBlock()}`
`47`	`48`	`if cfg.Insecure {`
`48`		`- dialOpts = append(dialOpts, grpc.WithInsecure())`
	`49`	`+ dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`exp, err := otlptracegrpc.New(ic.Context,`