From cf567b0c43c36b3a6042fa226ae9e7d5879b2933 Mon Sep 17 00:00:00 2001
From: Miren Esnaola <mirene@google.com>
Date: Tue, 25 Jul 2023 15:56:36 +0200
Subject: [PATCH] Fix in event_filters of trigger_config

---
 modules/cloud-function-v2/README.md    | 2 +-
 modules/cloud-function-v2/main.tf      | 6 +++---
 modules/cloud-function-v2/variables.tf | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/cloud-function-v2/README.md b/modules/cloud-function-v2/README.md
index e22e6566..ca08b884 100644
--- a/modules/cloud-function-v2/README.md
+++ b/modules/cloud-function-v2/README.md
@@ -229,7 +229,7 @@ module "cf-http-two" {
 | [secrets](variables.tf#L122) | Secret Manager secrets. Key is the variable name or mountpoint, volume versions are in version:path format. | <code title="map&#40;object&#40;&#123;&#10;  is_volume  &#61; bool&#10;  project_id &#61; number&#10;  secret     &#61; string&#10;  versions   &#61; list&#40;string&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [service_account](variables.tf#L134) | Service account email. Unused if service account is auto-created. | <code>string</code> |  | <code>null</code> |
 | [service_account_create](variables.tf#L140) | Auto-create service account. | <code>bool</code> |  | <code>false</code> |
-| [trigger_config](variables.tf#L146) | Function trigger configuration. Leave null for HTTP trigger. | <code title="object&#40;&#123;&#10;  event_type   &#61; string&#10;  pubsub_topic &#61; optional&#40;string&#41;&#10;  region       &#61; optional&#40;string&#41;&#10;  event_filters &#61; optional&#40;list&#40;object&#40;&#123;&#10;    attribute &#61; string&#10;    value     &#61; string&#10;    operator  &#61; string&#10;  &#125;&#41;&#41;, &#91;&#93;&#41;&#10;  service_account_email  &#61; optional&#40;string&#41;&#10;  service_account_create &#61; optional&#40;bool, false&#41;&#10;  retry_policy           &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [trigger_config](variables.tf#L146) | Function trigger configuration. Leave null for HTTP trigger. | <code title="object&#40;&#123;&#10;  event_type   &#61; string&#10;  pubsub_topic &#61; optional&#40;string&#41;&#10;  region       &#61; optional&#40;string&#41;&#10;  event_filters &#61; optional&#40;list&#40;object&#40;&#123;&#10;    attribute &#61; string&#10;    value     &#61; string&#10;    operator  &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;, &#91;&#93;&#41;&#10;  service_account_email  &#61; optional&#40;string&#41;&#10;  service_account_create &#61; optional&#40;bool, false&#41;&#10;  retry_policy           &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 | [vpc_connector](variables.tf#L164) | VPC connector configuration. Set create to 'true' if a new connector needs to be created. | <code title="object&#40;&#123;&#10;  create          &#61; bool&#10;  name            &#61; string&#10;  egress_settings &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 | [vpc_connector_config](variables.tf#L174) | VPC connector network configuration. Must be provided if new VPC connector is being created. | <code title="object&#40;&#123;&#10;  ip_cidr_range &#61; string&#10;  network       &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 
diff --git a/modules/cloud-function-v2/main.tf b/modules/cloud-function-v2/main.tf
index ec90738b..a0dc593f 100644
--- a/modules/cloud-function-v2/main.tf
+++ b/modules/cloud-function-v2/main.tf
@@ -99,9 +99,9 @@ resource "google_cloudfunctions2_function" "function" {
         for_each = var.trigger_config.event_filters
         iterator = event_filter
         content {
-          attribute = event_filter.attribute
-          value     = event_filter.value
-          operator  = event_filter.operator
+          attribute = event_filter.value.attribute
+          value     = event_filter.value.value
+          operator  = event_filter.value.operator
         }
       }
       service_account_email = var.trigger_config.service_account_email
diff --git a/modules/cloud-function-v2/variables.tf b/modules/cloud-function-v2/variables.tf
index 53437ef1..b8f12e9a 100644
--- a/modules/cloud-function-v2/variables.tf
+++ b/modules/cloud-function-v2/variables.tf
@@ -152,7 +152,7 @@ variable "trigger_config" {
     event_filters = optional(list(object({
       attribute = string
       value     = string
-      operator  = string
+      operator  = optional(string)
     })), [])
     service_account_email  = optional(string)
     service_account_create = optional(bool, false)