Skip to content

Commit e0f0226

Browse files
committed
strip list
1 parent b472a44 commit e0f0226

File tree

1 file changed

+6
-4
lines changed
  • operations/deployment/terraform/modules/aws/lb

1 file changed

+6
-4
lines changed

operations/deployment/terraform/modules/aws/lb/aws_lb.tf

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
locals {
33
alb_ssl_available = var.aws_certificates_selected_arn != "" ? true : false
44

5+
alb_listen_port_list = var.aws_alb_listen_port != "" ? [for n in split(",", var.aws_alb_listen_port) : tonumber(n)] : []
6+
57
alb_listen_port = var.aws_alb_listen_port != "" ? [for n in split(",", var.aws_alb_listen_port) : tonumber(n)] : var.aws_certificates_selected_arn != "" ? [443] : [80]
68
alb_listen_protocol = var.aws_alb_listen_protocol != "" ? [for n in split(",", var.aws_alb_listen_protocol) : n] : var.aws_certificates_selected_arn != "" ? ["HTTPS"] : ["HTTP"]
79
alb_app_port = var.aws_alb_app_port != "" ? [for n in split(",", var.aws_alb_app_port) : tonumber(n)] : local.alb_listen_port
@@ -148,7 +150,7 @@ resource "aws_alb_listener" "lb_listener" {
148150
}
149151

150152
resource "aws_alb_listener" "http_redirect" {
151-
count = var.aws_alb_redirect_enable && var.aws_certificate_enabled && !contains(local.alb_listen_port, 80) ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
153+
count = var.aws_alb_redirect_enable && var.aws_certificate_enabled && !contains(local.alb_listen_port_list, 80) ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
152154
load_balancer_arn = aws_lb.vm_alb.arn
153155
port = "80"
154156
protocol = "HTTP"
@@ -169,7 +171,7 @@ resource "aws_alb_listener" "http_redirect" {
169171
}
170172

171173
resource "aws_alb_listener" "http_forward" {
172-
count = var.aws_alb_redirect_enable && !var.aws_alb_www_to_apex_redirect && !var.aws_certificate_enabled && !contains(local.alb_listen_port, 80) ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
174+
count = var.aws_alb_redirect_enable && !var.aws_alb_www_to_apex_redirect && !var.aws_certificate_enabled && !contains(local.alb_listen_port_list, 80) ? 1 : 0 #!contains(local.alb_listen_port, 80) ? 1 : 0 : 0
173175
load_balancer_arn = aws_lb.vm_alb.arn
174176
port = "80"
175177
protocol = "HTTP"
@@ -185,7 +187,7 @@ resource "aws_alb_listener" "http_forward" {
185187
}
186188

187189
resource "aws_alb_listener" "http_www_redirect" {
188-
count = var.aws_alb_redirect_enable && var.aws_alb_www_to_apex_redirect && !var.aws_certificate_enabled ? !contains(local.alb_listen_port, 80) ? 1 : 0 : 0
190+
count = var.aws_alb_redirect_enable && var.aws_alb_www_to_apex_redirect && !var.aws_certificate_enabled ? !contains(local.alb_listen_port_list, 80) ? 1 : 0 : 0
189191
load_balancer_arn = aws_lb.vm_alb.arn
190192
port = "80"
191193
protocol = "HTTP"
@@ -269,7 +271,7 @@ resource "aws_security_group_rule" "incoming_alb_https" {
269271
###
270272

271273
resource "aws_alb_listener" "https_redirect" {
272-
count = var.aws_alb_redirect_enable && var.aws_certificate_enabled && !contains(local.alb_listen_port, 443) ? 1 : 0 #!contains(local.alb_listen_port, 443) ? 1 : 0 : 0
274+
count = var.aws_alb_redirect_enable && var.aws_certificate_enabled && !contains(local.alb_listen_port_list, 443) ? 1 : 0 #!contains(local.alb_listen_port, 443) ? 1 : 0 : 0
273275
load_balancer_arn = aws_lb.vm_alb.arn
274276
port = "443"
275277
protocol = "HTTPS"

0 commit comments

Comments
 (0)