Merge pull request #2416 from alexandear/guestagent/refactor-grpc-newclient

AkihiroSuda · web-flow · commit fe9f17b48c8c · 2024-06-13T08:45:08.000+09:00
guestagent: refactor to grpc.NewClient
diff --git a/pkg/guestagent/api/client/client.go b/pkg/guestagent/api/client/client.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/lima-vm/lima/pkg/guestagent/api"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/resolver"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
@@ -21,7 +22,8 @@ func NewGuestAgentClient(dialFn func(ctx context.Context) (net.Conn, error)) (*G
 		grpc.WithTransportCredentials(NewCredentials()),
 	}
 
-	clientConn, err := grpc.Dial("", opts...) //nolint:staticcheck // SA1019: grpc.Dial is deprecated: use NewClient instead.  Will be supported throughout 1.x
+	resolver.SetDefaultScheme("passthrough")
+	clientConn, err := grpc.NewClient("", opts...)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/lima-vm/lima/pkg/guestagent/api"`
`8`	`8`	`"google.golang.org/grpc"`
	`9`	`+ "google.golang.org/grpc/resolver"`
`9`	`10`	`"google.golang.org/protobuf/types/known/emptypb"`
`10`	`11`	`)`
`11`	`12`
`@@ -21,7 +22,8 @@ func NewGuestAgentClient(dialFn func(ctx context.Context) (net.Conn, error)) (*G`
`21`	`22`	`grpc.WithTransportCredentials(NewCredentials()),`
`22`	`23`	`}`
`23`	`24`
`24`		`- clientConn, err := grpc.Dial("", opts...) //nolint:staticcheck // SA1019: grpc.Dial is deprecated: use NewClient instead. Will be supported throughout 1.x`
	`25`	`+ resolver.SetDefaultScheme("passthrough")`
	`26`	`+ clientConn, err := grpc.NewClient("", opts...)`
`25`	`27`	`if err != nil {`
`26`	`28`	`return nil, err`
`27`	`29`	`}`