fix: 잘못 참조된 변수 수정

Author: lvalentine6

terraform/dev/ecs/task/variables.tf

@@ -14,12 +14,12 @@ variable "ecs_task_definitions" {
     })), [])
 
     container_definitions = list(object({
-      name        = string
-      image       = string
-      cpu         = number
-      memory      = number
-      essential   = bool
-      stopTimeout = number
+      name      = string
+      image     = string
+      cpu       = number
+      memory    = number
+      essential = bool
+      stopTimeout = optional(number)
 
       command = optional(list(string))
 

terraform/dev/ecs/variables.tf

@@ -32,17 +32,17 @@ variable "ecs_task_definitions" {
     })), [])
 
     container_definitions = list(object({
-      name        = string
-      image       = string
-      cpu         = number
-      memory      = number
-      essential   = bool
-      stopTimeout = number
+      name      = string
+      image     = string
+      cpu       = number
+      memory    = number
+      essential = bool
+      stopTimeout = optional(number)
 
       command = optional(list(string))
 
       portMappings = list(object({
-        name          = string
+        name = optional(string)
         containerPort = number
         hostPort      = number
         protocol      = string

terraform/dev/locals.tf

@@ -63,25 +63,40 @@ locals {
   }
 
   container_definitions_map = {
-    for svc, task_def in local.task_definitions_with_roles : svc =>
-    (svc == "api-dev" ?
+    for svc, task_def in local.task_definitions_with_roles : svc => flatten([
       [
         {
-          name      = "api-dev"
-          image     = "${local.ecr_repo_urls["dev"]}:placeholder"
+          name      = svc
+          image     = svc == "api-dev" ? "${local.ecr_repo_urls["dev"]}:placeholder" : task_def.container_image
           cpu       = task_def.cpu
           memory    = contains(keys(task_def), "memory") ? task_def.memory : null
+          memoryReservation = lookup(task_def, "memoryReservation", null)
           essential = true
-          command = [
+          command   = svc == "api-dev" ? tolist([
             "java", "-javaagent:/dd-java-agent.jar",
             "-Ddd.logs.injection=true", "-Ddd.runtime-metrics.enabled=true",
             "-Ddd.service=eatda-api", "-Ddd.env=dev", "-Ddd.version=v1",
             "-Ddd.agent.host=127.0.0.1",
             "-Dspring.profiles.active=dev", "-jar", "/api.jar"
+          ]) : tolist([])
+          portMappings = [
+            for m in lookup(task_def, "port_mappings", []) :
+            { containerPort = m.container_port, hostPort = m.host_port, protocol = m.protocol }
+          ]
+          environment = [for k, v in lookup(task_def, "environment", {}) : { name = k, value = v }]
+          secrets     = [for s in lookup(task_def, "secrets", []) : { name = s.name, valueFrom = s.valueFrom }]
+          mountPoints = [
+            for vol in lookup(task_def, "volumes", []) : {
+              sourceVolume  = vol.name
+              containerPath = (
+                (svc == "mysql-dev" && vol.name == "dev-mysql-volume") ? "/var/lib/mysql" : vol.containerPath
+              )
+              readOnly = false
+            }
           ]
-          portMappings = [{ containerPort = 8080, hostPort = 0, protocol = "tcp" }]
-          mountPoints = [{ sourceVolume = "dev-api-volume", containerPath = "/logs", readOnly = false }]
-        },
+        }
+      ],
+        svc == "api-dev" ? [
         {
           name      = "datadog-agent"
           image     = "public.ecr.aws/datadog/agent:latest"
@@ -102,32 +117,11 @@ locals {
             { sourceVolume = "proc", containerPath = "/host/proc", readOnly = true },
             { sourceVolume = "cgroup", containerPath = "/host/sys/fs/cgroup", readOnly = true }
           ]
+          command = tolist([])
+          portMappings = []
         }
-      ]
-      :
-      [
-        {
-          name         = svc
-          image        = task_def.container_image
-          cpu          = task_def.cpu
-          memory       = task_def.memory
-          essential    = true
-          portMappings = [
-            for m in lookup(task_def, "port_mappings", []) :
-            { containerPort = m.container_port, hostPort = m.host_port, protocol = m.protocol }
-          ]
-          environment = [for k, v in lookup(task_def, "environment", {}) : { name = k, value = v }]
-          secrets     = [for s in lookup(task_def, "secrets", []) : { name = s.name, valueFrom = s.valueFrom }]
-          mountPoints = [
-            for vol in lookup(task_def, "volumes", []) : {
-              sourceVolume  = vol.name
-              containerPath = (svc == "mysql-dev" && vol.name == "dev-mysql-volume") ? "/var/lib/mysql" :
-                vol.containerPath
-              readOnly = false
-            }
-          ]
-        }
-      ])
+      ] : []
+    ])
   }
 
   final_ecs_definitions_for_module = {

terraform/dev/terraform.tfvars

@@ -31,24 +31,28 @@ ecs_task_definitions_base = {
     environment = {}
     volumes = [
       {
-        name      = "dev-api-volume"
-        host_path = "/home/ec2-user/logs/"
-        readOnly  = false
+        name          = "dev-api-volume"
+        host_path     = "/home/ec2-user/logs/"
+        containerPath = "/logs"
+        readOnly      = false
       },
       {
-        name      = "docker_sock"
-        host_path = "/var/run/docker.sock"
-        readOnly  = true
+        name          = "docker_sock"
+        host_path     = "/var/run/docker.sock"
+        containerPath = "/var/run/docker.sock"
+        readOnly      = true
       },
       {
-        name      = "proc"
-        host_path = "/proc/"
-        readOnly  = true
+        name          = "proc"
+        host_path     = "/proc/"
+        containerPath = "/host/proc"
+        readOnly      = true
       },
       {
-        name      = "cgroup"
-        host_path = "/sys/fs/cgroup/"
-        readOnly  = true
+        name          = "cgroup"
+        host_path     = "/sys/fs/cgroup/"
+        containerPath = "/host/sys/fs/cgroup"
+        readOnly      = true
       }
     ]
   }

terraform/dev/variables.tf

@@ -11,7 +11,8 @@ variable "ecs_services" {
 variable "ecs_task_definitions_base" {
   type = map(object({
     cpu          = number
-    memory       = number
+    memory = optional(number)
+    memoryReservation = optional(number)
     network_mode = string
     environment = map(string)
     requires_compatibilities = optional(list(string))