From 3e67fc00ca53d4ebc15238d5816a881d1661b944 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 22 May 2023 16:00:20 +0200 Subject: [PATCH 1/2] Add default Cloud Build SA to project module --- modules/project/service-accounts.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/project/service-accounts.tf b/modules/project/service-accounts.tf index 4c6b419c77..2c6104f440 100644 --- a/modules/project/service-accounts.tf +++ b/modules/project/service-accounts.tf @@ -27,6 +27,7 @@ locals { _service_agents_data = yamldecode(file("${path.module}/service-agents.yaml")) service_accounts_default = { compute = "${local.project.number}-compute@developer.gserviceaccount.com" + cloudbuild = "${local.project.number}@cloudbuild.gserviceaccount.com" gae = "${local.project.project_id}@appspot.gserviceaccount.com" workstations = "service-${local.project.number}@gcp-sa-workstationsvm.iam.gserviceaccount.com" } From fddf8b52bcdb96212e4661ffeebfe341899f0cb2 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 22 May 2023 19:11:03 +0200 Subject: [PATCH 2/2] Fix sort order --- modules/project/service-accounts.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/project/service-accounts.tf b/modules/project/service-accounts.tf index 2c6104f440..5e06efb5e9 100644 --- a/modules/project/service-accounts.tf +++ b/modules/project/service-accounts.tf @@ -26,8 +26,8 @@ locals { } _service_agents_data = yamldecode(file("${path.module}/service-agents.yaml")) service_accounts_default = { - compute = "${local.project.number}-compute@developer.gserviceaccount.com" cloudbuild = "${local.project.number}@cloudbuild.gserviceaccount.com" + compute = "${local.project.number}-compute@developer.gserviceaccount.com" gae = "${local.project.project_id}@appspot.gserviceaccount.com" workstations = "service-${local.project.number}@gcp-sa-workstationsvm.iam.gserviceaccount.com" }