Skip to content

refactor(aws_lb): replace lookups with null checks for optional fields #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2025
Merged

refactor(aws_lb): replace lookups with null checks for optional fields #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b118515
refactor(aws_lb): replace lookups with null checks for optional fields
nickreynke Apr 2, 2025
ab619dd
refactor(target-groups): replace null checks with coalesce
nickreynke Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ resource "aws_security_group_rule" "ingress_through_https" {
resource "null_resource" "lb_http_tgs_config" {
for_each = {
for name, config in var.http_ports : name => config
if lookup(config, "type", "") == "" || lookup(config, "type", "") == "forward"
if config.type == null || config.type == "forward"
}

triggers = {
Expand All @@ -131,7 +131,7 @@ resource "null_resource" "lb_http_tgs_config" {
resource "random_id" "lb_http_tgs_id" {
for_each = {
for name, config in var.http_ports : name => config
if lookup(config, "type", "") == "" || lookup(config, "type", "") == "forward"
if config.type == null || config.type == "forward"
}

byte_length = 2
Expand All @@ -147,12 +147,12 @@ resource "random_id" "lb_http_tgs_id" {
resource "aws_lb_target_group" "lb_http_tgs" {
for_each = {
for name, config in var.http_ports : name => config
if lookup(config, "type", "") == "" || lookup(config, "type", "") == "forward"
if config.type == null || config.type == "forward"
}
name = "${var.name_prefix}-http-${each.value.target_group_port}-${random_id.lb_http_tgs_id[each.key].hex}"
port = each.value.target_group_port
protocol = lookup(each.value, "target_group_protocol", "HTTP")
protocol_version = lookup(each.value, "target_group_protocol_version", "HTTP1")
protocol = coalesce(each.value.target_group_protocol, "HTTP")
protocol_version = coalesce(each.value.target_group_protocol_version, "HTTP1")
vpc_id = var.vpc_id
deregistration_delay = var.deregistration_delay
slow_start = var.slow_start
Expand All @@ -166,15 +166,15 @@ resource "aws_lb_target_group" "lb_http_tgs" {
}
}
health_check {
enabled = lookup(each.value, "target_group_health_check_enabled", var.target_group_health_check_enabled)
interval = lookup(each.value, "target_group_health_check_interval", var.target_group_health_check_interval)
path = lookup(each.value, "target_group_health_check_path", var.target_group_health_check_path)
port = lookup(each.value, "target_group_health_check_port", var.target_group_health_check_port)
protocol = lookup(each.value, "target_group_health_check_protocol", var.target_group_health_check_protocol)
timeout = lookup(each.value, "target_group_health_check_timeout", var.target_group_health_check_timeout)
healthy_threshold = lookup(each.value, "target_group_health_check_healthy_threshold", var.target_group_health_check_healthy_threshold)
unhealthy_threshold = lookup(each.value, "target_group_health_check_unhealthy_threshold", var.target_group_health_check_unhealthy_threshold)
matcher = lookup(each.value, "target_group_health_check_matcher", var.target_group_health_check_matcher)
enabled = coalesce(each.value.target_group_health_check_enabled, var.target_group_health_check_enabled)
interval = coalesce(each.value.target_group_health_check_interval, var.target_group_health_check_interval)
path = coalesce(each.value.target_group_health_check_path, var.target_group_health_check_path)
port = coalesce(each.value.target_group_health_check_port, var.target_group_health_check_port)
protocol = coalesce(each.value.target_group_health_check_protocol, var.target_group_health_check_protocol)
timeout = coalesce(each.value.target_group_health_check_timeout, var.target_group_health_check_timeout)
healthy_threshold = coalesce(each.value.target_group_health_check_healthy_threshold, var.target_group_health_check_healthy_threshold)
unhealthy_threshold = coalesce(each.value.target_group_health_check_unhealthy_threshold, var.target_group_health_check_unhealthy_threshold)
matcher = coalesce(each.value.target_group_health_check_matcher, var.target_group_health_check_matcher)
}
target_type = "ip"
tags = merge(
Expand All @@ -194,7 +194,7 @@ resource "aws_lb_target_group" "lb_http_tgs" {
resource "null_resource" "lb_https_tgs_config" {
for_each = {
for name, config in var.https_ports : name => config
if lookup(config, "type", "") == "" || lookup(config, "type", "") == "forward"
if config.type == null || config.type == "forward"
}

triggers = {
Expand All @@ -207,7 +207,7 @@ resource "null_resource" "lb_https_tgs_config" {
resource "random_id" "lb_https_tgs_id" {
for_each = {
for name, config in var.https_ports : name => config
if lookup(config, "type", "") == "" || lookup(config, "type", "") == "forward"
if config.type == null || config.type == "forward"
}

byte_length = 2
Expand All @@ -223,12 +223,12 @@ resource "random_id" "lb_https_tgs_id" {
resource "aws_lb_target_group" "lb_https_tgs" {
for_each = {
for name, config in var.https_ports : name => config
if lookup(config, "type", "") == "" || lookup(config, "type", "") == "forward"
if config.type == null || config.type == "forward"
}
name = "${var.name_prefix}-https-${each.value.target_group_port}-${random_id.lb_https_tgs_id[each.key].hex}"
port = each.value.target_group_port
protocol = lookup(each.value, "target_group_protocol", "HTTP")
protocol_version = lookup(each.value, "target_group_protocol_version", "HTTP1")
protocol = coalesce(each.value.target_group_protocol, "HTTP")
protocol_version = coalesce(each.value.target_group_protocol_version, "HTTP1")
vpc_id = var.vpc_id
deregistration_delay = var.deregistration_delay
slow_start = var.slow_start
Expand All @@ -242,15 +242,15 @@ resource "aws_lb_target_group" "lb_https_tgs" {
}
}
health_check {
enabled = lookup(each.value, "target_group_health_check_enabled", var.target_group_health_check_enabled)
interval = lookup(each.value, "target_group_health_check_interval", var.target_group_health_check_interval)
path = lookup(each.value, "target_group_health_check_path", var.target_group_health_check_path)
port = lookup(each.value, "target_group_health_check_port", var.target_group_health_check_port)
protocol = lookup(each.value, "target_group_health_check_protocol", var.target_group_health_check_protocol)
timeout = lookup(each.value, "target_group_health_check_timeout", var.target_group_health_check_timeout)
healthy_threshold = lookup(each.value, "target_group_health_check_healthy_threshold", var.target_group_health_check_healthy_threshold)
unhealthy_threshold = lookup(each.value, "target_group_health_check_unhealthy_threshold", var.target_group_health_check_unhealthy_threshold)
matcher = lookup(each.value, "target_group_health_check_matcher", var.target_group_health_check_matcher)
enabled = coalesce(each.value.target_group_health_check_enabled, var.target_group_health_check_enabled)
interval = coalesce(each.value.target_group_health_check_interval, var.target_group_health_check_interval)
path = coalesce(each.value.target_group_health_check_path, var.target_group_health_check_path)
port = coalesce(each.value.target_group_health_check_port, var.target_group_health_check_port)
protocol = coalesce(each.value.target_group_health_check_protocol, var.target_group_health_check_protocol)
timeout = coalesce(each.value.target_group_health_check_timeout, var.target_group_health_check_timeout)
healthy_threshold = coalesce(each.value.target_group_health_check_healthy_threshold, var.target_group_health_check_healthy_threshold)
unhealthy_threshold = coalesce(each.value.target_group_health_check_unhealthy_threshold, var.target_group_health_check_unhealthy_threshold)
matcher = coalesce(each.value.target_group_health_check_matcher, var.target_group_health_check_matcher)
}
target_type = "ip"
tags = merge(
Expand All @@ -277,7 +277,7 @@ resource "aws_lb_listener" "lb_http_listeners" {
protocol = "HTTP"

dynamic "default_action" {
for_each = lookup(each.value, "type", "") == "redirect" ? [1] : []
for_each = each.value.type == "redirect" ? [1] : []
content {
type = "redirect"

Expand All @@ -287,27 +287,27 @@ resource "aws_lb_listener" "lb_http_listeners" {
port = each.value.port
protocol = each.value.protocol
query = each.value.query
status_code = lookup(each.value, "status_code", "HTTP_301")
status_code = coalesce(each.value.status_code, "HTTP_301")
}
}
}

dynamic "default_action" {
for_each = lookup(each.value, "type", "") == "fixed-response" ? [1] : []
for_each = each.value.type == "fixed-response" ? [1] : []
content {
type = "fixed-response"

fixed_response {
content_type = each.value.content_type
message_body = each.value.message_body
status_code = lookup(each.value, "status_code", "200")
status_code = coalesce(each.value.status_code, "200")
}
}
}

# We fallback to using forward type action if type is not defined
dynamic "default_action" {
for_each = (lookup(each.value, "type", "") == "" || lookup(each.value, "type", "") == "forward") ? [1] : []
for_each = (each.value.type == null || each.value.type == "forward") ? [1] : []
content {
target_group_arn = aws_lb_target_group.lb_http_tgs[each.key].arn
type = "forward"
Expand All @@ -332,7 +332,7 @@ resource "aws_lb_listener" "lb_https_listeners" {
certificate_arn = var.default_certificate_arn

dynamic "default_action" {
for_each = lookup(each.value, "type", "") == "redirect" ? [1] : []
for_each = each.value.type == "redirect" ? [1] : []
content {
type = "redirect"

Expand All @@ -342,27 +342,27 @@ resource "aws_lb_listener" "lb_https_listeners" {
port = each.value.port
protocol = each.value.protocol
query = each.value.query
status_code = lookup(each.value, "status_code", "HTTP_301")
status_code = coalesce(each.value.status_code, "HTTP_301")
}
}
}

dynamic "default_action" {
for_each = lookup(each.value, "type", "") == "fixed-response" ? [1] : []
for_each = each.value.type == "fixed-response" ? [1] : []
content {
type = "fixed-response"

fixed_response {
content_type = each.value.content_type
message_body = each.value.message_body
status_code = lookup(each.value, "status_code", "200")
status_code = coalesce(each.value.status_code, "200")
}
}
}

# We fallback to using forward type action if type is not defined
dynamic "default_action" {
for_each = (lookup(each.value, "type", "") == "" || lookup(each.value, "type", "") == "forward") ? [1] : []
for_each = (each.value.type == null || each.value.type == "forward") ? [1] : []
content {
target_group_arn = aws_lb_target_group.lb_https_tgs[each.key].arn
type = "forward"
Expand Down