Skip to content

Commit 6621660

Browse files
modular-magiciankotatut
authored andcommitted
SWP: Match properties description (#13087) (GoogleCloudPlatform#3582)
[upstream:21c585ace17cec6803b39d7d585fc435e23d833a] Signed-off-by: Modular Magician <[email protected]>
1 parent 0b53a73 commit 6621660

File tree

3 files changed

+39
-19
lines changed

3 files changed

+39
-19
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/hashicorp/hcl/v2 v2.23.0
1414
github.com/hashicorp/terraform-json v0.24.0
1515
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0
16-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250310193331-2abdf9ee4fa9
16+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250310205023-fa3437432fe0
1717
github.com/mitchellh/go-homedir v1.1.0 // indirect
1818
github.com/pkg/errors v0.9.1
1919
github.com/stretchr/testify v1.10.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0 h1:7/iejAPyCRBhqAg3jOx+4UcA
173173
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0/go.mod h1:TiQwXAjFrgBf5tg5rvBRz8/ubPULpU0HjSaVi5UoJf8=
174174
github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c=
175175
github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0=
176-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250310193331-2abdf9ee4fa9 h1:WtU0DGCsEmwi8w12v8jWzt/2qrSWtYVQQHhARlYway0=
177-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250310193331-2abdf9ee4fa9/go.mod h1:M159odRzEocUtKaG8sl4KMTBFE/dC3ChJjOuY4T/JwU=
176+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250310205023-fa3437432fe0 h1:EqIoqQSgXGyxSVVzDLhPZwp/zoyBEFtJk0ZIC8GUb8E=
177+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250310205023-fa3437432fe0/go.mod h1:M159odRzEocUtKaG8sl4KMTBFE/dC3ChJjOuY4T/JwU=
178178
github.com/hashicorp/terraform-registry-address v0.2.4 h1:JXu/zHB2Ymg/TGVCRu10XqNa4Sh2bWcqCNyKWjnCPJA=
179179
github.com/hashicorp/terraform-registry-address v0.2.4/go.mod h1:tUNYTVyCtU4OIGXXMDp7WNcJ+0W1B4nmstVDgHMjfAU=
180180
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=

tfplan2cai/converters/google/resources/services/networkservices/networkservices_gateway.go

+36-16
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,12 @@ func GetNetworkServicesGatewayApiObject(d tpgresource.TerraformResourceData, con
193193
} else if v, ok := d.GetOkExists("type"); !tpgresource.IsEmptyValue(reflect.ValueOf(typeProp)) && (ok || !reflect.DeepEqual(v, typeProp)) {
194194
obj["type"] = typeProp
195195
}
196+
addressesProp, err := expandNetworkServicesGatewayAddresses(d.Get("addresses"), d, config)
197+
if err != nil {
198+
return nil, err
199+
} else if v, ok := d.GetOkExists("addresses"); !tpgresource.IsEmptyValue(reflect.ValueOf(addressesProp)) && (ok || !reflect.DeepEqual(v, addressesProp)) {
200+
obj["addresses"] = addressesProp
201+
}
196202
portsProp, err := expandNetworkServicesGatewayPorts(d.Get("ports"), d, config)
197203
if err != nil {
198204
return nil, err
@@ -211,35 +217,41 @@ func GetNetworkServicesGatewayApiObject(d tpgresource.TerraformResourceData, con
211217
} else if v, ok := d.GetOkExists("server_tls_policy"); !tpgresource.IsEmptyValue(reflect.ValueOf(serverTlsPolicyProp)) && (ok || !reflect.DeepEqual(v, serverTlsPolicyProp)) {
212218
obj["serverTlsPolicy"] = serverTlsPolicyProp
213219
}
214-
addressesProp, err := expandNetworkServicesGatewayAddresses(d.Get("addresses"), d, config)
220+
certificateUrlsProp, err := expandNetworkServicesGatewayCertificateUrls(d.Get("certificate_urls"), d, config)
215221
if err != nil {
216222
return nil, err
217-
} else if v, ok := d.GetOkExists("addresses"); !tpgresource.IsEmptyValue(reflect.ValueOf(addressesProp)) && (ok || !reflect.DeepEqual(v, addressesProp)) {
218-
obj["addresses"] = addressesProp
223+
} else if v, ok := d.GetOkExists("certificate_urls"); !tpgresource.IsEmptyValue(reflect.ValueOf(certificateUrlsProp)) && (ok || !reflect.DeepEqual(v, certificateUrlsProp)) {
224+
obj["certificateUrls"] = certificateUrlsProp
219225
}
220-
subnetworkProp, err := expandNetworkServicesGatewaySubnetwork(d.Get("subnetwork"), d, config)
226+
gatewaySecurityPolicyProp, err := expandNetworkServicesGatewayGatewaySecurityPolicy(d.Get("gateway_security_policy"), d, config)
221227
if err != nil {
222228
return nil, err
223-
} else if v, ok := d.GetOkExists("subnetwork"); !tpgresource.IsEmptyValue(reflect.ValueOf(subnetworkProp)) && (ok || !reflect.DeepEqual(v, subnetworkProp)) {
224-
obj["subnetwork"] = subnetworkProp
229+
} else if v, ok := d.GetOkExists("gateway_security_policy"); !tpgresource.IsEmptyValue(reflect.ValueOf(gatewaySecurityPolicyProp)) && (ok || !reflect.DeepEqual(v, gatewaySecurityPolicyProp)) {
230+
obj["gatewaySecurityPolicy"] = gatewaySecurityPolicyProp
225231
}
226232
networkProp, err := expandNetworkServicesGatewayNetwork(d.Get("network"), d, config)
227233
if err != nil {
228234
return nil, err
229235
} else if v, ok := d.GetOkExists("network"); !tpgresource.IsEmptyValue(reflect.ValueOf(networkProp)) && (ok || !reflect.DeepEqual(v, networkProp)) {
230236
obj["network"] = networkProp
231237
}
232-
gatewaySecurityPolicyProp, err := expandNetworkServicesGatewayGatewaySecurityPolicy(d.Get("gateway_security_policy"), d, config)
238+
subnetworkProp, err := expandNetworkServicesGatewaySubnetwork(d.Get("subnetwork"), d, config)
233239
if err != nil {
234240
return nil, err
235-
} else if v, ok := d.GetOkExists("gateway_security_policy"); !tpgresource.IsEmptyValue(reflect.ValueOf(gatewaySecurityPolicyProp)) && (ok || !reflect.DeepEqual(v, gatewaySecurityPolicyProp)) {
236-
obj["gatewaySecurityPolicy"] = gatewaySecurityPolicyProp
241+
} else if v, ok := d.GetOkExists("subnetwork"); !tpgresource.IsEmptyValue(reflect.ValueOf(subnetworkProp)) && (ok || !reflect.DeepEqual(v, subnetworkProp)) {
242+
obj["subnetwork"] = subnetworkProp
237243
}
238-
certificateUrlsProp, err := expandNetworkServicesGatewayCertificateUrls(d.Get("certificate_urls"), d, config)
244+
ipVersionProp, err := expandNetworkServicesGatewayIpVersion(d.Get("ip_version"), d, config)
239245
if err != nil {
240246
return nil, err
241-
} else if v, ok := d.GetOkExists("certificate_urls"); !tpgresource.IsEmptyValue(reflect.ValueOf(certificateUrlsProp)) && (ok || !reflect.DeepEqual(v, certificateUrlsProp)) {
242-
obj["certificateUrls"] = certificateUrlsProp
247+
} else if v, ok := d.GetOkExists("ip_version"); !tpgresource.IsEmptyValue(reflect.ValueOf(ipVersionProp)) && (ok || !reflect.DeepEqual(v, ipVersionProp)) {
248+
obj["ipVersion"] = ipVersionProp
249+
}
250+
envoyHeadersProp, err := expandNetworkServicesGatewayEnvoyHeaders(d.Get("envoy_headers"), d, config)
251+
if err != nil {
252+
return nil, err
253+
} else if v, ok := d.GetOkExists("envoy_headers"); !tpgresource.IsEmptyValue(reflect.ValueOf(envoyHeadersProp)) && (ok || !reflect.DeepEqual(v, envoyHeadersProp)) {
254+
obj["envoyHeaders"] = envoyHeadersProp
243255
}
244256
routingModeProp, err := expandNetworkServicesGatewayRoutingMode(d.Get("routing_mode"), d, config)
245257
if err != nil {
@@ -265,6 +277,10 @@ func expandNetworkServicesGatewayType(v interface{}, d tpgresource.TerraformReso
265277
return v, nil
266278
}
267279

280+
func expandNetworkServicesGatewayAddresses(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
281+
return v, nil
282+
}
283+
268284
func expandNetworkServicesGatewayPorts(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
269285
return v, nil
270286
}
@@ -277,23 +293,27 @@ func expandNetworkServicesGatewayServerTlsPolicy(v interface{}, d tpgresource.Te
277293
return v, nil
278294
}
279295

280-
func expandNetworkServicesGatewayAddresses(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
296+
func expandNetworkServicesGatewayCertificateUrls(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
281297
return v, nil
282298
}
283299

284-
func expandNetworkServicesGatewaySubnetwork(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
300+
func expandNetworkServicesGatewayGatewaySecurityPolicy(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
285301
return v, nil
286302
}
287303

288304
func expandNetworkServicesGatewayNetwork(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
289305
return v, nil
290306
}
291307

292-
func expandNetworkServicesGatewayGatewaySecurityPolicy(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
308+
func expandNetworkServicesGatewaySubnetwork(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
293309
return v, nil
294310
}
295311

296-
func expandNetworkServicesGatewayCertificateUrls(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
312+
func expandNetworkServicesGatewayIpVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
313+
return v, nil
314+
}
315+
316+
func expandNetworkServicesGatewayEnvoyHeaders(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
297317
return v, nil
298318
}
299319

0 commit comments

Comments
 (0)