From e28f7c3237697f157309fa76b2e9d9cfad211d39 Mon Sep 17 00:00:00 2001
From: mwarm2 <146739275+mwarm2@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:37:45 +0200
Subject: [PATCH] Fix Apigee add-ons configuration (#1798)

* Revert "Merge pull request #1694 from eddern/eddern/fix-apigee-addons-config"

This reverts commit ec7a7a96057a2df5b496e54c9c6a1bb46ad664ff, reversing
changes made to df5daab6cc6098fe89cb7c3d692ef7d0308c7bc6.

* Flip for_each ternary: use true to enable an add-on

When a given add-on's variable is set to true, do instantiate the block.

---------

Co-authored-by: Julio Castillo <jccb@google.com>
Co-authored-by: Ludovico Magnocavallo <ludomagno@google.com>
---
 modules/apigee/main.tf | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf
index 67fd74be..46f76555 100644
--- a/modules/apigee/main.tf
+++ b/modules/apigee/main.tf
@@ -137,20 +137,35 @@ resource "google_apigee_addons_config" "addons_config" {
   for_each = toset(var.addons_config == null ? [] : [""])
   org      = local.org_name
   addons_config {
-    advanced_api_ops_config {
-      enabled = var.addons_config.advanced_api_ops
+    dynamic "advanced_api_ops_config" {
+      for_each = var.addons_config.advanced_api_ops ? [""] : []
+      content {
+        enabled = true
+      }
     }
-    api_security_config {
-      enabled = var.addons_config.api_security
+    dynamic "api_security_config" {
+      for_each = var.addons_config.api_security ? [""] : []
+      content {
+        enabled = true
+      }
     }
-    connectors_platform_config {
-      enabled = var.addons_config.connectors_platform
+    dynamic "connectors_platform_config" {
+      for_each = var.addons_config.connectors_platform ? [""] : []
+      content {
+        enabled = true
+      }
     }
-    integration_config {
-      enabled = var.addons_config.integration
+    dynamic "integration_config" {
+      for_each = var.addons_config.integration ? [""] : []
+      content {
+        enabled = true
+      }
     }
-    monetization_config {
-      enabled = var.addons_config.monetization
+    dynamic "monetization_config" {
+      for_each = var.addons_config.monetization ? [""] : []
+      content {
+        enabled = true
+      }
     }
   }
 }