fix: 테스크 데이터 조합을 최상위에서 하도록 변경

lvalentine6 · lvalentine6 · commit d233caf47a76 · 2025-06-28T08:28:50.000+09:00
diff --git a/terraform/dev/ecs/locals.tf b/terraform/dev/ecs/locals.tf
@@ -9,127 +9,4 @@ locals {
   }
 
   deployment_controller_type = "ECS"
-
-  resolved_task_definitions = {
-    for name, def in var.ecs_task_definitions :
-    name => name == "api-dev" ? merge(def, {
-      task_definition_name = "api-dev"
-      container_image      = "${var.ecr_repo_urls["dev"]}:placeholder"
-      task_role_arn        = def.task_role_arn
-      execution_role_arn   = def.execution_role_arn
-      environment = {}
-      secrets = []
-    }) : name == "mysql-dev" ? merge(def, {
-      task_definition_name = "mysql-dev"
-      container_image      = "mysql:8"
-      task_role_arn        = def.task_role_arn
-      execution_role_arn   = def.execution_role_arn
-      environment = {
-        MYSQL_DATABASE = "eatda"
-      }
-      secrets = [
-        {
-          name      = "MYSQL_USER"
-          valueFrom = "/dev/MYSQL_USER_NAME"
-        },
-        {
-          name      = "MYSQL_ROOT_PASSWORD"
-          valueFrom = "/dev/MYSQL_ROOT_PASSWORD"
-        },
-        {
-          name      = "MYSQL_PASSWORD"
-          valueFrom = "/dev/MYSQL_PASSWORD"
-        }
-      ]
-    }) : merge(def, {
-      task_definition_name = "dummy"
-      container_image      = "dummy"
-      task_role_arn        = def.task_role_arn
-      execution_role_arn   = def.execution_role_arn
-      environment = {
-        MYSQL_DATABASE = "dummy"
-      }
-      secrets = [
-        {
-          name      = "DUMMY"
-          valueFrom = "/dummy"
-        },
-        {
-          name      = "DUMMY"
-          valueFrom = "/dummy"
-        },
-        {
-          name      = "DUMMY"
-          valueFrom = "/dummy"
-        }
-      ]
-    })
-  }
-
-  resolved_ecs_services = {
-    for name, def in var.ecs_services : name => {
-      name         = name
-      iam_role_arn = var.ecs_task_definitions[name].task_role_arn
-      load_balancer = try(def.load_balancer, null)
-    }
-  }
-
-  container_definitions_map = {
-    for svc, def in local.resolved_task_definitions : svc => [
-      {
-        name      = def.task_definition_name
-        image     = def.container_image
-        cpu       = def.cpu
-        memory    = def.memory
-        essential = true
-        stopTimeout = lookup(def, "stop_timeout", var.default_stop_timeout)
-        command   = svc == "api-dev" ? [
-          "java",
-          "-Dspring.profiles.active=dev",
-          "-jar",
-          "/api.jar"
-        ] : null
-
-        portMappings = [
-          for idx, port in def.container_port : {
-            name          = "${svc}-${port}-tcp"
-            containerPort = port
-            hostPort      = def.host_port[idx]
-            protocol = lookup(def, "protocol", var.default_protocol)
-          }
-        ]
-
-        environment = [
-          for k, v in def.environment : {
-            name  = k
-            value = v
-          }
-        ]
-
-        secrets = [
-          for s in def.secrets : {
-            name      = s.name
-            valueFrom = s.valueFrom
-          }
-        ]
-
-        mountPoints = [
-          for vol in (def.volumes != null ? def.volumes : []) : {
-            sourceVolume = vol.name
-            containerPath = lookup(var.volume_mount_paths, vol.name, "/eatda")
-            readOnly     = false
-          }
-        ]
-      }
-    ]
-  }
-
-  final_task_definitions = {
-    for key, task_def in local.resolved_task_definitions : key => merge(
-      task_def,
-      {
-        container_definitions = local.container_definitions_map[key]
-      }
-    )
-  }
 }
diff --git a/terraform/dev/ecs/main.tf b/terraform/dev/ecs/main.tf
@@ -19,6 +19,6 @@ module "service" {
 
 module "task" {
   source               = "./task"
-  ecs_task_definitions = local.final_task_definitions
+  ecs_task_definitions = var.ecs_task_definitions
   tags                 = var.tags
 }
diff --git a/terraform/dev/ecs/task/variables.tf b/terraform/dev/ecs/task/variables.tf
@@ -1,21 +1,51 @@
 variable "ecs_task_definitions" {
-  description = "Resolved task definition map (with image, roles, etc)"
+  description = "A strictly-typed, unified map for all task definition properties."
+
   type = map(object({
     cpu                = number
     memory             = number
     network_mode       = string
-    container_image    = string
     task_role_arn      = string
     execution_role_arn = string
     requires_compatibilities = list(string)
-    container_port = list(number)
-    host_port = list(number)
     volumes = optional(list(object({
       name      = string
       host_path = string
     })), [])
-    environment = optional(map(string), {})
-    container_definitions = any
+
+    container_definitions = list(object({
+      name        = string
+      image       = string
+      cpu         = number
+      memory      = number
+      essential   = bool
+      stopTimeout = number
+
+      command = optional(list(string))
+
+      portMappings = list(object({
+        name          = string
+        containerPort = number
+        hostPort      = number
+        protocol      = string
+      }))
+
+      environment = optional(list(object({
+        name  = string
+        value = string
+      })), [])
+
+      secrets = optional(list(object({
+        name      = string
+        valueFrom = string
+      })), [])
+
+      mountPoints = optional(list(object({
+        sourceVolume  = string
+        containerPath = string
+        readOnly      = bool
+      })), [])
+    }))
   }))
 }
 
diff --git a/terraform/dev/ecs/variables.tf b/terraform/dev/ecs/variables.tf
@@ -6,31 +6,63 @@ variable "ecr_repo_urls" {
   type = map(string)
 }
 
+variable "ecs_services" {
+  type = map(object({
+    load_balancer = optional(object({
+      target_group_key = string
+      container_name   = string
+      container_port   = number
+    }))
+  }))
+}
+
 variable "ecs_task_definitions" {
+  description = "A strictly-typed, unified map for all task definition properties."
+
   type = map(object({
     cpu                = number
     memory             = number
     network_mode       = string
-    container_port = list(number)
-    host_port = list(number)
-    environment = map(string)
-    container_image    = string
-    execution_role_arn = string
     task_role_arn      = string
+    execution_role_arn = string
     requires_compatibilities = list(string)
-    volumes = list(object({
+    volumes = optional(list(object({
       name      = string
       host_path = string
-    }))
-  }))
-}
+    })), [])
 
-variable "ecs_services" {
-  type = map(object({
-    load_balancer = optional(object({
-      target_group_key = string
-      container_name   = string
-      container_port   = number
+    container_definitions = list(object({
+      name        = string
+      image       = string
+      cpu         = number
+      memory      = number
+      essential   = bool
+      stopTimeout = number
+
+      command = optional(list(string))
+
+      portMappings = list(object({
+        name          = string
+        containerPort = number
+        hostPort      = number
+        protocol      = string
+      }))
+
+      environment = optional(list(object({
+        name  = string
+        value = string
+      })), [])
+
+      secrets = optional(list(object({
+        name      = string
+        valueFrom = string
+      })), [])
+
+      mountPoints = optional(list(object({
+        sourceVolume  = string
+        containerPath = string
+        readOnly      = bool
+      })), [])
     }))
   }))
 }
diff --git a/terraform/dev/locals.tf b/terraform/dev/locals.tf
@@ -23,53 +23,77 @@ locals {
   environment  = "dev"
   name_prefix  = "eatda"
 
-  ec2_sg_id                 = data.terraform_remote_state.common.outputs.security_group_ids["ec2"]
-  instance_definitions      = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
-  instance_subnet_map       = data.terraform_remote_state.common.outputs.public_subnet_ids
-  ecr_repo_urls             = data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls
-  ecs_services              = var.ecs_services
-  ecs_task_definitions_base = var.ecs_task_definitions_base
-  alb_target_group_arns     = data.terraform_remote_state.common.outputs.target_group_arns
+  ec2_sg_id             = data.terraform_remote_state.common.outputs.security_group_ids["ec2"]
+  instance_subnet_map = data.terraform_remote_state.common.outputs.public_subnet_ids # 에러가 났던 부분
+  ecr_repo_urls         = data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls
+  ecs_services          = var.ecs_services
+  alb_target_group_arns = data.terraform_remote_state.common.outputs.target_group_arns
 
   common_tags = {
     Project   = local.project_name
     ManagedBy = "terraform"
   }
-}
 
-locals {
   dev_instance_definitions = {
     ami                  = "ami-012ea6058806ff688"
     instance_type        = "t2.micro"
     role                 = "dev"
-    iam_instance_profile = "ec2-to-ecs"
+    iam_instance_profile = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
     key_name             = "eatda-ec2-dev-key"
     user_data            = <<-EOF
 #!/bin/bash
 echo ECS_CLUSTER=dev-cluster >> /etc/ecs/ecs.config
-
 fallocate -l 2G /swapfile
 chmod 600 /swapfile
 mkswap /swapfile
 swapon /swapfile
-
 echo '/swapfile none swap sw 0 0' >> /etc/fstab
 EOF
   }
-}
 
-locals {
-  ecs_task_definitions = {
+  task_definitions_with_roles = {
     for k, v in var.ecs_task_definitions_base :
     k => merge(
       v,
       {
         execution_role_arn = data.terraform_remote_state.common.outputs.role_arn["ecsTaskExecutionRole"],
         task_role_arn      = data.terraform_remote_state.common.outputs.role_arn["ecsAppTaskRole"]
-      },
-        k == "api-dev" ? {
-        container_image = "${data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls["dev"]}:placeholder"
-      } : {},
+      }
+    )
+  }
+
+  container_definitions_map = {
+    for svc, def in local.task_definitions_with_roles : svc => [
+      {
+        name         = svc
+        image        = svc == "api-dev" ? "${local.ecr_repo_urls["dev"]}:placeholder" : def.container_image
+        cpu          = def.cpu
+        memory       = def.memory
+        essential    = true
+        stopTimeout = lookup(def, "stop_timeout", 30)
+        command      = svc == "api-dev" ? ["java", "-Dspring.profiles.active=dev", "-jar", "/api.jar"] : null
+        portMappings = [
+          for idx, port in def.container_port :
+          { name = "${svc}-${port}-tcp", containerPort = port, hostPort = def.host_port[idx], protocol = "tcp" }
+        ]
+        environment = [for k, v in lookup(def, "environment", {}) : { name = k, value = v }]
+        secrets     = [for s in lookup(def, "secrets", []) : { name = s.name, valueFrom = s.valueFrom }]
+        mountPoints = [
+          for vol in lookup(def, "volumes", []) :{
+            sourceVolume = vol.name, containerPath = lookup(var.volume_mount_paths, vol.name, "/eatda"),
+            readOnly     = false
+          }
+        ]
+      }
+    ]
+  }
+
+  final_ecs_definitions_for_module = {
+    for key, task_def in local.task_definitions_with_roles : key => merge(
+      task_def,
+      {
+        container_definitions = local.container_definitions_map[key]
+      }
     )
   }
 }
diff --git a/terraform/dev/main.tf b/terraform/dev/main.tf
@@ -12,7 +12,7 @@ module "ecs" {
   alb_target_group_arns = local.alb_target_group_arns
   ecr_repo_urls         = local.ecr_repo_urls
   ecs_services          = var.ecs_services
-  ecs_task_definitions  = local.ecs_task_definitions
+  ecs_task_definitions  = local.final_ecs_definitions_for_module
   environment           = local.environment
   tags                  = local.common_tags
 }
diff --git a/terraform/dev/outputs.tf b/terraform/dev/outputs.tf
@@ -1,5 +1,5 @@
 output "ecs_task_definitions_check" {
-  value = local.ecs_task_definitions
+  value = local.final_ecs_definitions_for_module
 }
 
 output "ecr_repository_name" {
diff --git a/terraform/dev/variables.tf b/terraform/dev/variables.tf
@@ -25,4 +25,10 @@ variable "ecs_task_definitions_base" {
       host_path = string
     }))
   }))
-}
+}
+
+variable "volume_mount_paths" {
+  description = "A map of volume names to their mount paths inside the container."
+  type = map(string)
+  default = {}
+}

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ module "service" {`
`19`	`19`
`20`	`20`	`module "task" {`
`21`	`21`	`source = "./task"`
`22`		`- ecs_task_definitions = local.final_task_definitions`
	`22`	`+ ecs_task_definitions = var.ecs_task_definitions`
`23`	`23`	`tags = var.tags`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ module "ecs" {`
`12`	`12`	`alb_target_group_arns = local.alb_target_group_arns`
`13`	`13`	`ecr_repo_urls = local.ecr_repo_urls`
`14`	`14`	`ecs_services = var.ecs_services`
`15`		`- ecs_task_definitions = local.ecs_task_definitions`
	`15`	`+ ecs_task_definitions = local.final_ecs_definitions_for_module`
`16`	`16`	`environment = local.environment`
`17`	`17`	`tags = local.common_tags`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`output "ecs_task_definitions_check" {`
`2`		`- value = local.ecs_task_definitions`
	`2`	`+ value = local.final_ecs_definitions_for_module`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`output "ecr_repository_name" {`