Make custom_metrics.metric_stat optional (#19)

we want to be able to omit the metric_stat object, for examples like calculation metrics
nsbno · Jun 24, 2024 · bb578b8 · bb578b8
1 parent ddf7365
commit bb578b8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/main.tf b/main.tf
@@ -611,20 +611,24 @@ resource "aws_appautoscaling_policy" "ecs_service" {
           content {
             label = metrics.value.label
             id    = metrics.value.id
-            metric_stat {
-              metric {
-                metric_name = metrics.value.metric_stat.metric.metric_name
-                namespace   = metrics.value.metric_stat.metric.namespace
-                dynamic "dimensions" {
-                  for_each = metrics.value.metric_stat.metric.dimensions
-                  content {
-                    name  = dimensions.value.name
-                    value = dimensions.value.value
+            dynamic metric_stat {
+              for_each = metrics.value.metric_stat[*]
+              content {
+                metric {
+                  metric_name = metric_stat.value.metric.metric_name
+                  namespace   = metric_stat.value.metric.namespace
+                  dynamic "dimensions" {
+                    for_each = metric_stat.value.metric.dimensions
+                    content {
+                      name  = dimensions.value.name
+                      value = dimensions.value.value
+                    }
                   }
                 }
+                stat = metric_stat.value.stat
               }
-              stat = metrics.value.metric_stat.stat
             }
+            expression = metrics.value.expression
             return_data = metrics.value.return_data
           }
         }

diff --git a/variables.tf b/variables.tf
@@ -239,7 +239,8 @@ variable "custom_metrics" {
   type = list(object({
     label = string
     id    = string
-    metric_stat = object({
+    expression  = optional(string)
+    metric_stat = optional(object({
       metric = object({
         metric_name = string
         namespace   = string
@@ -249,7 +250,7 @@ variable "custom_metrics" {
         }))
       })
       stat = string
-    })
+    }))
     return_data = bool
   }))
   default = []