Support conformance env lifecycle in GCP CI Cloud Build

Author: roger2hk

deployment/modules/gcp/cloudrun/iam/main.tf

@@ -1,5 +1,5 @@
 resource "google_service_account" "cloudrun_service_account" {
-  account_id   = "cloudrun-${var.env}-sa"
+  account_id   = var.cloudrun_service_account_id
   display_name = "Service Account for Cloud Run (${var.env})"
 }
 

deployment/modules/gcp/cloudrun/iam/outputs.tf

@@ -0,0 +1,4 @@
+output "cloudrun_service_account" {
+  description = "The Cloud Run service account"
+  value       = google_service_account.cloudrun_service_account
+}

deployment/modules/gcp/cloudrun/iam/variables.tf

@@ -8,6 +8,11 @@ variable "env" {
   type        = string
 }
 
+variable "cloudrun_service_account_id" {
+  description = "The Clour Run service account ID to be created"
+  type        = string
+}
+
 variable "bucket" {
   description = "Log GCS bucket"
   type        = string

deployment/modules/gcp/cloudrun/main.tf

@@ -26,6 +26,7 @@ module "cloudrun_iam" {
 }
 
 locals {
+  cloudrun_service_account_id = "cloudrun-${var.env}-sa"
   spanner_log_db_path   = "projects/${var.project_id}/instances/${var.log_spanner_instance}/databases/${var.log_spanner_db}"
   spanner_dedup_db_path = "projects/${var.project_id}/instances/${var.log_spanner_instance}/databases/${var.dedup_spanner_db}"
 }
@@ -36,7 +37,7 @@ resource "google_cloud_run_v2_service" "default" {
   launch_stage = "GA"
 
   template {
-    service_account                  = google_service_account.cloudrun_service_account.account_id
+    service_account                  = module.cloudrun_iam.cloudrun_service_account.account_id
     max_instance_request_concurrency = 700
     timeout                          = "5s"