From ef5481133a2af38f93d47c5d7eeb1b5a798873a2 Mon Sep 17 00:00:00 2001 From: DCL Team Date: Fri, 29 Apr 2022 15:39:49 -0700 Subject: [PATCH] Automated DCL import. - 9a82cebcb95d28b43179a4389e2d69185a9d7b40 Automatic import from cloud_mmv2_dcl_20220429_1531_RC00 by DCL Team GitOrigin-RevId: 9a82cebcb95d28b43179a4389e2d69185a9d7b40 --- services/google/filestore/alpha/instance_internal.go | 4 +--- services/google/filestore/beta/instance_internal.go | 4 +--- services/google/filestore/instance_internal.go | 4 +--- services/google/filestore/samples/basic.instance.json | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/services/google/filestore/alpha/instance_internal.go b/services/google/filestore/alpha/instance_internal.go index abfa956a2..4d52906b6 100755 --- 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 index c0f09b6b2..7a60bafa1 100755 --- 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 index b787e89bc..e4dc4f2e3 100755 --- 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 index 5c38ccb99..43bdedb62 100755 --- 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" }