Skip to content

Commit 6b02b2a

Browse files
Add NetworkTier for GlobalForwardingRule. (#12474)
[upstream:dc4d9755cb9288177e0996c1c3b3fa9738ebdf89] Signed-off-by: Modular Magician <[email protected]>
1 parent 9489a6f commit 6b02b2a

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/hashicorp/hcl/v2 v2.20.1
1212
github.com/hashicorp/terraform-json v0.22.1
1313
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
14-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241204150637-95939488064c
14+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241204164007-8af1e42a8db4
1515
github.com/mitchellh/go-homedir v1.1.0 // indirect
1616
github.com/pkg/errors v0.9.1
1717
github.com/stretchr/testify v1.9.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh
190190
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
191191
github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c=
192192
github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0=
193-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241204150637-95939488064c h1:TVNC2ebQidE6RvfWh/w2uuViqD7T5mHnVnVPhwIqnUs=
194-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241204150637-95939488064c/go.mod h1:+3tdRXgcI0aDAIH8vCVW2qAfcn7JiGlEv8RGuQJp6yY=
193+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241204164007-8af1e42a8db4 h1:i9K9wYcypKAlBAP4afPBA41Xs3Qu4qYtaDPJXMu6IFw=
194+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241204164007-8af1e42a8db4/go.mod h1:+3tdRXgcI0aDAIH8vCVW2qAfcn7JiGlEv8RGuQJp6yY=
195195
github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
196196
github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
197197
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=

tfplan2cai/converters/google/resources/services/compute/compute_global_forwarding_rule.go

+10
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ func GetComputeGlobalForwardingRuleApiObject(d tpgresource.TerraformResourceData
127127
} else if v, ok := d.GetOkExists("target"); !tpgresource.IsEmptyValue(reflect.ValueOf(targetProp)) && (ok || !reflect.DeepEqual(v, targetProp)) {
128128
obj["target"] = targetProp
129129
}
130+
networkTierProp, err := expandComputeGlobalForwardingRuleNetworkTier(d.Get("network_tier"), d, config)
131+
if err != nil {
132+
return nil, err
133+
} else if v, ok := d.GetOkExists("network_tier"); !tpgresource.IsEmptyValue(reflect.ValueOf(networkTierProp)) && (ok || !reflect.DeepEqual(v, networkTierProp)) {
134+
obj["networkTier"] = networkTierProp
135+
}
130136
serviceDirectoryRegistrationsProp, err := expandComputeGlobalForwardingRuleServiceDirectoryRegistrations(d.Get("service_directory_registrations"), d, config)
131137
if err != nil {
132138
return nil, err
@@ -283,6 +289,10 @@ func expandComputeGlobalForwardingRuleTarget(v interface{}, d tpgresource.Terraf
283289
return v, nil
284290
}
285291

292+
func expandComputeGlobalForwardingRuleNetworkTier(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
293+
return v, nil
294+
}
295+
286296
func expandComputeGlobalForwardingRuleServiceDirectoryRegistrations(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
287297
l := v.([]interface{})
288298
req := make([]interface{}, 0, len(l))

0 commit comments

Comments
 (0)