Add support for configuring forward proxy in Apigee Environment. (#10…

…457) [upstream:43c57add8f62100fe103d4ee3cc19200e550a8cc] Signed-off-by: Modular Magician <magic-modules@google.com>
GoogleCloudPlatform · Apr 18, 2024 · 697a049 · 697a049
1 parent be49ab3
commit 697a049
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/hashicorp/hcl/v2 v2.19.1
 	github.com/hashicorp/terraform-json v0.21.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
-	github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240418010829-8736281d49ef
+	github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240418154858-a01d7e06b11a
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4

diff --git a/go.sum b/go.sum
@@ -185,8 +185,8 @@ github.com/hashicorp/terraform-plugin-mux v0.15.0 h1:+/+lDx0WUsIOpkAmdwBIoFU8UP9
 github.com/hashicorp/terraform-plugin-mux v0.15.0/go.mod h1:9ezplb1Dyq394zQ+ldB0nvy/qbNAz3mMoHHseMTMaKo=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
-github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240418010829-8736281d49ef h1:B/SgDJhgQt6sAWilFRJYpxtOIpEyryKa7iLDgyz3fhE=
-github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240418010829-8736281d49ef/go.mod h1:OGg+gykjRwc0c1aGJg9W271SaG3x6JZRFSCVcYhYJe0=
+github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240418154858-a01d7e06b11a h1:7lAnW7i1C2xHIzHFqYB5JGIvTBxs8a6673Z9+M2jgrU=
+github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240418154858-a01d7e06b11a/go.mod h1:OGg+gykjRwc0c1aGJg9W271SaG3x6JZRFSCVcYhYJe0=
 github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
 github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
 github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=

diff --git a/tfplan2cai/converters/google/resources/services/apigee/apigee_environment.go b/tfplan2cai/converters/google/resources/services/apigee/apigee_environment.go
@@ -96,6 +96,12 @@ func GetApigeeEnvironmentApiObject(d tpgresource.TerraformResourceData, config *
 	} else if v, ok := d.GetOkExists("type"); !tpgresource.IsEmptyValue(reflect.ValueOf(typeProp)) && (ok || !reflect.DeepEqual(v, typeProp)) {
 		obj["type"] = typeProp
 	}
+	forwardProxyUriProp, err := expandApigeeEnvironmentForwardProxyUri(d.Get("forward_proxy_uri"), d, config)
+	if err != nil {
+		return nil, err
+	} else if v, ok := d.GetOkExists("forward_proxy_uri"); !tpgresource.IsEmptyValue(reflect.ValueOf(forwardProxyUriProp)) && (ok || !reflect.DeepEqual(v, forwardProxyUriProp)) {
+		obj["forwardProxyUri"] = forwardProxyUriProp
+	}
 
 	return obj, nil
 }
@@ -168,3 +174,7 @@ func expandApigeeEnvironmentNodeConfigCurrentAggregateNodeCount(v interface{}, d
 func expandApigeeEnvironmentType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
+
+func expandApigeeEnvironmentForwardProxyUri(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}