Merge pull request #47 from NandosUK/subtitution-trigger-vars

Add subtitution vars
NandosUK · Jan 3, 2024 · 2db44a0 · 2db44a0
2 parents ec9bc1e + 05e2b9e
commit 2db44a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
@@ -274,15 +274,17 @@ module "trigger_provision" {
   environment     = var.environment
 
   # Substitution variables for Cloud Build Trigger
-  substitutions = {
+  substitutions = merge({
     _STAGE                    = "provision"
     _BUILD_ENV                = var.environment
     _SERVICE_NAME             = var.name
     _DOCKER_ARTIFACT_REGISTRY = var.artifact_repository
     _SERVICE_PATH             = var.service_path
     _LOCATION                 = var.project_region
     _SERVICE_ACCOUNT          = var.cloud_run_service_account
-  }
+    },
+    var.trigger_substitutions
+  )
 }
 
 module "cloud_run_alerts" {

diff --git a/gcp/cloud-run-v2/variables.tf b/gcp/cloud-run-v2/variables.tf
@@ -257,6 +257,12 @@ variable "cloud_armor" {
   }
 }
 
+variable "trigger_substitutions" {
+  description = "Substitution variables for Cloud Build Trigger"
+  type        = map(string)
+  default     = {}
+}
+
 variable "eventarc_triggers" {
   description = "Configuration for Eventarc triggers"
   type = list(object({