Fix some lint issues

Summary: grpc deprecated `WithInsecure` and the linter complains about it So switch to the new way of doing things. Test Plan: arc lint and run all tests. Reviewers: michelle, zasgar Reviewed By: michelle Signed-off-by: Vihang Mehta <vihang@pixielabs.ai> Differential Revision: https://phab.corp.pixielabs.ai/D11535 GitOrigin-RevId: 0eb1937
wangzhuzhen · Jun 7, 2022 · cd7cc7f · cd7cc7f
1 parent d520d22
commit cd7cc7f
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ test-tsan: ## Run all the tests, with thread sanitizer.
 
 .PHONY: go-mod-tidy
 go-mod-tidy: ## Ensure that go are cleaned up.
-	go mod tidy -compat=1.17
+	go mod tidy -compat=1.18
 
 .PHONY: go-mod-ensure
 go-mod-ensure: ## Ensure that go dependencies exist.

diff --git a/go_deps.bzl b/go_deps.bzl
@@ -1481,10 +1481,10 @@ def pl_go_dependencies():
     )
     go_repository(
         name = "com_github_gogo_protobuf",
+        build_file_proto_mode = "disable",
         importpath = "github.com/gogo/protobuf",
         sum = "h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=",
         version = "v1.3.2",
-        build_file_proto_mode = "disable",
     )
 
     go_repository(

diff --git a/src/cloud/api/ptproxy/BUILD.bazel b/src/cloud/api/ptproxy/BUILD.bazel
@@ -66,6 +66,7 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//metadata",
         "@org_golang_google_grpc//status",
         "@org_golang_google_grpc//test/bufconn",

diff --git a/src/cloud/api/ptproxy/vizier_pt_proxy_test.go b/src/cloud/api/ptproxy/vizier_pt_proxy_test.go
@@ -36,6 +36,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/test/bufconn"
@@ -78,7 +79,7 @@ func createTestState(t *testing.T) (*testState, func(t *testing.T)) {
 	eg.Go(func() error { return s.Serve(lis) })
 
 	ctx := context.Background()
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("Failed to dial bufnet: %v", err)
 	}

diff --git a/src/cloud/vzconn/bridge/BUILD.bazel b/src/cloud/vzconn/bridge/BUILD.bazel
@@ -73,6 +73,7 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@go_googleapis//google/rpc:code_go_proto",
         "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//metadata",
         "@org_golang_google_grpc//status",
         "@org_golang_google_grpc//test/bufconn",

diff --git a/src/cloud/vzconn/bridge/grpc_test.go b/src/cloud/vzconn/bridge/grpc_test.go
@@ -35,6 +35,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/genproto/googleapis/rpc/code"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/test/bufconn"
@@ -82,7 +83,7 @@ func createTestState(t *testing.T, ctrl *gomock.Controller) (*testState, func(t
 	eg.Go(func() error { return s.Serve(lis) })
 
 	ctx := context.Background()
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("Failed to dial bufnet: %v", err)
 	}
@@ -144,11 +145,11 @@ func grpcReader(stream vzconnpb.VZConnService_NATSBridgeClient) chan readMsgWrap
 }
 
 func convertToAny(msg proto.Message) *types.Any {
-	any, err := types.MarshalAny(msg)
+	anyMsg, err := types.MarshalAny(msg)
 	if err != nil {
 		panic(err)
 	}
-	return any
+	return anyMsg
 }
 
 func TestNATSGRPCBridgeHandshakeTest_CorrectRegistration(t *testing.T) {

diff --git a/src/shared/services/BUILD.bazel b/src/shared/services/BUILD.bazel
@@ -45,6 +45,7 @@ go_library(
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//credentials",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//encoding/gzip",
         "@org_golang_google_grpc//status",
     ],

diff --git a/src/shared/services/server/BUILD.bazel b/src/shared/services/server/BUILD.bazel
@@ -57,6 +57,7 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//metadata",
         "@org_golang_google_grpc//status",
         "@org_golang_google_grpc//test/bufconn",

diff --git a/src/shared/services/server/grpc_server_test.go b/src/shared/services/server/grpc_server_test.go
@@ -30,6 +30,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/grpc/test/bufconn"
@@ -110,7 +111,7 @@ func createDialer(lis *bufconn.Listener) func(ctx context.Context, url string) (
 
 func makeTestRequest(ctx context.Context, t *testing.T, lis *bufconn.Listener) (*ping.PingReply, error) {
 	grpc.WithContextDialer(createDialer(lis))
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("did not connect: %v", err)
 	}
@@ -120,7 +121,7 @@ func makeTestRequest(ctx context.Context, t *testing.T, lis *bufconn.Listener) (
 }
 
 func makeTestClientStreamRequest(ctx context.Context, t *testing.T, lis *bufconn.Listener) (*ping.PingReply, error) {
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("did not connect: %v", err)
 	}
@@ -141,7 +142,7 @@ func makeTestClientStreamRequest(ctx context.Context, t *testing.T, lis *bufconn
 }
 
 func makeTestServerStreamRequest(ctx context.Context, t *testing.T, lis *bufconn.Listener) (*ping.PingReply, error) {
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("did not connect: %v", err)
 	}

diff --git a/src/shared/services/service_flags.go b/src/shared/services/service_flags.go
@@ -32,6 +32,7 @@ import (
 	"github.com/spf13/viper"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding/gzip"
 
 	version "px.dev/pixie/src/shared/goversion"
@@ -144,7 +145,7 @@ func GetGRPCClientDialOpts() ([]grpc.DialOption, error) {
 	dialOpts = append(dialOpts, grpc.WithDefaultCallOptions(grpc.UseCompressor(gzip.Name)))
 
 	if viper.GetBool("disable_ssl") {
-		dialOpts = append(dialOpts, grpc.WithInsecure())
+		dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 		return dialOpts, nil
 	}
 
@@ -193,7 +194,7 @@ func GetGRPCClientDialOptsServerSideTLS(isInternal bool) ([]grpc.DialOption, err
 	dialOpts = append(dialOpts, grpc.WithDefaultCallOptions(grpc.UseCompressor(gzip.Name)))
 
 	if viper.GetBool("disable_ssl") {
-		dialOpts = append(dialOpts, grpc.WithInsecure())
+		dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 		return dialOpts, nil
 	}
 

diff --git a/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client/main.go b/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client/main.go
@@ -28,6 +28,7 @@ import (
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding/gzip"
 
 	// ___module___ will get replaced by the module name for the current binary and
@@ -47,7 +48,7 @@ func getDialOpts(compression, https bool) []grpc.DialOption {
 		creds := credentials.NewTLS(tlsConfig)
 		dialOpts = append(dialOpts, grpc.WithTransportCredentials(creds))
 	} else {
-		dialOpts = append(dialOpts, grpc.WithInsecure())
+		dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
 	return dialOpts

diff --git a/src/stirling/testing/demo_apps/hipster_shop/productcatalogservice_client/BUILD.bazel b/src/stirling/testing/demo_apps/hipster_shop/productcatalogservice_client/BUILD.bazel
@@ -27,6 +27,7 @@ go_library(
         "//src/stirling/testing/demo_apps/hipster_shop/proto:demo_pl_go_proto",
         "@com_github_sirupsen_logrus//:logrus",
         "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_grpc//credentials/insecure",
     ],
 )
 

diff --git a/src/stirling/testing/demo_apps/hipster_shop/productcatalogservice_client/client.go b/src/stirling/testing/demo_apps/hipster_shop/productcatalogservice_client/client.go
@@ -23,14 +23,15 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	pb "px.dev/pixie/src/stirling/testing/demo_apps/hipster_shop/proto"
 )
 
 func main() {
 	ctx := context.Background()
 	addr := "localhost:3550"
-	conn, err := grpc.Dial(addr, grpc.WithInsecure())
+	conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return
 	}

diff --git a/src/vizier/services/cloud_connector/bridge/BUILD.bazel b/src/vizier/services/cloud_connector/bridge/BUILD.bazel
@@ -88,6 +88,7 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@io_k8s_api//batch/v1:batch",
         "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//test/bufconn",
         "@org_golang_x_sync//errgroup",
     ],

diff --git a/src/vizier/services/cloud_connector/bridge/server_test.go b/src/vizier/services/cloud_connector/bridge/server_test.go
@@ -35,6 +35,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/test/bufconn"
 	batchv1 "k8s.io/api/batch/v1"
 
@@ -266,7 +267,7 @@ func makeTestState(t *testing.T) (*testState, func(t *testing.T)) {
 	eg.Go(func() error { return s.Serve(lis) })
 
 	ctx := context.Background()
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("Got an error during GRPC setup: %+v", err)
 	}

diff --git a/src/vizier/services/metadata/controllers/BUILD.bazel b/src/vizier/services/metadata/controllers/BUILD.bazel
@@ -92,6 +92,7 @@ go_test(
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//metadata",
         "@org_golang_google_grpc//test/bufconn",
         "@org_golang_x_sync//errgroup",

diff --git a/src/vizier/services/metadata/controllers/server_test.go b/src/vizier/services/metadata/controllers/server_test.go
@@ -36,6 +36,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	grpc_metadata "google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/test/bufconn"
 
@@ -920,7 +921,7 @@ func TestGetAgentUpdates(t *testing.T) {
 	}()
 
 	ctx := context.Background()
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		t.Fatalf("Failed to dial bufnet: %v", err)
 	}

diff --git a/src/vizier/services/query_broker/ptproxy/BUILD.bazel b/src/vizier/services/query_broker/ptproxy/BUILD.bazel
@@ -49,6 +49,7 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//credentials/insecure",
         "@org_golang_google_grpc//test/bufconn",
         "@org_golang_x_sync//errgroup",
     ],

diff --git a/src/vizier/services/query_broker/ptproxy/pt_proxy_test.go b/src/vizier/services/query_broker/ptproxy/pt_proxy_test.go
@@ -33,6 +33,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/test/bufconn"
 
 	"px.dev/pixie/src/api/proto/vizierpb"
@@ -110,7 +111,7 @@ func createTestState(t *testing.T) (*testState, func(t *testing.T)) {
 	eg.Go(func() error { return s.Serve(lis) })
 
 	ctx := context.Background()
-	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithInsecure())
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(createDialer(lis)), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		natsCleanup()
 		t.Fatalf("Failed to dial bufnet: %v", err)