Skip to content

Commit 8a66780

Browse files
authored
Fix ECS LB introduced issue (#99)
* Fix conditional length check * Fixing bitovi_main ecs_alb conditional
1 parent 8536587 commit 8a66780

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

operations/deployment/terraform/aws/bitovi_main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ module "aws_ecs" {
512512

513513
module "aws_route53_ecs" {
514514
source = "../modules/aws/route53"
515-
count = var.aws_ecs_enable && var.aws_r53_enable && var.aws_r53_domain_name != "" && module.aws_ecs[0].load_balancer_arn != "" ? 1 : 0
515+
count = var.aws_ecs_enable && var.aws_r53_enable && var.aws_r53_domain_name != "" && ( var.aws_ecs_container_port != "" || var.aws_ecs_task_ignore_definition ) ? 1 : 0
516516
# R53 values
517517
aws_r53_domain_name = var.aws_r53_domain_name
518518
aws_r53_sub_domain_name = var.aws_r53_sub_domain_name
@@ -533,7 +533,7 @@ module "aws_route53_ecs" {
533533

534534
module "aws_waf_ecs" {
535535
source = "../modules/aws/waf"
536-
count = var.aws_waf_enable && var.aws_ecs_enable && module.aws_ecs[0].load_balancer_arn != "" ? 1 : 0
536+
count = var.aws_waf_enable && var.aws_ecs_enable && ( var.aws_ecs_container_port != "" || var.aws_ecs_task_ignore_definition ) ? 1 : 0
537537
aws_waf_enable = var.aws_waf_enable
538538
aws_waf_logging_enable = var.aws_waf_logging_enable
539539
aws_waf_log_retention_days = var.aws_waf_log_retention_days

operations/deployment/terraform/modules/aws/ecs/aws_ecs_networking.tf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "aws_security_group_rule" "incoming_alb" {
3636
### ALB --- Make this optional -- Using ALB name intentionally. (To make clear is an A LB)
3737

3838
resource "aws_alb" "ecs_lb" {
39-
count = length(local.aws_ecs_sg_container_port) > 1 ? 1 : 0
39+
count = length(local.aws_ecs_sg_container_port) > 0 ? 1 : 0
4040
name = var.aws_resource_identifier_supershort
4141
subnets = var.aws_selected_subnets
4242
security_groups = [aws_security_group.ecs_lb_sg.id]
@@ -228,30 +228,30 @@ resource "aws_security_group_rule" "incoming_ecs_lb_ports" {
228228
}
229229

230230
output "load_balancer_dns" {
231-
value = length(local.aws_ecs_sg_container_port) > 1 ? aws_alb.ecs_lb[0].dns_name : ""
231+
value = length(local.aws_ecs_sg_container_port) > 0 ? aws_alb.ecs_lb[0].dns_name : ""
232232
}
233233

234234
output "load_balancer_port" {
235-
value = length(local.aws_ecs_sg_container_port) > 1 ? (var.aws_certificate_enabled ? aws_alb_listener.lb_listener_ssl[0].port : aws_alb_listener.lb_listener[0].port) : ""
235+
value = length(local.aws_ecs_sg_container_port) > 0 ? (var.aws_certificate_enabled ? aws_alb_listener.lb_listener_ssl[0].port : aws_alb_listener.lb_listener[0].port) : ""
236236
}
237237

238238
output "load_balancer_protocol" {
239-
value = length(local.aws_ecs_sg_container_port) > 1 ? (var.aws_certificate_enabled ? aws_alb_listener.lb_listener_ssl[0].protocol : aws_alb_listener.lb_listener[0].protocol) : ""
239+
value = length(local.aws_ecs_sg_container_port) > 0 ? (var.aws_certificate_enabled ? aws_alb_listener.lb_listener_ssl[0].protocol : aws_alb_listener.lb_listener[0].protocol) : ""
240240
}
241241

242242
output "load_balancer_zone_id" {
243243
#value = aws_alb.ecs_lb[0].zone_id
244-
value = length(local.aws_ecs_sg_container_port) > 1 ? data.aws_alb.selected_lb[0].zone_id : ""
244+
value = length(local.aws_ecs_sg_container_port) > 0 ? data.aws_alb.selected_lb[0].zone_id : ""
245245
}
246246

247247
output "load_balancer_arn" {
248-
value = length(local.aws_ecs_sg_container_port) > 1 ? aws_alb.ecs_lb[0].arn : ""
248+
value = length(local.aws_ecs_sg_container_port) > 0 ? aws_alb.ecs_lb[0].arn : ""
249249
}
250250

251251
output "ecs_sg_id" {
252252
value = aws_security_group.ecs_sg.id
253253
}
254254

255255
output "ecs_lb_sg_id" {
256-
value = length(local.aws_ecs_sg_container_port) > 1 ? aws_security_group.ecs_lb_sg.id : ""
256+
value = length(local.aws_ecs_sg_container_port) > 0 ? aws_security_group.ecs_lb_sg.id : ""
257257
}

0 commit comments

Comments
 (0)