Support conformance env lifecycle in GCP CI Cloud Build

Author: roger2hk

deployment/modules/gcp/cloudrun/main.tf

@@ -9,6 +9,12 @@ terraform {
 
 # Cloud Run
 
+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}"
+}
+
 resource "google_project_service" "cloudrun_api" {
   service            = "run.googleapis.com"
   disable_on_destroy = false
@@ -17,18 +23,13 @@ resource "google_project_service" "cloudrun_api" {
 module "cloudrun_iam" {
   source = "./iam"
 
-  env                  = var.env
-  project_id           = var.project_id
-  bucket               = var.bucket
-  log_spanner_instance = var.log_spanner_instance
-  log_spanner_db       = var.log_spanner_db
-  dedup_spanner_db     = var.dedup_spanner_db
-}
-
-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}"
+  project_id                  = var.project_id
+  env                         = var.env
+  cloudrun_service_account_id = local.cloudrun_service_account_id
+  bucket                      = var.bucket
+  log_spanner_instance        = var.log_spanner_instance
+  log_spanner_db              = var.log_spanner_db
+  dedup_spanner_db            = var.dedup_spanner_db
 }
 
 resource "google_cloud_run_v2_service" "default" {