Merge branch 'master' into sruffilli/ncc-simple

GoogleCloudPlatform · Jul 25, 2024 · 7e98df3 · 7e98df3
2 parents 0556709 + 3237764
commit 7e98df3
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/modules/project/service-agents.tf b/modules/project/service-agents.tf
@@ -106,6 +106,11 @@ moved {
   to   = google_project_service_identity.default
 }
 
+moved {
+  from = google_project_service_identity.servicenetworking[0]
+  to   = google_project_service_identity.default["servicenetworking.googleapis.com"]
+}
+
 resource "google_project_service_identity" "default" {
   provider   = google-beta
   for_each   = toset(local.primary_service_agents)
@@ -114,6 +119,12 @@ resource "google_project_service_identity" "default" {
   depends_on = [google_project_service.project_services]
 }
 
+
+moved {
+  from = google_project_iam_member.servicenetworking[0]
+  to   = google_project_iam_member.service_agents["service-networking"]
+}
+
 resource "google_project_iam_member" "service_agents" {
   for_each = local.service_agent_roles
   project  = local.project.project_id