DirectPath: make ComputeEngineCredentials support non-default service…

… account
grpc · Sep 14, 2021 · e9b5071 · e9b5071
1 parent 10790dc
commit e9b5071
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/credentials/google/google_test.go b/credentials/google/google_test.go
@@ -77,7 +77,7 @@ func TestClientHandshakeBasedOnClusterName(t *testing.T) {
 	defer overrideNewCredsFuncs()()
 	for bundleTyp, tc := range map[string]credentials.Bundle{
 		"defaultCreds": NewDefaultCredentials(),
-		"computeCreds": NewComputeEngineCredentials(),
+		"computeCreds": NewComputeEngineCredentials(nil),
 	} {
 		tests := []struct {
 			name    string

diff --git a/interop/client/client.go b/interop/client/client.go
@@ -174,7 +174,7 @@ func main() {
 	case credsGoogleDefaultCreds:
 		opts = append(opts, grpc.WithCredentialsBundle(google.NewDefaultCredentials()))
 	case credsComputeEngineCreds:
-		opts = append(opts, grpc.WithCredentialsBundle(google.NewComputeEngineCredentials()))
+		opts = append(opts, grpc.WithCredentialsBundle(google.NewComputeEngineCredentials(nil)))
 	case credsNone:
 		opts = append(opts, grpc.WithInsecure())
 	default:

diff --git a/interop/grpclb_fallback/client_linux.go b/interop/grpclb_fallback/client_linux.go
@@ -110,7 +110,7 @@ func createTestConn() *grpc.ClientConn {
 	case "google_default_credentials":
 		opts = append(opts, grpc.WithCredentialsBundle(google.NewDefaultCredentials()))
 	case "compute_engine_channel_creds":
-		opts = append(opts, grpc.WithCredentialsBundle(google.NewComputeEngineCredentials()))
+		opts = append(opts, grpc.WithCredentialsBundle(google.NewComputeEngineCredentials(nil)))
 	default:
 		errorLog.Fatalf("Invalid --custom_credentials_type:%v", *customCredentialsType)
 	}

diff --git a/xds/internal/xdsclient/bootstrap/bootstrap_test.go b/xds/internal/xdsclient/bootstrap/bootstrap_test.go
@@ -213,12 +213,12 @@ var (
 	}
 	nonNilCredsConfigV2 = &Config{
 		BalancerName: "trafficdirector.googleapis.com:443",
-		Creds:        grpc.WithCredentialsBundle(google.NewComputeEngineCredentials()),
+		Creds:        grpc.WithCredentialsBundle(google.NewComputeEngineCredentials(nil)),
 		NodeProto:    v2NodeProto,
 	}
 	nonNilCredsConfigV3 = &Config{
 		BalancerName: "trafficdirector.googleapis.com:443",
-		Creds:        grpc.WithCredentialsBundle(google.NewComputeEngineCredentials()),
+		Creds:        grpc.WithCredentialsBundle(google.NewComputeEngineCredentials(nil)),
 		TransportAPI: version.TransportV3,
 		NodeProto:    v3NodeProto,
 	}
@@ -671,7 +671,7 @@ func TestNewConfigWithCertificateProviders(t *testing.T) {
 
 	goodConfig := &Config{
 		BalancerName: "trafficdirector.googleapis.com:443",
-		Creds:        grpc.WithCredentialsBundle(google.NewComputeEngineCredentials()),
+		Creds:        grpc.WithCredentialsBundle(google.NewComputeEngineCredentials(nil)),
 		TransportAPI: version.TransportV3,
 		NodeProto:    v3NodeProto,
 		CertProviderConfigs: map[string]*certprovider.BuildableConfig{
@@ -761,7 +761,7 @@ func TestNewConfigWithServerListenerResourceNameTemplate(t *testing.T) {
 			name: "goodServerListenerResourceNameTemplate",
 			wantConfig: &Config{
 				BalancerName:                       "trafficdirector.googleapis.com:443",
-				Creds:                              grpc.WithCredentialsBundle(google.NewComputeEngineCredentials()),
+				Creds:                              grpc.WithCredentialsBundle(google.NewComputeEngineCredentials(nil)),
 				TransportAPI:                       version.TransportV2,
 				NodeProto:                          v2NodeProto,
 				ServerListenerResourceNameTemplate: "grpc/server?xds.resource.listening_address=%s",