Skip to content

Commit 280d85b

Browse files
authored
fix: don't reference created roles when using custom roles (#8)
The problem is that coalesce evaluates both parameters, leading to an error when you try to apply because there's no elements in the array.
1 parent 3015c7e commit 280d85b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

modules/ecs/task_definitions.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ resource "aws_ecs_task_definition" "server" {
128128
requires_compatibilities = ["FARGATE"]
129129
cpu = var.server_cpu
130130
memory = var.server_memory
131-
execution_role_arn = coalesce(var.execution_role_arn, aws_iam_role.execution[0].arn)
132-
task_role_arn = coalesce(var.server_role_arn, aws_iam_role.server[0].arn)
131+
execution_role_arn = var.execution_role_arn != null ? var.execution_role_arn : aws_iam_role.execution[0].arn
132+
task_role_arn = var.server_role_arn != null ? var.server_role_arn : aws_iam_role.server[0].arn
133133
container_definitions = coalesce(var.server_container_definition, local.default_server_container_definition)
134134
}
135135

@@ -140,8 +140,8 @@ resource "aws_ecs_task_definition" "drain" {
140140
requires_compatibilities = ["FARGATE"]
141141
cpu = var.drain_cpu
142142
memory = var.drain_memory
143-
execution_role_arn = coalesce(var.execution_role_arn, aws_iam_role.execution[0].arn)
144-
task_role_arn = coalesce(var.drain_role_arn, aws_iam_role.drain[0].arn)
143+
execution_role_arn = var.execution_role_arn != null ? var.execution_role_arn : aws_iam_role.execution[0].arn
144+
task_role_arn = var.drain_role_arn != null ? var.drain_role_arn : aws_iam_role.drain[0].arn
145145
container_definitions = coalesce(var.drain_container_definitions, local.default_drain_container_definition)
146146
}
147147

@@ -152,7 +152,7 @@ resource "aws_ecs_task_definition" "scheduler" {
152152
requires_compatibilities = ["FARGATE"]
153153
cpu = var.scheduler_cpu
154154
memory = var.scheduler_memory
155-
execution_role_arn = coalesce(var.execution_role_arn, aws_iam_role.execution[0].arn)
156-
task_role_arn = coalesce(var.scheduler_role_arn, aws_iam_role.scheduler[0].arn)
155+
execution_role_arn = var.execution_role_arn != null ? var.execution_role_arn : aws_iam_role.execution[0].arn
156+
task_role_arn = var.scheduler_role_arn != null ? var.scheduler_role_arn : aws_iam_role.scheduler[0].arn
157157
container_definitions = coalesce(var.scheduler_container_definition, local.default_scheduler_container_definition)
158158
}

0 commit comments

Comments
 (0)