public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-06 02:02:43 +00:00
Code Issues Projects Releases Wiki Activity

provider/google: Accept GOOGLE_CLOUD_KEYFILE_JSON env var for credentials

Browse Source
This commit is contained in:
Clint 2016-04-04 16:56:35 -05:00
parent ef0982895d
commit 9bcd3c0ad2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
provider.go
View File

@ -22,9 +22,12 @@ func Provider() terraform.ResourceProvider {
}, },
"credentials": &schema.Schema{ "credentials": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
DefaultFunc: schema.EnvDefaultFunc("GOOGLE_CREDENTIALS", nil), DefaultFunc: schema.MultiEnvDefaultFunc([]string{
"GOOGLE_CREDENTIALS",
"GOOGLE_CLOUD_KEYFILE_JSON",
}, nil),
ValidateFunc: validateCredentials, ValidateFunc: validateCredentials,
}, },

4
provider_test.go
View File

@ -39,7 +39,9 @@ func testAccPreCheck(t *testing.T) {
} }
if v := os.Getenv("GOOGLE_CREDENTIALS"); v == "" { if v := os.Getenv("GOOGLE_CREDENTIALS"); v == "" {
t.Fatal("GOOGLE_CREDENTIALS must be set for acceptance tests") if w := os.Getenv("GOOGLE_CLOUD_KEYFILE_JSON"); w == "" {
t.Fatal("GOOGLE_CREDENTIALS or GOOGLE_CLOUD_KEYFILE_JSON must be set for acceptance tests")
}
} }
if v := os.Getenv("GOOGLE_PROJECT"); v == "" { if v := os.Getenv("GOOGLE_PROJECT"); v == "" {