From 435b5932ad7d2cb12c46e28d928443c17f1ee256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geyslan=20Greg=C3=B3rio?= Date: Fri, 17 May 2024 11:28:13 -0300 Subject: [PATCH] chore: use NewClient instead of Dial (deprecated) grpc pkg introduced NewClient in v1.63.0. SA1019 grpc.Dial is deprecated: use NewClient instead. Will be supported throughout 1.x. --- pkg/containers/runtime/containerd.go | 2 +- pkg/containers/runtime/crio.go | 2 +- pkg/server/grpc/server_test.go | 2 +- tests/e2e-inst-signatures/scripts/ds_writer/ds_writer.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/containers/runtime/containerd.go b/pkg/containers/runtime/containerd.go index 8e43b2cc9997..7917588ef7fb 100644 --- a/pkg/containers/runtime/containerd.go +++ b/pkg/containers/runtime/containerd.go @@ -30,7 +30,7 @@ func ContainerdEnricher(socket string) (ContainerEnricher, error) { return nil, errfmt.WrapError(err) } - conn, err := grpc.Dial(unixSocket, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(unixSocket, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { if errC := client.Close(); errC != nil { logger.Errorw("Closing containerd connection", "error", errC) diff --git a/pkg/containers/runtime/crio.go b/pkg/containers/runtime/crio.go index 8a0623ce0242..45640fac3ba3 100644 --- a/pkg/containers/runtime/crio.go +++ b/pkg/containers/runtime/crio.go @@ -17,7 +17,7 @@ type crioEnricher struct { func CrioEnricher(socket string) (ContainerEnricher, error) { unixSocket := "unix://" + strings.TrimPrefix(socket, "unix://") - conn, err := grpc.Dial(unixSocket, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(unixSocket, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { return nil, errfmt.WrapError(err) } diff --git a/pkg/server/grpc/server_test.go b/pkg/server/grpc/server_test.go index c7e1a2807e56..5f939c6f30d4 100644 --- a/pkg/server/grpc/server_test.go +++ b/pkg/server/grpc/server_test.go @@ -43,7 +43,7 @@ func TestServer(t *testing.T) { func grpcClient(protocol, addr string) pb.TraceeServiceClient { sock := protocol + ":" + addr - conn, err := grpc.Dial(sock, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(sock, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { log.Fatalf("did not connect: %v", err) } diff --git a/tests/e2e-inst-signatures/scripts/ds_writer/ds_writer.go b/tests/e2e-inst-signatures/scripts/ds_writer/ds_writer.go index 7ee155f5c195..198af831807e 100644 --- a/tests/e2e-inst-signatures/scripts/ds_writer/ds_writer.go +++ b/tests/e2e-inst-signatures/scripts/ds_writer/ds_writer.go @@ -63,7 +63,7 @@ func main() { printAndExit("empty value given\n") } - conn, err := grpc.Dial( + conn, err := grpc.NewClient( "unix:///tmp/tracee.sock", grpc.WithTransportCredentials(insecure.NewCredentials()), )