From ab2368b0c4d2f580a67350d5cda38d327677b824 Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 12:15:17 +0100
Subject: [PATCH 01/13] depends on

---
 gcp/cloud-run-v2/main.tf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 2086e25..8a62ebd 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -307,10 +307,11 @@ resource "google_eventarc_trigger" "default" {
 }
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
+  count   = length(var.eventarc_triggers) && var.cloud_run_service_account != null && var.cloud_run_service_account != "" > 0 ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"
+  depends_on = [ resource.google_eventarc_trigger.default ]
 }
 
 

From 34e04f26ba0e746cfb32afe9c0e9b1f61ffeac1c Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 12:21:42 +0100
Subject: [PATCH 02/13] moving perms up

---
 gcp/cloud-run-v2/main.tf | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 8a62ebd..977d5c7 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -282,6 +282,14 @@ resource "google_compute_url_map" "custom_url_map_https" {
   }
 }
 
+
+resource "google_project_iam_member" "eventarc_cloud_run" {
+  count   = length(var.eventarc_triggers) && var.cloud_run_service_account != null && var.cloud_run_service_account != "" > 0 ? 1 : 0
+  project = var.project_id
+  role    = "roles/eventarc.eventReceiver"
+  member  = "serviceAccount:${var.cloud_run_service_account}"
+}
+
 resource "google_eventarc_trigger" "default" {
   for_each = { for i, trigger in var.eventarc_triggers : i => trigger }
 
@@ -306,15 +314,6 @@ resource "google_eventarc_trigger" "default" {
   }
 }
 
-resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) && var.cloud_run_service_account != null && var.cloud_run_service_account != "" > 0 ? 1 : 0
-  project = var.project_id
-  role    = "roles/eventarc.eventReceiver"
-  member  = "serviceAccount:${var.cloud_run_service_account}"
-  depends_on = [ resource.google_eventarc_trigger.default ]
-}
-
-
 resource "google_project_iam_member" "eventarc_pubsub" {
   project = var.project_id
   role    = "roles/iam.serviceAccountTokenCreator"

From 996f04652f6487167bf7bcd7e322eb7001cecab6 Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 12:27:20 +0100
Subject: [PATCH 03/13] changing default

---
 gcp/cloud-run-v2/main.tf      | 2 +-
 gcp/cloud-run-v2/variables.tf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 977d5c7..4cbb259 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -284,7 +284,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) && var.cloud_run_service_account != null && var.cloud_run_service_account != "" > 0 ? 1 : 0
+  count   = var.eventarc_triggers != null && var.cloud_run_service_account != null && var.cloud_run_service_account != "" > 0 ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"
diff --git a/gcp/cloud-run-v2/variables.tf b/gcp/cloud-run-v2/variables.tf
index 7e40d61..28da5f0 100644
--- a/gcp/cloud-run-v2/variables.tf
+++ b/gcp/cloud-run-v2/variables.tf
@@ -286,7 +286,7 @@ variable "eventarc_triggers" {
       operator  = optional(string)
     }))
   }))
-  default = []
+  default = null
 }
 
 variable "dependencies" {

From 901ed2e91122d301145b3a741614c4ef99bd877b Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 12:50:57 +0100
Subject: [PATCH 04/13] typo

---
 gcp/cloud-run-v2/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 4cbb259..1768951 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -284,7 +284,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = var.eventarc_triggers != null && var.cloud_run_service_account != null && var.cloud_run_service_account != "" > 0 ? 1 : 0
+  count   = var.eventarc_triggers != null && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"

From f68d5e3f0c1945c3f269030ff6c77474619213fb Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 12:55:55 +0100
Subject: [PATCH 05/13] {}

---
 gcp/cloud-run-v2/main.tf      | 2 +-
 gcp/cloud-run-v2/variables.tf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 1768951..fcd3a82 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -284,7 +284,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = var.eventarc_triggers != null && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
+  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"
diff --git a/gcp/cloud-run-v2/variables.tf b/gcp/cloud-run-v2/variables.tf
index 28da5f0..0790bb7 100644
--- a/gcp/cloud-run-v2/variables.tf
+++ b/gcp/cloud-run-v2/variables.tf
@@ -286,7 +286,7 @@ variable "eventarc_triggers" {
       operator  = optional(string)
     }))
   }))
-  default = null
+  default = {}
 }
 
 variable "dependencies" {

From be8ee5c36b3fba59be84c778135938e974f70825 Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 12:58:41 +0100
Subject: [PATCH 06/13] []

---
 gcp/cloud-run-v2/variables.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/variables.tf b/gcp/cloud-run-v2/variables.tf
index 0790bb7..7e40d61 100644
--- a/gcp/cloud-run-v2/variables.tf
+++ b/gcp/cloud-run-v2/variables.tf
@@ -286,7 +286,7 @@ variable "eventarc_triggers" {
       operator  = optional(string)
     }))
   }))
-  default = {}
+  default = []
 }
 
 variable "dependencies" {

From 38c135a0aecd51a41570e86105b32c776473fb7c Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:07:08 +0100
Subject: [PATCH 07/13] testing

---
 gcp/cloud-run-v2/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index fcd3a82..bd33163 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -284,7 +284,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
+  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"

From b6b530beaf02fa1f2bab545b3c38783a4f95dff0 Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:12:20 +0100
Subject: [PATCH 08/13] testing 2

---
 gcp/cloud-run-v2/main.tf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index bd33163..0ee273f 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -3,6 +3,7 @@ data "google_project" "current" {
 }
 
 locals {
+  evenarc_count = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
   cloud_armor_rules = var.cloud_armor.enabled ? yamldecode(file(var.cloud_armor.rules_file_path)) : []
   domain            = var.custom_domain != null ? var.custom_domain : var.environment == "prod" ? "${var.name}.${var.domain_host}" : var.environment == "preview" ? "${var.name}-preview.${var.domain_host}" : "${var.name}-preprod.${var.domain_host}"
   default_backend_config = {
@@ -284,7 +285,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null ? 1 : 0
+  count   = local.evenarc_count
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"

From c01796852768a8714ee5b99931f616f86699f441 Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:15:42 +0100
Subject: [PATCH 09/13] testing 3

---
 gcp/cloud-run-v2/main.tf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 0ee273f..768c0e9 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -3,7 +3,6 @@ data "google_project" "current" {
 }
 
 locals {
-  evenarc_count = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
   cloud_armor_rules = var.cloud_armor.enabled ? yamldecode(file(var.cloud_armor.rules_file_path)) : []
   domain            = var.custom_domain != null ? var.custom_domain : var.environment == "prod" ? "${var.name}.${var.domain_host}" : var.environment == "preview" ? "${var.name}-preview.${var.domain_host}" : "${var.name}-preprod.${var.domain_host}"
   default_backend_config = {
@@ -285,7 +284,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = local.evenarc_count
+  count   =  var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"

From 94d85198a7b1be4777e5438bc62b525e9fa5722d Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:22:15 +0100
Subject: [PATCH 10/13] testing 4

---
 gcp/cloud-run-v2/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 768c0e9..3bdf607 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -284,7 +284,7 @@ resource "google_compute_url_map" "custom_url_map_https" {
 
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   =  var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
+  count   = length(var.eventarc_triggers) > 0 ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"

From d5e0ded741bcb089945160f91dd2da482a0acb0a Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:26:04 +0100
Subject: [PATCH 11/13] moving back

---
 gcp/cloud-run-v2/main.tf | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 3bdf607..a6db687 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -282,14 +282,6 @@ resource "google_compute_url_map" "custom_url_map_https" {
   }
 }
 
-
-resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) > 0 ? 1 : 0
-  project = var.project_id
-  role    = "roles/eventarc.eventReceiver"
-  member  = "serviceAccount:${var.cloud_run_service_account}"
-}
-
 resource "google_eventarc_trigger" "default" {
   for_each = { for i, trigger in var.eventarc_triggers : i => trigger }
 
@@ -314,6 +306,13 @@ resource "google_eventarc_trigger" "default" {
   }
 }
 
+resource "google_project_iam_member" "eventarc_cloud_run" {
+  count   = length(var.eventarc_triggers) > 0 ? 1 : 0
+  project = var.project_id
+  role    = "roles/eventarc.eventReceiver"
+  member  = "serviceAccount:${var.cloud_run_service_account}"
+}
+
 resource "google_project_iam_member" "eventarc_pubsub" {
   project = var.project_id
   role    = "roles/iam.serviceAccountTokenCreator"

From bb7184b02f6b14e6bf220a3c540cfc1849eeed6b Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:27:14 +0100
Subject: [PATCH 12/13] testing 5

---
 gcp/cloud-run-v2/main.tf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index a6db687..0bcf97d 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -307,10 +307,11 @@ resource "google_eventarc_trigger" "default" {
 }
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) > 0 ? 1 : 0
+  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"
+  depends_on = [ var.cloud_run_service_account ]
 }
 
 resource "google_project_iam_member" "eventarc_pubsub" {

From 27864ed46e3498864cd3ed8dc4afe1c465e5d52f Mon Sep 17 00:00:00 2001
From: Aurora Del Rio <aurora.delrioperez@nandos.co.uk>
Date: Mon, 29 Apr 2024 13:29:53 +0100
Subject: [PATCH 13/13] testing back

---
 gcp/cloud-run-v2/main.tf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gcp/cloud-run-v2/main.tf b/gcp/cloud-run-v2/main.tf
index 0bcf97d..a6db687 100644
--- a/gcp/cloud-run-v2/main.tf
+++ b/gcp/cloud-run-v2/main.tf
@@ -307,11 +307,10 @@ resource "google_eventarc_trigger" "default" {
 }
 
 resource "google_project_iam_member" "eventarc_cloud_run" {
-  count   = length(var.eventarc_triggers) > 0 && var.cloud_run_service_account != null && var.cloud_run_service_account != "" ? 1 : 0
+  count   = length(var.eventarc_triggers) > 0 ? 1 : 0
   project = var.project_id
   role    = "roles/eventarc.eventReceiver"
   member  = "serviceAccount:${var.cloud_run_service_account}"
-  depends_on = [ var.cloud_run_service_account ]
 }
 
 resource "google_project_iam_member" "eventarc_pubsub" {