@@ -13,11 +13,10 @@ resource "aws_ecr_repository" "this" {
13
13
14
14
resource "aws_ecs_task_definition" "this" {
15
15
count = " ${ var . network_mode != " awsvpc" ? 1 : 0 } "
16
- family = " ${ local . id } "
16
+ family = " ${ local . id } "
17
17
container_definitions = " ${ data . template_file . this . rendered } "
18
18
dynamic "volume" {
19
- for_each = length (var. volumes ) > 0 ? list (var. volumes ) : []
20
-
19
+ for_each = var. volumes . name != " " ? list (var. volumes ) : []
21
20
content {
22
21
name = var. volumes . name != " " ? var. volumes . name : " "
23
22
host_path = var. volumes . host_path != " " ? var. volumes . host_path : " "
@@ -27,17 +26,12 @@ resource "aws_ecs_task_definition" "this" {
27
26
execution_role_arn = " ${ var . enable_ssm ? aws_iam_role . this . arn : " " } "
28
27
requires_compatibilities = " ${ var . compatibilities } "
29
28
dynamic "placement_constraints" {
30
- for_each = length ( var. placement_constraints ) > 0 ? list (var. placement_constraints ) : []
29
+ for_each = var. placement_constraints . type != " " ? list (var. placement_constraints ) : []
31
30
content {
32
- type = var. placement_constraints . type != " " ? var . placement_constraints . type : " "
33
- expression = var. placement_constraints . expression != " " ? var . placement_constraints . expression : " "
31
+ type = var. placement_constraints . type
32
+ expression = var. placement_constraints . expression
34
33
}
35
34
}
36
- # Old Definition for 0.11.x
37
- # placement_constraints {
38
- # type = "${var.placement_constraints.type}"
39
- # expression = "${var.placement_constraints.expression}"
40
- # }
41
35
}
42
36
43
37
resource "aws_ecs_task_definition" "private" {
@@ -148,7 +142,7 @@ resource "aws_lb_listener_rule" "https" {
148
142
}
149
143
150
144
resource "aws_ecs_service" "this" {
151
- count = " ${ var . balancer [" vpc_id" ] != " " && var . cluster != " " && var . network_mode != " awsvpc" ? 1 : 0 } "
145
+ count = " ${ var . balancer [" vpc_id" ] != " " && var . cluster != " " && var . network_mode != " awsvpc" && var . health_check . protocol == " TCP " ? 1 : 0 } "
152
146
name = " ${ local . id } "
153
147
cluster = " ${ var . cluster } "
154
148
task_definition = " ${ aws_ecs_task_definition . this . 0 . arn } "
0 commit comments