fix: cloud build trigger regex to only match the correct branches (#53)

terraform-google-modules · Aug 6, 2020 · f555239 · f555239
1 parent b933b9b
commit f555239
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/modules/cloudbuild/main.tf b/modules/cloudbuild/main.tf
@@ -19,8 +19,7 @@ locals {
   cloudbuild_apis             = ["cloudbuild.googleapis.com", "sourcerepo.googleapis.com", "cloudkms.googleapis.com"]
   impersonation_enabled_count = var.sa_enable_impersonation == true ? 1 : 0
   activate_apis               = distinct(var.activate_apis)
-  apply_branches_regex        = "(${join("|", var.terraform_apply_branches)})"
-  plan_branches_regex         = "[^${join("|", var.terraform_apply_branches)}]"
+  apply_branches_regex        = "^(${join("|", var.terraform_apply_branches)})$"
 }
 
 resource "random_id" "suffix" {
@@ -204,8 +203,9 @@ resource "google_cloudbuild_trigger" "non_master_trigger" {
   description = "${each.value} - terraform plan."
 
   trigger_template {
-    branch_name = local.plan_branches_regex
-    repo_name   = each.value
+    invert_regex = true
+    branch_name  = local.apply_branches_regex
+    repo_name    = each.value
   }
 
   substitutions = {