fixremove deprecated metric feature flag

github-aws-runners · Dec 20, 2024 · b6b2054 · b6b2054
1 parent c5d4693
commit b6b2054
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 35 deletions.
diff --git a/modules/multi-runner/variables.deprecated.tf b/modules/multi-runner/variables.deprecated.tf
diff --git a/modules/termination-watcher/variables.tf b/modules/termination-watcher/variables.tf
@@ -30,7 +30,6 @@ variable "config" {
   type = object({
     aws_partition         = optional(string, null)
     architecture          = optional(string, null)
-    enable_metric         = optional(string, null)
     environment_variables = optional(map(string), {})
     features = optional(object({
       enable_spot_termination_handler              = optional(bool, true)
@@ -72,9 +71,4 @@ variable "config" {
     }), {})
     zip = optional(string, null)
   })
-
-  validation {
-    condition     = var.config.enable_metric == null
-    error_message = "enable_metric is deprecated, use metrics.enable instead."
-  }
 }
diff --git a/variables.tf b/variables.tf
@@ -888,8 +888,7 @@ variable "instance_termination_watcher" {
   EOF
 
   type = object({
-    enable        = optional(bool, false)
-    enable_metric = optional(string, null) # deprectaed
+    enable = optional(bool, false)
     features = optional(object({
       enable_spot_termination_handler              = optional(bool, true)
       enable_spot_termination_notification_watcher = optional(bool, true)
@@ -902,10 +901,6 @@ variable "instance_termination_watcher" {
   })
   default = {}
 
-  validation {
-    condition     = var.instance_termination_watcher.enable_metric == null
-    error_message = "The variable `instance_termination_watcher.enable_metric` is deprecated, use `metrics` instead."
-  }
 }
 
 variable "runners_ebs_optimized" {