Merge pull request #1407 from cheftako/tpc

Backporting GoogleCloudPlatform/magic-modules#9463
GoogleCloudPlatform · Apr 8, 2024 · 01c3b76 · 01c3b76
2 parents 4647b3c + 68a32da
commit 01c3b76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...arty/github.com/hashicorp/terraform-provider-google-beta/google-beta/provider/provider.go b/...arty/github.com/hashicorp/terraform-provider-google-beta/google-beta/provider/provider.go
@@ -1945,7 +1945,6 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	if err != nil {
 		return nil, diag.FromErr(err)
 	}
-	transport_tpg.HandleDCLCustomEndpointDefaults(d)
 
 	config := transport_tpg.Config{
 		Project:             d.Get("project").(string),
@@ -2035,6 +2034,12 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 		}
 	}
 
+	err = transport_tpg.SetEndpointDefaults(d)
+	if err != nil {
+		return nil, diag.FromErr(err)
+	}
+	transport_tpg.HandleDCLCustomEndpointDefaults(d)
+
 	// Given that impersonate_service_account is a secondary auth method, it has
 	// no conflicts to worry about. We pull the env var in a DefaultFunc.
 	if v, ok := d.GetOk("impersonate_service_account"); ok {

diff --git a/...party/github.com/hashicorp/terraform-provider-google-beta/google-beta/transport/config.go b/...party/github.com/hashicorp/terraform-provider-google-beta/google-beta/transport/config.go
@@ -653,7 +653,10 @@ func HandleSDKDefaults(d *schema.ResourceData) error {
 			"CLOUDSDK_CORE_REQUEST_REASON",
 		}, nil))
 	}
+	return nil
+}
 
+func SetEndpointDefaults(d *schema.ResourceData) error {
 	// Generated Products
 	if d.Get("access_approval_custom_endpoint") == "" {
 		d.Set("access_approval_custom_endpoint", MultiEnvDefault([]string{