Skip to content

Commit 365fda1

Browse files
remove network url custom expand for workbench instance (#10931) (#7518)
[upstream:1a50dca365227e563f105288d6324700ed0f7dab] Signed-off-by: Modular Magician <[email protected]>
1 parent 8f6f21e commit 365fda1

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.changelog/10931.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
workbench: fixed a bug in the `google_workbench_instance` resource where specifying a network in some scenarios would cause instance creation to fail
3+
```

google-beta/services/workbench/resource_workbench_instance.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,16 +2044,7 @@ func expandWorkbenchInstanceGceSetupNetworkInterfaces(v interface{}, d tpgresour
20442044
}
20452045

20462046
func expandWorkbenchInstanceGceSetupNetworkInterfacesNetwork(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
2047-
if v == nil || v.(string) == "" {
2048-
return "", nil
2049-
} else if strings.HasPrefix(v.(string), "https://") {
2050-
return v, nil
2051-
}
2052-
url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}"+v.(string))
2053-
if err != nil {
2054-
return "", err
2055-
}
2056-
return tpgresource.ConvertSelfLinkToV1(url), nil
2047+
return v, nil
20572048
}
20582049

20592050
func expandWorkbenchInstanceGceSetupNetworkInterfacesSubnet(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {

0 commit comments

Comments
 (0)