diff --git a/spanner/admin/database/apiv1/database_test.go b/spanner/admin/database/apiv1/database_test.go index 56713811edec..e4c6aaf0f4cb 100644 --- a/spanner/admin/database/apiv1/database_test.go +++ b/spanner/admin/database/apiv1/database_test.go @@ -29,6 +29,7 @@ import ( "google.golang.org/genproto/googleapis/spanner/admin/database/v1" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" gstatus "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" @@ -121,7 +122,7 @@ func initMockOperations() { } go serv.Serve(lis) - conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure()) + conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { log.Fatal(err) } diff --git a/spanner/admin/database/apiv1/init.go b/spanner/admin/database/apiv1/init.go index a5aaadeac86a..60c19056512d 100644 --- a/spanner/admin/database/apiv1/init.go +++ b/spanner/admin/database/apiv1/init.go @@ -21,6 +21,7 @@ import ( "google.golang.org/api/option" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" ) func init() { @@ -28,7 +29,7 @@ func init() { if emulator := os.Getenv("SPANNER_EMULATOR_HOST"); emulator != "" { return []option.ClientOption{ option.WithEndpoint(emulator), - option.WithGRPCDialOption(grpc.WithInsecure()), + option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())), option.WithoutAuthentication(), }, nil } diff --git a/spanner/admin/instance/apiv1/init.go b/spanner/admin/instance/apiv1/init.go index 54eb03ea1f5c..85046d97191f 100644 --- a/spanner/admin/instance/apiv1/init.go +++ b/spanner/admin/instance/apiv1/init.go @@ -21,6 +21,7 @@ import ( "google.golang.org/api/option" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" ) func init() { @@ -28,7 +29,7 @@ func init() { if emulator := os.Getenv("SPANNER_EMULATOR_HOST"); emulator != "" { return []option.ClientOption{ option.WithEndpoint(emulator), - option.WithGRPCDialOption(grpc.WithInsecure()), + option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())), option.WithoutAuthentication(), }, nil } diff --git a/spanner/client.go b/spanner/client.go index 8ac786c4b769..de67e864e678 100644 --- a/spanner/client.go +++ b/spanner/client.go @@ -387,7 +387,7 @@ func newClientWithConfig(ctx context.Context, database string, config ClientConf if emulatorAddr := os.Getenv("SPANNER_EMULATOR_HOST"); emulatorAddr != "" { emulatorOpts := []option.ClientOption{ option.WithEndpoint(emulatorAddr), - option.WithGRPCDialOption(grpc.WithInsecure()), + option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())), option.WithoutAuthentication(), internaloption.SkipDialSettingsValidation(), } diff --git a/spanner/integration_test.go b/spanner/integration_test.go index 3543104f44bb..82c4175f29a2 100644 --- a/spanner/integration_test.go +++ b/spanner/integration_test.go @@ -55,6 +55,7 @@ import ( "google.golang.org/api/option/internaloption" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/peer" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" @@ -893,7 +894,7 @@ func deleteTestSession(ctx context.Context, t *testing.T, sessionName string) { if emulatorAddr := os.Getenv("SPANNER_EMULATOR_HOST"); emulatorAddr != "" { emulatorOpts := []option.ClientOption{ option.WithEndpoint(emulatorAddr), - option.WithGRPCDialOption(grpc.WithInsecure()), + option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())), option.WithoutAuthentication(), internaloption.SkipDialSettingsValidation(), } diff --git a/spanner/internal/testutil/inmem_instance_admin_server_test.go b/spanner/internal/testutil/inmem_instance_admin_server_test.go index c63759944e67..0bb828740a83 100644 --- a/spanner/internal/testutil/inmem_instance_admin_server_test.go +++ b/spanner/internal/testutil/inmem_instance_admin_server_test.go @@ -27,6 +27,7 @@ import ( "cloud.google.com/go/spanner/internal/testutil" "google.golang.org/api/option" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/proto" ) @@ -48,7 +49,7 @@ func setupInstanceAdminServer() { } go serv.Serve(lis) - conn, err := grpc.Dial(lis.Addr().String(), grpc.WithInsecure()) + conn, err := grpc.Dial(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { log.Fatal(err) } diff --git a/spanner/internal/testutil/inmem_spanner_server_test.go b/spanner/internal/testutil/inmem_spanner_server_test.go index ea5a8fc8f738..74ec1c545855 100644 --- a/spanner/internal/testutil/inmem_spanner_server_test.go +++ b/spanner/internal/testutil/inmem_spanner_server_test.go @@ -37,6 +37,7 @@ import ( "google.golang.org/api/iterator" "google.golang.org/api/option" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" gstatus "google.golang.org/grpc/status" ) @@ -72,7 +73,7 @@ func TestMain(m *testing.M) { go serv.Serve(lis) serverAddress = lis.Addr().String() - conn, err := grpc.Dial(serverAddress, grpc.WithInsecure()) + conn, err := grpc.Dial(serverAddress, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { log.Fatal(err) } diff --git a/spanner/internal/testutil/mocked_inmem_server.go b/spanner/internal/testutil/mocked_inmem_server.go index e1267408a49d..fd9b84d9f6a3 100644 --- a/spanner/internal/testutil/mocked_inmem_server.go +++ b/spanner/internal/testutil/mocked_inmem_server.go @@ -24,6 +24,7 @@ import ( "cloud.google.com/go/spanner/apiv1/spannerpb" "google.golang.org/api/option" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" structpb "google.golang.org/protobuf/types/known/structpb" ) @@ -103,7 +104,7 @@ func (s *MockedSpannerInMemTestServer) setupMockedServerWithAddr(t *testing.T, a s.ServerAddress = lis.Addr().String() opts := []option.ClientOption{ option.WithEndpoint(s.ServerAddress), - option.WithGRPCDialOption(grpc.WithInsecure()), + option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())), option.WithoutAuthentication(), } return opts diff --git a/spanner/spannertest/inmem.go b/spanner/spannertest/inmem.go index 21b929ce0598..6a7d1e74fd01 100644 --- a/spanner/spannertest/inmem.go +++ b/spanner/spannertest/inmem.go @@ -27,7 +27,7 @@ create a Server, and then connect to it with no security: srv, err := spannertest.NewServer("localhost:0") ... - conn, err := grpc.DialContext(ctx, srv.Addr, grpc.WithInsecure()) + conn, err := grpc.DialContext(ctx, srv.Addr, grpc.WithTransportCredentials(insecure.NewCredentials())) ... client, err := spanner.NewClient(ctx, db, option.WithGRPCConn(conn)) ... diff --git a/spanner/spannertest/integration_test.go b/spanner/spannertest/integration_test.go index 60015c474060..e0207c39607b 100644 --- a/spanner/spannertest/integration_test.go +++ b/spanner/spannertest/integration_test.go @@ -115,7 +115,7 @@ func makeClient(t *testing.T) (*spanner.Client, *dbadmin.DatabaseAdminClient, *v srv.SetLogger(t.Logf) dialCtx, cancel := context.WithTimeout(ctx, 1*time.Second) defer cancel() - conn, err := grpc.DialContext(dialCtx, srv.Addr, grpc.WithInsecure()) + conn, err := grpc.DialContext(dialCtx, srv.Addr, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { srv.Close() t.Fatalf("Dialing in-memory fake: %v", err)