Merge branch 'master' into jccb/toc

This commit is contained in:
Julio Castillo
2023-07-28 17:23:18 +02:00
committed by GitHub

View File

@@ -45,7 +45,7 @@ locals {
trigger_service_account_email = ( trigger_service_account_email = (
try(var.trigger_config.service_account_create, false) try(var.trigger_config.service_account_create, false)
? google_service_account.trigger_service_account[0].email ? google_service_account.trigger_service_account[0].email
: null : try(var.trigger_config.service_account_email, null)
) )
vpc_connector = ( vpc_connector = (
var.vpc_connector == null var.vpc_connector == null
@@ -104,7 +104,7 @@ resource "google_cloudfunctions2_function" "function" {
operator = event_filter.value.operator 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 retry_policy = var.trigger_config.retry_policy
} }
} }