Merge pull request #82 from remerge/fix-workload-pool

hollow · web-flow · commit 1781bad2ac9d · 2025-11-10T16:05:54.000+01:00
Fix Workload Identity Federation Pool
diff --git a/google/static-website/main.tf b/google/static-website/main.tf
@@ -14,7 +14,7 @@ module "website" {
 
   set_admin_roles = true
   admins = [
-    "serviceAccount:github-actions@github-actions-runner-aef2.iam.gserviceaccount.com",
+    "serviceAccount:github-actions@github-6d1f.iam.gserviceaccount.com",
     "principalSet://iam.googleapis.com/${var.identity_pool}/attribute.repository/${var.identity_organization}/${var.identity_repository}",
   ]
 
diff --git a/google/static-website/variables.tf b/google/static-website/variables.tf
@@ -67,7 +67,7 @@ variable "enable_cdn" {
 variable "identity_pool" {
   description = "Google Cloud Workload Identity Pool"
   type        = string
-  default     = "projects/413626507216/locations/global/workloadIdentityPools/github-actions-pool"
+  default     = "projects/654112073299/locations/global/workloadIdentityPools/github-actions-pool"
 }
 
 variable "identity_organization" {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ module "website" {`
`14`	`14`
`15`	`15`	`set_admin_roles = true`
`16`	`16`	`admins = [`
`17`		`- "serviceAccount:github-actions@github-actions-runner-aef2.iam.gserviceaccount.com",`
	`17`	`+ "serviceAccount:github-actions@github-6d1f.iam.gserviceaccount.com",`
`18`	`18`	`"principalSet://iam.googleapis.com/${var.identity_pool}/attribute.repository/${var.identity_organization}/${var.identity_repository}",`
`19`	`19`	`]`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ variable "enable_cdn" {`
`67`	`67`	`variable "identity_pool" {`
`68`	`68`	`description = "Google Cloud Workload Identity Pool"`
`69`	`69`	`type = string`
`70`		`- default = "projects/413626507216/locations/global/workloadIdentityPools/github-actions-pool"`
	`70`	`+ default = "projects/654112073299/locations/global/workloadIdentityPools/github-actions-pool"`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`variable "identity_organization" {`