|
7 | 7 | create_exec_role = local.enabled && length(var.task_exec_role_arn) == 0 |
8 | 8 | enable_ecs_service_role = module.this.enabled && var.network_mode != "awsvpc" && length(var.ecs_load_balancers) >= 1 |
9 | 9 | create_security_group = local.enabled && var.network_mode == "awsvpc" && var.security_group_enabled |
| 10 | + create_task_definition = local.enabled && length(var.task_definition) == 0 |
10 | 11 |
|
11 | 12 | volumes = concat(var.docker_volumes, var.efs_volumes, var.fsx_volumes, var.bind_mount_volumes) |
12 | 13 |
|
@@ -46,7 +47,7 @@ module "exec_label" { |
46 | 47 | } |
47 | 48 |
|
48 | 49 | resource "aws_ecs_task_definition" "default" { |
49 | | - count = local.enabled && var.task_definition == null ? 1 : 0 |
| 50 | + count = local.create_task_definition ? 1 : 0 |
50 | 51 | family = module.this.id |
51 | 52 | container_definitions = var.container_definition_json |
52 | 53 | requires_compatibilities = [var.launch_type] |
@@ -360,7 +361,7 @@ resource "aws_security_group_rule" "nlb" { |
360 | 361 | resource "aws_ecs_service" "ignore_changes_task_definition" { |
361 | 362 | count = local.ecs_service_enabled && var.ignore_changes_task_definition && !var.ignore_changes_desired_count ? 1 : 0 |
362 | 363 | name = module.this.id |
363 | | - task_definition = coalesce(var.task_definition, "${join("", aws_ecs_task_definition.default.*.family)}:${join("", aws_ecs_task_definition.default.*.revision)}") |
| 364 | + task_definition = local.create_task_definition ? "${join("", aws_ecs_task_definition.default[*].family)}:${join("", aws_ecs_task_definition.default[*].revision)}" : var.task_definition[0] |
364 | 365 | desired_count = var.desired_count |
365 | 366 | deployment_maximum_percent = var.deployment_maximum_percent |
366 | 367 | deployment_minimum_healthy_percent = var.deployment_minimum_healthy_percent |
@@ -459,7 +460,7 @@ resource "aws_ecs_service" "ignore_changes_task_definition" { |
459 | 460 | resource "aws_ecs_service" "ignore_changes_task_definition_and_desired_count" { |
460 | 461 | count = local.ecs_service_enabled && var.ignore_changes_task_definition && var.ignore_changes_desired_count ? 1 : 0 |
461 | 462 | name = module.this.id |
462 | | - task_definition = coalesce(var.task_definition, "${join("", aws_ecs_task_definition.default.*.family)}:${join("", aws_ecs_task_definition.default.*.revision)}") |
| 463 | + task_definition = local.create_task_definition ? "${join("", aws_ecs_task_definition.default[*].family)}:${join("", aws_ecs_task_definition.default[*].revision)}" : var.task_definition[0] |
463 | 464 | desired_count = var.desired_count |
464 | 465 | deployment_maximum_percent = var.deployment_maximum_percent |
465 | 466 | deployment_minimum_healthy_percent = var.deployment_minimum_healthy_percent |
@@ -558,7 +559,7 @@ resource "aws_ecs_service" "ignore_changes_task_definition_and_desired_count" { |
558 | 559 | resource "aws_ecs_service" "ignore_changes_desired_count" { |
559 | 560 | count = local.ecs_service_enabled && !var.ignore_changes_task_definition && var.ignore_changes_desired_count ? 1 : 0 |
560 | 561 | name = module.this.id |
561 | | - task_definition = coalesce(var.task_definition, "${join("", aws_ecs_task_definition.default.*.family)}:${join("", aws_ecs_task_definition.default.*.revision)}") |
| 562 | + task_definition = local.create_task_definition ? "${join("", aws_ecs_task_definition.default[*].family)}:${join("", aws_ecs_task_definition.default[*].revision)}" : var.task_definition[0] |
562 | 563 | desired_count = var.desired_count |
563 | 564 | deployment_maximum_percent = var.deployment_maximum_percent |
564 | 565 | deployment_minimum_healthy_percent = var.deployment_minimum_healthy_percent |
@@ -657,7 +658,7 @@ resource "aws_ecs_service" "ignore_changes_desired_count" { |
657 | 658 | resource "aws_ecs_service" "default" { |
658 | 659 | count = local.ecs_service_enabled && !var.ignore_changes_task_definition && !var.ignore_changes_desired_count ? 1 : 0 |
659 | 660 | name = module.this.id |
660 | | - task_definition = coalesce(var.task_definition, "${join("", aws_ecs_task_definition.default.*.family)}:${join("", aws_ecs_task_definition.default.*.revision)}") |
| 661 | + task_definition = local.create_task_definition ? "${join("", aws_ecs_task_definition.default[*].family)}:${join("", aws_ecs_task_definition.default[*].revision)}" : var.task_definition[0] |
661 | 662 | desired_count = var.desired_count |
662 | 663 | deployment_maximum_percent = var.deployment_maximum_percent |
663 | 664 | deployment_minimum_healthy_percent = var.deployment_minimum_healthy_percent |
|
0 commit comments