Revert "Etag support for ACM service perimeters" (#12568) (#3209)

[upstream:87f392596aa1431322e8f341011561e171e2329f]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/hashicorp/hcl/v2 v2.20.1
 	github.com/hashicorp/terraform-json v0.22.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
-	github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241213180537-423d69885214
+	github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241213201446-f86a0265d199
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -190,8 +190,8 @@ github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
 github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c=
 github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0=
-github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241213180537-423d69885214 h1:U5g/oQsBwNGV2BcpxEboVz4h/onTnhXUm1cPaPgRoXQ=
-github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241213180537-423d69885214/go.mod h1:+3tdRXgcI0aDAIH8vCVW2qAfcn7JiGlEv8RGuQJp6yY=
+github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241213201446-f86a0265d199 h1:CN7zV5craU5X0zVX2sTQSWYkcSZAOASpkAwSG4bR/ho=
+github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20241213201446-f86a0265d199/go.mod h1:+3tdRXgcI0aDAIH8vCVW2qAfcn7JiGlEv8RGuQJp6yY=
 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=

tfplan2cai/converters/google/resources/services/accesscontextmanager/accesscontextmanager_service_perimeter.go

@@ -145,12 +145,6 @@ func GetAccessContextManagerServicePerimeterApiObject(d tpgresource.TerraformRes
 	} else if v, ok := d.GetOkExists("use_explicit_dry_run_spec"); !tpgresource.IsEmptyValue(reflect.ValueOf(useExplicitDryRunSpecProp)) && (ok || !reflect.DeepEqual(v, useExplicitDryRunSpecProp)) {
 		obj["useExplicitDryRunSpec"] = useExplicitDryRunSpecProp
 	}
-	etagProp, err := expandAccessContextManagerServicePerimeterEtag(d.Get("etag"), d, config)
-	if err != nil {
-		return nil, err
-	} else if v, ok := d.GetOkExists("etag"); !tpgresource.IsEmptyValue(reflect.ValueOf(etagProp)) && (ok || !reflect.DeepEqual(v, etagProp)) {
-		obj["etag"] = etagProp
-	}
 	parentProp, err := expandAccessContextManagerServicePerimeterParent(d.Get("parent"), d, config)
 	if err != nil {
 		return nil, err
@@ -1256,10 +1250,6 @@ func expandAccessContextManagerServicePerimeterUseExplicitDryRunSpec(v interface
 	return v, nil
 }
 
-func expandAccessContextManagerServicePerimeterEtag(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandAccessContextManagerServicePerimeterParent(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

tfplan2cai/converters/google/resources/services/accesscontextmanager/accesscontextmanager_service_perimeters.go

@@ -103,13 +103,6 @@ func expandAccessContextManagerServicePerimetersServicePerimeters(v interface{},
 			transformed["description"] = transformedDescription
 		}
 
-		transformedEtag, err := expandAccessContextManagerServicePerimetersServicePerimetersEtag(original["etag"], d, config)
-		if err != nil {
-			return nil, err
-		} else if val := reflect.ValueOf(transformedEtag); val.IsValid() && !tpgresource.IsEmptyValue(val) {
-			transformed["etag"] = transformedEtag
-		}
-
 		transformedCreateTime, err := expandAccessContextManagerServicePerimetersServicePerimetersCreateTime(original["create_time"], d, config)
 		if err != nil {
 			return nil, err
@@ -169,10 +162,6 @@ func expandAccessContextManagerServicePerimetersServicePerimetersDescription(v i
 	return v, nil
 }
 
-func expandAccessContextManagerServicePerimetersServicePerimetersEtag(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandAccessContextManagerServicePerimetersServicePerimetersCreateTime(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }