move logic of default func to configure (#4678) (#3142)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Apr 9, 2021 · ca467f7 · ca467f7
1 parent fccce38
commit ca467f7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/.changelog/4678.txt b/.changelog/4678.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/provider.go b/google-beta/provider.go
@@ -23,22 +23,14 @@ func Provider() *schema.Provider {
 	provider := &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"credentials": {
-				Type:     schema.TypeString,
-				Optional: true,
-				DefaultFunc: schema.MultiEnvDefaultFunc([]string{
-					"GOOGLE_CREDENTIALS",
-					"GOOGLE_CLOUD_KEYFILE_JSON",
-					"GCLOUD_KEYFILE_JSON",
-				}, nil),
+				Type:         schema.TypeString,
+				Optional:     true,
 				ValidateFunc: validateCredentials,
 			},
 
 			"access_token": {
-				Type:     schema.TypeString,
-				Optional: true,
-				DefaultFunc: schema.MultiEnvDefaultFunc([]string{
-					"GOOGLE_OAUTH_ACCESS_TOKEN",
-				}, nil),
+				Type:          schema.TypeString,
+				Optional:      true,
 				ConflictsWith: []string{"credentials"},
 			},
 			"impersonate_service_account": {
@@ -1357,6 +1349,18 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 			return nil, diag.FromErr(err)
 		}
 	}
+
+	// Search for default credentials
+	config.Credentials = multiEnvSearch([]string{
+		"GOOGLE_CREDENTIALS",
+		"GOOGLE_CLOUD_KEYFILE_JSON",
+		"GCLOUD_KEYFILE_JSON",
+	})
+
+	config.AccessToken = multiEnvSearch([]string{
+		"GOOGLE_OAUTH_ACCESS_TOKEN",
+	})
+
 	// Add credential source
 	if v, ok := d.GetOk("access_token"); ok {
 		config.AccessToken = v.(string)