From a89e0dac312211f6bc88f97a7c9e412cbb55c3fe Mon Sep 17 00:00:00 2001
From: Miren Esnaola <mirene@google.com>
Date: Fri, 28 Jul 2023 16:30:46 +0200
Subject: [PATCH] Fixes in cloud function v2 module for trigger service account

---
 modules/cloud-function-v2/main.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/cloud-function-v2/main.tf b/modules/cloud-function-v2/main.tf
index a0dc593f..23699fc4 100644
--- a/modules/cloud-function-v2/main.tf
+++ b/modules/cloud-function-v2/main.tf
@@ -45,7 +45,7 @@ locals {
   trigger_service_account_email = (
     try(var.trigger_config.service_account_create, false)
     ? google_service_account.trigger_service_account[0].email
-    : null
+    : try(var.trigger_config.service_account_email, null)
   )
   vpc_connector = (
     var.vpc_connector == null
@@ -104,7 +104,7 @@ resource "google_cloudfunctions2_function" "function" {
           operator  = event_filter.value.operator
         }
       }
-      service_account_email = var.trigger_config.service_account_email
+      service_account_email = local.trigger_service_account_email
       retry_policy          = var.trigger_config.retry_policy
     }
   }