Merge pull request #6863 from tosmi/tosmi/gcp-env

openshift-ci[bot] · web-flow · commit 43a82aba3fc6 · 2023-11-01T10:28:53.000Z
OCPBUGS-17866: check GOOGLE_APPLICATION_CREDENTIALS env var
diff --git a/pkg/asset/installconfig/gcp/session.go b/pkg/asset/installconfig/gcp/session.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	authEnvs            = []string{"GOOGLE_CREDENTIALS", "GOOGLE_CLOUD_KEYFILE_JSON", "GCLOUD_KEYFILE_JSON"}
+	authEnvs            = []string{"GOOGLE_APPLICATION_CREDENTIALS", "GOOGLE_CREDENTIALS", "GOOGLE_CLOUD_KEYFILE_JSON", "GCLOUD_KEYFILE_JSON"}
 	defaultAuthFilePath = filepath.Join(os.Getenv("HOME"), ".gcp", "osServiceAccount.json")
 	credLoaders         = []credLoader{}
 	onceLoggers         = map[credLoader]*sync.Once{}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
`19`		`- authEnvs = []string{"GOOGLE_CREDENTIALS", "GOOGLE_CLOUD_KEYFILE_JSON", "GCLOUD_KEYFILE_JSON"}`
	`19`	`+ authEnvs = []string{"GOOGLE_APPLICATION_CREDENTIALS", "GOOGLE_CREDENTIALS", "GOOGLE_CLOUD_KEYFILE_JSON", "GCLOUD_KEYFILE_JSON"}`
`20`	`20`	`defaultAuthFilePath = filepath.Join(os.Getenv("HOME"), ".gcp", "osServiceAccount.json")`
`21`	`21`	`credLoaders = []credLoader{}`
`22`	`22`	`onceLoggers = map[credLoader]*sync.Once{}`