remove network url custom expand for workbench instance (#10931) (#7518)

[upstream:1a50dca365227e563f105288d6324700ed0f7dab] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 11, 2024 · 365fda1 · 365fda1
1 parent 8f6f21e
commit 365fda1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.changelog/10931.txt b/.changelog/10931.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+workbench: fixed a bug in the `google_workbench_instance` resource where specifying a network in some scenarios would cause instance creation to fail
+```
diff --git a/google-beta/services/workbench/resource_workbench_instance.go b/google-beta/services/workbench/resource_workbench_instance.go
@@ -2044,16 +2044,7 @@ func expandWorkbenchInstanceGceSetupNetworkInterfaces(v interface{}, d tpgresour
 }
 
 func expandWorkbenchInstanceGceSetupNetworkInterfacesNetwork(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	if v == nil || v.(string) == "" {
-		return "", nil
-	} else if strings.HasPrefix(v.(string), "https://") {
-		return v, nil
-	}
-	url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}"+v.(string))
-	if err != nil {
-		return "", err
-	}
-	return tpgresource.ConvertSelfLinkToV1(url), nil
+	return v, nil
 }
 
 func expandWorkbenchInstanceGceSetupNetworkInterfacesSubnet(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {