Skip to content

Commit fd7459b

Browse files
committed
fix: ECR Output을 urls와 names로 명확하게 분리
1 parent 817fe53 commit fd7459b

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

terraform-bootstrap/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
output "ecr_repo_names" {
1+
output "ecr_repo_urls" {
22
value = {
33
for k, v in module.ecr : k => v.repository_url
44
}
55
}
66

7-
output "ecr_repo_name" {
7+
output "ecr_repo_names" {
88
value = {
99
for k, v in module.ecr : k => v.repository_name
1010
}

terraform/dev/ecs/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ locals {
1414
for name, def in var.ecs_task_definitions :
1515
name => name == "api-dev" ? merge(def, {
1616
task_definition_name = "api-dev"
17-
container_image = "${var.ecr_repo_names["dev"]}:latest"
17+
container_image = "${var.ecr_repo_urls["dev"]}:latest"
1818
task_role_arn = def.task_role_arn
1919
execution_role_arn = def.execution_role_arn
2020
environment = {}

terraform/dev/ecs/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variable "environment" {
22
type = string
33
}
44

5-
variable "ecr_repo_names" {
5+
variable "ecr_repo_urls" {
66
type = map(string)
77
}
88

terraform/dev/locals.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ locals {
2626
ec2_sg_id = data.terraform_remote_state.common.outputs.security_group_ids["ec2"]
2727
instance_definitions = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
2828
instance_subnet_map = data.terraform_remote_state.common.outputs.public_subnet_ids
29-
ecr_repo_names = data.terraform_remote_state.bootstrap.outputs.ecr_repo_names
29+
ecr_repo_urls = data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls
3030
ecs_services = var.ecs_services
3131
ecs_task_definitions_base = var.ecs_task_definitions_base
3232
alb_target_group_arns = data.terraform_remote_state.common.outputs.target_group_arns
@@ -68,7 +68,7 @@ locals {
6868
task_role_arn = data.terraform_remote_state.common.outputs.role_arn["ecsAppTaskRole"]
6969
},
7070
k == "api-dev" ? {
71-
container_image = "${data.terraform_remote_state.bootstrap.outputs.ecr_repo_names["dev"]}:latest"
71+
container_image = "${data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls["dev"]}:latest"
7272
} : {},
7373
)
7474
}

terraform/dev/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module "ec2" {
1010
module "ecs" {
1111
source = "./ecs"
1212
alb_target_group_arns = local.alb_target_group_arns
13-
ecr_repo_names = local.ecr_repo_names
13+
ecr_repo_urls = local.ecr_repo_urls
1414
ecs_services = var.ecs_services
1515
ecs_task_definitions = local.ecs_task_definitions
1616
environment = local.environment

terraform/dev/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ output "ecs_task_definitions_check" {
22
value = local.ecs_task_definitions
33
}
44

5-
output "ecr_repository_name" {
6-
value = data.terraform_remote_state.bootstrap.outputs.ecr_repo_name["dev"]
5+
output "ecr_repository_names" {
6+
value = data.terraform_remote_state.bootstrap.outputs.ecr_repo_names["dev"]
77
}

terraform/prod/ecs/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ locals {
1414
for name, def in var.ecs_task_definitions :
1515
name => name == "api-prod" ? merge(def, {
1616
task_definition_name = "api-prod"
17-
container_image = "${var.ecr_repo_names["prod"]}:latest"
17+
container_image = "${var.ecr_repo_urls["prod"]}:latest"
1818
task_role_arn = def.task_role_arn
1919
execution_role_arn = def.execution_role_arn
2020
environment = {}

terraform/prod/ecs/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variable "environment" {
22
type = string
33
}
44

5-
variable "ecr_repo_names" {
5+
variable "ecr_repo_urls" {
66
type = map(string)
77
}
88

terraform/prod/locals.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ locals {
2626
ec2_sg_id = data.terraform_remote_state.common.outputs.security_group_ids["ec2"]
2727
instance_definitions = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
2828
instance_subnet_map = data.terraform_remote_state.common.outputs.public_subnet_ids
29-
ecr_repo_names = data.terraform_remote_state.bootstrap.outputs.ecr_repo_names
29+
ecr_repo_urls = data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls
3030
ecs_services = var.ecs_services
3131
ecs_task_definitions_base = var.ecs_task_definitions_base
3232
alb_target_group_arns = data.terraform_remote_state.common.outputs.target_group_arns
@@ -72,7 +72,7 @@ locals {
7272
task_role_arn = data.terraform_remote_state.common.outputs.role_arn["ecsAppTaskRole"]
7373
},
7474
k == "api-prod" ? {
75-
container_image = "${data.terraform_remote_state.bootstrap.outputs.ecr_repo_names["prod"]}:latest"
75+
container_image = "${data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls["prod"]}:latest"
7676
} : {},
7777
)
7878
}

terraform/prod/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module "ec2" {
2020
module "ecs" {
2121
source = "./ecs"
2222
alb_target_group_arns = local.alb_target_group_arns
23-
ecr_repo_names = local.ecr_repo_names
23+
ecr_repo_urls = local.ecr_repo_urls
2424
ecs_services = var.ecs_services
2525
ecs_task_definitions = local.ecs_task_definitions
2626
environment = local.environment

0 commit comments

Comments
 (0)