ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

providers/google: Add account_file/account_file_contents ConflictsWith

This commit is contained in:
Justin Campbell 2015-07-24 10:20:08 -04:00
parent c7954dbf74
commit a7ca7e0b36
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/google/provider.go
View File

@ -12,12 +12,14 @@ func Provider() terraform.ResourceProvider {
"account_file": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"account_file_contents"},
DefaultFunc: schema.EnvDefaultFunc("GOOGLE_ACCOUNT_FILE", nil),
},
"account_file_contents": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"account_file"},
DefaultFunc: schema.EnvDefaultFunc("GOOGLE_ACCOUNT_FILE_CONTENTS", nil),
},