managed_prometheus with a static block

abousias · web-flow · commit c5170bb58cab · 2022-06-22T14:00:37.000Z
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -89,16 +89,12 @@ resource "google_container_cluster" "primary" {
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
   dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []
+    for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []
 
     content {
       enable_components = var.monitoring_enabled_components
-      dynamic "managed_prometheus" {
-        for_each = var.enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.enable_managed_prometheus
-        }
+      managed_prometheus {
+        enabled = var.enable_managed_prometheus
       }
     }
   }
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -78,16 +78,12 @@ resource "google_container_cluster" "primary" {
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
   dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []
+    for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []
 
     content {
       enable_components = var.monitoring_enabled_components
-      dynamic "managed_prometheus" {
-        for_each = var.enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.enable_managed_prometheus
-        }
+      managed_prometheus {
+        enabled = var.enable_managed_prometheus
       }
     }
   }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -78,16 +78,12 @@ resource "google_container_cluster" "primary" {
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
   dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []
+    for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []
 
     content {
       enable_components = var.monitoring_enabled_components
-      dynamic "managed_prometheus" {
-        for_each = var.enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.enable_managed_prometheus
-        }
+      managed_prometheus {
+        enabled = var.enable_managed_prometheus
       }
     }
   }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -78,16 +78,12 @@ resource "google_container_cluster" "primary" {
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
   dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []
+    for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []
 
     content {
       enable_components = var.monitoring_enabled_components
-      dynamic "managed_prometheus" {
-        for_each = var.enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.enable_managed_prometheus
-        }
+      managed_prometheus {
+        enabled = var.enable_managed_prometheus
       }
     }
   }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -78,16 +78,12 @@ resource "google_container_cluster" "primary" {
   }
   monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
   dynamic "monitoring_config" {
-    for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []
+    for_each = length(var.monitoring_enabled_components) > 0 || var.enable_managed_prometheus ? [1] : []
 
     content {
       enable_components = var.monitoring_enabled_components
-      dynamic "managed_prometheus" {
-        for_each = var.enable_managed_prometheus ? [1] : []
-
-        content {
-          enabled = var.enable_managed_prometheus
-        }
+      managed_prometheus {
+        enabled = var.enable_managed_prometheus
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -89,16 +89,12 @@ resource "google_container_cluster" "primary" {`
`89`	`89`	`}`
`90`	`90`	`monitoring_service = local.cluster_telemetry_type_is_set \|\| local.logmon_config_is_set ? null : var.monitoring_service`
`91`	`91`	`dynamic "monitoring_config" {`
`92`		`- for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []`
	`92`	`+ for_each = length(var.monitoring_enabled_components) > 0 \|\| var.enable_managed_prometheus ? [1] : []`
`93`	`93`
`94`	`94`	`content {`
`95`	`95`	`enable_components = var.monitoring_enabled_components`
`96`		`- dynamic "managed_prometheus" {`
`97`		`- for_each = var.enable_managed_prometheus ? [1] : []`
`98`		`-`
`99`		`- content {`
`100`		`- enabled = var.enable_managed_prometheus`
`101`		`- }`
	`96`	`+ managed_prometheus {`
	`97`	`+ enabled = var.enable_managed_prometheus`
`102`	`98`	`}`
`103`	`99`	`}`
`104`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,16 +78,12 @@ resource "google_container_cluster" "primary" {`
`78`	`78`	`}`
`79`	`79`	`monitoring_service = local.cluster_telemetry_type_is_set \|\| local.logmon_config_is_set ? null : var.monitoring_service`
`80`	`80`	`dynamic "monitoring_config" {`
`81`		`- for_each = length(var.monitoring_enabled_components) > 0 ? [1] : []`
	`81`	`+ for_each = length(var.monitoring_enabled_components) > 0 \|\| var.enable_managed_prometheus ? [1] : []`
`82`	`82`
`83`	`83`	`content {`
`84`	`84`	`enable_components = var.monitoring_enabled_components`
`85`		`- dynamic "managed_prometheus" {`
`86`		`- for_each = var.enable_managed_prometheus ? [1] : []`
`87`		`-`
`88`		`- content {`
`89`		`- enabled = var.enable_managed_prometheus`
`90`		`- }`
	`85`	`+ managed_prometheus {`
	`86`	`+ enabled = var.enable_managed_prometheus`
`91`	`87`	`}`
`92`	`88`	`}`
`93`	`89`	`}`