From 2a04708d664ef9b4800cf216577993b0c5af8303 Mon Sep 17 00:00:00 2001 From: Justin Campbell Date: Fri, 24 Jul 2015 14:25:27 -0400 Subject: [PATCH] providers/google: Default account_file* to empty Prevents prompting for input --- builtin/providers/google/provider.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/builtin/providers/google/provider.go b/builtin/providers/google/provider.go index 8d26bc627d..c1b2316fd5 100644 --- a/builtin/providers/google/provider.go +++ b/builtin/providers/google/provider.go @@ -10,17 +10,15 @@ func Provider() terraform.ResourceProvider { return &schema.Provider{ Schema: map[string]*schema.Schema{ "account_file": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"account_file_contents"}, - DefaultFunc: schema.EnvDefaultFunc("GOOGLE_ACCOUNT_FILE", nil), + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("GOOGLE_ACCOUNT_FILE", ""), }, "account_file_contents": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"account_file"}, - DefaultFunc: schema.EnvDefaultFunc("GOOGLE_ACCOUNT_FILE_CONTENTS", nil), + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("GOOGLE_ACCOUNT_FILE_CONTENTS", ""), }, "project": &schema.Schema{