Support for projects in EgressSource (#12532)

modular-magician · modular-magician · commit 10f8acddfa45 · 2025-01-31T20:04:33.000Z
[upstream:43ea8747f7ccc2ef1774b12444a8f4dae98cc0cb]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/go.mod b/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.20250131183209-0394f74fb1b9
+	github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250131200031-88dcd513b784
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.9.0
diff --git a/go.sum b/go.sum
@@ -172,8 +172,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.20250131183209-0394f74fb1b9 h1:IjGoAtyJVwM7vnKpSpQUYZ3q2pWIdnio8+4J9Yo/x0I=
-github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250131183209-0394f74fb1b9/go.mod h1:IkJf/cFmSb0kvMORnXqL/PqiMSLMSAuOKHzH60Fea58=
+github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250131200031-88dcd513b784 h1:Iftzfuauk/KbEFjZOnw3OQqBeoueAbha2T1YEKa5E+w=
+github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20250131200031-88dcd513b784/go.mod h1:IkJf/cFmSb0kvMORnXqL/PqiMSLMSAuOKHzH60Fea58=
 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/accesscontextmanager/accesscontextmanager_service_perimeter.go b/tfplan2cai/converters/google/resources/services/accesscontextmanager/accesscontextmanager_service_perimeter.go
@@ -623,6 +623,13 @@ func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSou
 			transformed["accessLevel"] = transformedAccessLevel
 		}
 
+		transformedResource, err := expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["resource"] = transformedResource
+		}
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -632,6 +639,10 @@ func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSou
 	return v, nil
 }
 
+func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
@@ -1157,6 +1168,13 @@ func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourc
 			transformed["accessLevel"] = transformedAccessLevel
 		}
 
+		transformedResource, err := expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["resource"] = transformedResource
+		}
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -1166,6 +1184,10 @@ func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourc
 	return v, nil
 }
 
+func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
diff --git a/tfplan2cai/converters/google/resources/services/accesscontextmanager/accesscontextmanager_service_perimeters.go b/tfplan2cai/converters/google/resources/services/accesscontextmanager/accesscontextmanager_service_perimeters.go
@@ -583,6 +583,13 @@ func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPol
 			transformed["accessLevel"] = transformedAccessLevel
 		}
 
+		transformedResource, err := expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["resource"] = transformedResource
+		}
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -592,6 +599,10 @@ func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPol
 	return v, nil
 }
 
+func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
@@ -1117,6 +1128,13 @@ func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPolic
 			transformed["accessLevel"] = transformedAccessLevel
 		}
 
+		transformedResource, err := expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["resource"] = transformedResource
+		}
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -1126,6 +1144,10 @@ func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPolic
 	return v, nil
 }
 
+func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
diff --git a/tfplan2cai/testdata/templates/example_access_context_manager_service_perimeter.json b/tfplan2cai/testdata/templates/example_access_context_manager_service_perimeter.json
@@ -20,6 +20,9 @@
                 "sources": [
                     {
                       "accessLevel": "accessPolicies/987654/accessLevels/restrict_storage"
+                    },
+                    {
+                      "resource": "projects/4321"
                     }
                   ]
               }
diff --git a/tfplan2cai/testdata/templates/example_access_context_manager_service_perimeter.tf b/tfplan2cai/testdata/templates/example_access_context_manager_service_perimeter.tf
@@ -60,7 +60,10 @@ resource "google_access_context_manager_service_perimeter" "service-perimeter" {
         sources {
           access_level = "accessPolicies/987654/accessLevels/restrict_storage"
         }
-	source_restriction = "SOURCE_RESTRICTION_ENABLED"
+        sources {
+          resource = "projects/4321"
+        }
+	      source_restriction = "SOURCE_RESTRICTION_ENABLED"
         identity_type = "ANY_USER_ACCOUNT"
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,13 @@ func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSou`
`623`	`623`	`transformed["accessLevel"] = transformedAccessLevel`
`624`	`624`	`}`
`625`	`625`
	`626`	`+ transformedResource, err := expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)`
	`627`	`+ if err != nil {`
	`628`	`+ return nil, err`
	`629`	`+ } else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {`
	`630`	`+ transformed["resource"] = transformedResource`
	`631`	`+ }`
	`632`	`+`
`626`	`633`	`req = append(req, transformed)`
`627`	`634`	`}`
`628`	`635`	`return req, nil`
`@@ -632,6 +639,10 @@ func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSou`
`632`	`639`	`return v, nil`
`633`	`640`	`}`
`634`	`641`
	`642`	`+func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
	`643`	`+ return v, nil`
	`644`	`+}`
	`645`	`+`
`635`	`646`	`func expandAccessContextManagerServicePerimeterStatusEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
`636`	`647`	`return v, nil`
`637`	`648`	`}`
`@@ -1157,6 +1168,13 @@ func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourc`
`1157`	`1168`	`transformed["accessLevel"] = transformedAccessLevel`
`1158`	`1169`	`}`
`1159`	`1170`
	`1171`	`+ transformedResource, err := expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)`
	`1172`	`+ if err != nil {`
	`1173`	`+ return nil, err`
	`1174`	`+ } else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {`
	`1175`	`+ transformed["resource"] = transformedResource`
	`1176`	`+ }`
	`1177`	`+`
`1160`	`1178`	`req = append(req, transformed)`
`1161`	`1179`	`}`
`1162`	`1180`	`return req, nil`
`@@ -1166,6 +1184,10 @@ func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourc`
`1166`	`1184`	`return v, nil`
`1167`	`1185`	`}`
`1168`	`1186`
	`1187`	`+func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
	`1188`	`+ return v, nil`
	`1189`	`+}`
	`1190`	`+`
`1169`	`1191`	`func expandAccessContextManagerServicePerimeterSpecEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
`1170`	`1192`	`return v, nil`
`1171`	`1193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -583,6 +583,13 @@ func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPol`
`583`	`583`	`transformed["accessLevel"] = transformedAccessLevel`
`584`	`584`	`}`
`585`	`585`
	`586`	`+ transformedResource, err := expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)`
	`587`	`+ if err != nil {`
	`588`	`+ return nil, err`
	`589`	`+ } else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {`
	`590`	`+ transformed["resource"] = transformedResource`
	`591`	`+ }`
	`592`	`+`
`586`	`593`	`req = append(req, transformed)`
`587`	`594`	`}`
`588`	`595`	`return req, nil`
`@@ -592,6 +599,10 @@ func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPol`
`592`	`599`	`return v, nil`
`593`	`600`	`}`
`594`	`601`
	`602`	`+func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
	`603`	`+ return v, nil`
	`604`	`+}`
	`605`	`+`
`595`	`606`	`func expandAccessContextManagerServicePerimetersServicePerimetersStatusEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
`596`	`607`	`return v, nil`
`597`	`608`	`}`
`@@ -1117,6 +1128,13 @@ func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPolic`
`1117`	`1128`	`transformed["accessLevel"] = transformedAccessLevel`
`1118`	`1129`	`}`
`1119`	`1130`
	`1131`	`+ transformedResource, err := expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPoliciesEgressFromSourcesResource(original["resource"], d, config)`
	`1132`	`+ if err != nil {`
	`1133`	`+ return nil, err`
	`1134`	`+ } else if val := reflect.ValueOf(transformedResource); val.IsValid() && !tpgresource.IsEmptyValue(val) {`
	`1135`	`+ transformed["resource"] = transformedResource`
	`1136`	`+ }`
	`1137`	`+`
`1120`	`1138`	`req = append(req, transformed)`
`1121`	`1139`	`}`
`1122`	`1140`	`return req, nil`
`@@ -1126,6 +1144,10 @@ func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPolic`
`1126`	`1144`	`return v, nil`
`1127`	`1145`	`}`
`1128`	`1146`
	`1147`	`+func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPoliciesEgressFromSourcesResource(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
	`1148`	`+ return v, nil`
	`1149`	`+}`
	`1150`	`+`
`1129`	`1151`	`func expandAccessContextManagerServicePerimetersServicePerimetersSpecEgressPoliciesEgressFromSourceRestriction(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {`
`1130`	`1152`	`return v, nil`
`1131`	`1153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`	`"sources": [`
`21`	`21`	`{`
`22`	`22`	`"accessLevel": "accessPolicies/987654/accessLevels/restrict_storage"`
	`23`	`+ },`
	`24`	`+ {`
	`25`	`+ "resource": "projects/4321"`
`23`	`26`	`}`
`24`	`27`	`]`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ resource "google_access_context_manager_service_perimeter" "service-perimeter" {`
`60`	`60`	`sources {`
`61`	`61`	`access_level = "accessPolicies/987654/accessLevels/restrict_storage"`
`62`	`62`	`}`
`63`		`- source_restriction = "SOURCE_RESTRICTION_ENABLED"`
	`63`	`+ sources {`
	`64`	`+ resource = "projects/4321"`
	`65`	`+ }`
	`66`	`+ source_restriction = "SOURCE_RESTRICTION_ENABLED"`
`64`	`67`	`identity_type = "ANY_USER_ACCOUNT"`
`65`	`68`	`}`
`66`	`69`	`}`