Skip to content

Commit b6b2054

Browse files
committed
fixremove deprecated metric feature flag
1 parent c5d4693 commit b6b2054

File tree

3 files changed

+1
-35
lines changed

3 files changed

+1
-35
lines changed

modules/multi-runner/variables.deprecated.tf

-23
This file was deleted.

modules/termination-watcher/variables.tf

-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ variable "config" {
3030
type = object({
3131
aws_partition = optional(string, null)
3232
architecture = optional(string, null)
33-
enable_metric = optional(string, null)
3433
environment_variables = optional(map(string), {})
3534
features = optional(object({
3635
enable_spot_termination_handler = optional(bool, true)
@@ -72,9 +71,4 @@ variable "config" {
7271
}), {})
7372
zip = optional(string, null)
7473
})
75-
76-
validation {
77-
condition = var.config.enable_metric == null
78-
error_message = "enable_metric is deprecated, use metrics.enable instead."
79-
}
8074
}

variables.tf

+1-6
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,7 @@ variable "instance_termination_watcher" {
888888
EOF
889889

890890
type = object({
891-
enable = optional(bool, false)
892-
enable_metric = optional(string, null) # deprectaed
891+
enable = optional(bool, false)
893892
features = optional(object({
894893
enable_spot_termination_handler = optional(bool, true)
895894
enable_spot_termination_notification_watcher = optional(bool, true)
@@ -902,10 +901,6 @@ variable "instance_termination_watcher" {
902901
})
903902
default = {}
904903

905-
validation {
906-
condition = var.instance_termination_watcher.enable_metric == null
907-
error_message = "The variable `instance_termination_watcher.enable_metric` is deprecated, use `metrics` instead."
908-
}
909904
}
910905

911906
variable "runners_ebs_optimized" {

0 commit comments

Comments
 (0)