fix: relay mode conditon

TheKangaroo · TheKangaroo · commit 60ae18dec390 · 2023-10-20T16:18:35.000+02:00
diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
@@ -732,7 +732,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf
@@ -692,7 +692,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
@@ -692,7 +692,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf
@@ -662,7 +662,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
@@ -662,7 +662,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf
@@ -656,7 +656,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf
@@ -656,7 +656,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 
diff --git a/variables.tf b/variables.tf
@@ -626,7 +626,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"
   description = "Mode used to make advanced datapath metrics relay available."
   default     = null
   validation {
-    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)
+    condition     = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)
     error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."
   }
 

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"`
`732`	`732`	`description = "Mode used to make advanced datapath metrics relay available."`
`733`	`733`	`default = null`
`734`	`734`	`validation {`
`735`		`- condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)`
	`735`	`+ condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)`
`736`	`736`	`error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."`
`737`	`737`	`}`
`738`	`738`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"`
`692`	`692`	`description = "Mode used to make advanced datapath metrics relay available."`
`693`	`693`	`default = null`
`694`	`694`	`validation {`
`695`		`- condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)`
	`695`	`+ condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)`
`696`	`696`	`error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."`
`697`	`697`	`}`
`698`	`698`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"`
`662`	`662`	`description = "Mode used to make advanced datapath metrics relay available."`
`663`	`663`	`default = null`
`664`	`664`	`validation {`
`665`		`- condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)`
	`665`	`+ condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)`
`666`	`666`	`error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."`
`667`	`667`	`}`
`668`	`668`
Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"`
`656`	`656`	`description = "Mode used to make advanced datapath metrics relay available."`
`657`	`657`	`default = null`
`658`	`658`	`validation {`
`659`		`- condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)`
	`659`	`+ condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)`
`660`	`660`	`error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."`
`661`	`661`	`}`
`662`	`662`
Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode"`
`626`	`626`	`description = "Mode used to make advanced datapath metrics relay available."`
`627`	`627`	`default = null`
`628`	`628`	`validation {`
`629`		`- condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata)`
	`629`	`+ condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode)`
`630`	`630`	`error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB."`
`631`	`631`	`}`
`632`	`632`