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

providers/google: Add account_file/account_file_contents ConflictsWith

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

2
provider.go
View File

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