Automatic import from cloud_mmv2_dcl_20220429_1531_RC00

https://rapid.corp.google.com/#candidate/cloud_mmv2_dcl/cloud_mmv2_dcl_20220429_1531/cloud_mmv2_dcl_20220429_1531_RC00 Automated DCL push via Rapid This build IS suitable for public release. Bug: Change-Id: I9a8fc8838e4e9e105c9cf7bb423605e63cc5fc75
GoogleCloudPlatform · Apr 29, 2022 · 9a82ceb · 9a82ceb
1 parent 0f82a35
commit 9a82ceb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/services/google/filestore/alpha/instance_internal.go b/services/google/filestore/alpha/instance_internal.go
@@ -1674,9 +1674,7 @@ func expandInstanceNetworks(c *Client, f *InstanceNetworks, res *Instance) (map[
 	}
 
 	m := make(map[string]interface{})
-	if v, err := dcl.SelfLinkToNameExpander(f.Network); err != nil {
-		return nil, fmt.Errorf("error expanding Network into network: %w", err)
-	} else if !dcl.IsEmptyValueIndirect(v) {
+	if v := f.Network; !dcl.IsEmptyValueIndirect(v) {
 		m["network"] = v
 	}
 	if v := f.Modes; v != nil {

diff --git a/services/google/filestore/beta/instance_internal.go b/services/google/filestore/beta/instance_internal.go
@@ -1674,9 +1674,7 @@ func expandInstanceNetworks(c *Client, f *InstanceNetworks, res *Instance) (map[
 	}
 
 	m := make(map[string]interface{})
-	if v, err := dcl.SelfLinkToNameExpander(f.Network); err != nil {
-		return nil, fmt.Errorf("error expanding Network into network: %w", err)
-	} else if !dcl.IsEmptyValueIndirect(v) {
+	if v := f.Network; !dcl.IsEmptyValueIndirect(v) {
 		m["network"] = v
 	}
 	if v := f.Modes; v != nil {

diff --git a/services/google/filestore/instance_internal.go b/services/google/filestore/instance_internal.go
@@ -1674,9 +1674,7 @@ func expandInstanceNetworks(c *Client, f *InstanceNetworks, res *Instance) (map[
 	}
 
 	m := make(map[string]interface{})
-	if v, err := dcl.SelfLinkToNameExpander(f.Network); err != nil {
-		return nil, fmt.Errorf("error expanding Network into network: %w", err)
-	} else if !dcl.IsEmptyValueIndirect(v) {
+	if v := f.Network; !dcl.IsEmptyValueIndirect(v) {
 		m["network"] = v
 	}
 	if v := f.Modes; v != nil {

diff --git a/services/google/filestore/samples/basic.instance.json b/services/google/filestore/samples/basic.instance.json
@@ -24,7 +24,7 @@
   ],
   "networks": [
     {
-      "network": "default",
+      "network": "projects/{{project}}/global/networks/default",
       "modes": ["MODE_IPV4"],
       "reservedIPRange": "10.{{random_int}}.{{random_int}}.0/29"
     }