Automated DCL import.

- 9a82ceb Automatic import from cloud_mmv2_dcl_20220429_1531_RC00 by DCL Team <[email protected]> GitOrigin-RevId: 9a82ceb
GoogleCloudPlatform · Apr 29, 2022 · ef54811 · ef54811
1 parent a383a34
commit ef54811
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"
     }