Revert "refactor: replace conditional operator with coalesce in variables.tf"

Ameausoone · Ameausoone · commit efe18f251841 · 2025-02-14T09:32:05.000+01:00
This reverts commit 7434326.
diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
@@ -124,7 +124,7 @@ variable "node_pools_cgroup_mode" {
       "CGROUP_MODE_UNSPECIFIED",
       "CGROUP_MODE_V1",
       "CGROUP_MODE_V2"
-    ], coalesce(var.node_pools_cgroup_mode, ""))
+    ], var.node_pools_cgroup_mode != null ? var.node_pools_cgroup_mode : "")
     error_message = "The node_pools_cgroup_mode must be one of CGROUP_MODE_UNSPECIFIED, CGROUP_MODE_V1, or CGROUP_MODE_V2."
   }
   default = null
diff --git a/modules/beta-autopilot-private-cluster/variables.tf b/modules/beta-autopilot-private-cluster/variables.tf
@@ -123,7 +123,7 @@ variable "node_pools_cgroup_mode" {
       "CGROUP_MODE_UNSPECIFIED",
       "CGROUP_MODE_V1",
       "CGROUP_MODE_V2"
-    ], coalesce(var.node_pools_cgroup_mode, ""))
+    ], var.node_pools_cgroup_mode != null ? var.node_pools_cgroup_mode : "")
     error_message = "The node_pools_cgroup_mode must be one of CGROUP_MODE_UNSPECIFIED, CGROUP_MODE_V1, or CGROUP_MODE_V2."
   }
   default = null
diff --git a/modules/beta-autopilot-public-cluster/variables.tf b/modules/beta-autopilot-public-cluster/variables.tf
@@ -123,7 +123,7 @@ variable "node_pools_cgroup_mode" {
       "CGROUP_MODE_UNSPECIFIED",
       "CGROUP_MODE_V1",
       "CGROUP_MODE_V2"
-    ], coalesce(var.node_pools_cgroup_mode, ""))
+    ], var.node_pools_cgroup_mode != null ? var.node_pools_cgroup_mode : "")
     error_message = "The node_pools_cgroup_mode must be one of CGROUP_MODE_UNSPECIFIED, CGROUP_MODE_V1, or CGROUP_MODE_V2."
   }
   default = null

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ variable "node_pools_cgroup_mode" {`
`124`	`124`	`"CGROUP_MODE_UNSPECIFIED",`
`125`	`125`	`"CGROUP_MODE_V1",`
`126`	`126`	`"CGROUP_MODE_V2"`
`127`		`- ], coalesce(var.node_pools_cgroup_mode, ""))`
	`127`	`+ ], var.node_pools_cgroup_mode != null ? var.node_pools_cgroup_mode : "")`
`128`	`128`	`error_message = "The node_pools_cgroup_mode must be one of CGROUP_MODE_UNSPECIFIED, CGROUP_MODE_V1, or CGROUP_MODE_V2."`
`129`	`129`	`}`
`130`	`130`	`default = null`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ variable "node_pools_cgroup_mode" {`
`123`	`123`	`"CGROUP_MODE_UNSPECIFIED",`
`124`	`124`	`"CGROUP_MODE_V1",`
`125`	`125`	`"CGROUP_MODE_V2"`
`126`		`- ], coalesce(var.node_pools_cgroup_mode, ""))`
	`126`	`+ ], var.node_pools_cgroup_mode != null ? var.node_pools_cgroup_mode : "")`
`127`	`127`	`error_message = "The node_pools_cgroup_mode must be one of CGROUP_MODE_UNSPECIFIED, CGROUP_MODE_V1, or CGROUP_MODE_V2."`
`128`	`128`	`}`
`129`	`129`	`default = null`