fix: upgrade aws provider for ingress and waf modules (#276)

* fix: upgrade aws provider for ingress and waf modules

* terraform-docs: automated action

---------

Co-authored-by: Benjamin Valiente (Contractor) <benjamin.valiente@thoughtbot.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: 3 people

aws/ingress/README.md

@@ -95,13 +95,13 @@ module "ingress" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.8 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_alb"></a> [alb](#module\_alb) | github.com/thoughtbot/terraform-alb-ingress | v0.5.2 |
+| <a name="module_alb"></a> [alb](#module\_alb) | github.com/thoughtbot/terraform-alb-ingress | v0.8.0 |
 | <a name="module_cluster_name"></a> [cluster\_name](#module\_cluster\_name) | ../cluster-name | n/a |
 | <a name="module_network"></a> [network](#module\_network) | ../network-data | n/a |
 | <a name="module_waf"></a> [waf](#module\_waf) | ../waf | n/a |

aws/ingress/main.tf

@@ -1,28 +1,25 @@
 module "alb" {
-  # TODO: update ref when merged into main
-  providers = { aws.cluster = aws.cluster, aws.route53 = aws.route53 }
-  source    = "github.com/thoughtbot/terraform-alb-ingress?ref=v0.5.2"
+  providers = { aws.alb = aws.cluster, aws.route53 = aws.route53 }
+  source    = "github.com/thoughtbot/terraform-alb-ingress?ref=v0.8.0"
 
-  alarm_actions             = var.alarm_actions
-  alarm_evaluation_minutes  = var.alarm_evaluation_minutes
-  alternative_domain_names  = var.alternative_domain_names
-  certificate_domain_name   = var.certificate_domain_name
-  create_aliases            = var.create_aliases
-  description               = "Flightdeck cluster load balancer"
-  failure_threshold         = var.failure_threshold
-  hosted_zone_name          = var.hosted_zone_name
-  issue_certificates        = var.issue_certificates
-  legacy_target_group_names = var.legacy_target_group_names
-  name                      = var.name
-  namespace                 = var.namespace
-  primary_domain_name       = var.primary_domain_name
-  slow_response_threshold   = var.slow_response_threshold
-  subnet_ids                = module.network.public_subnet_ids
-  tags                      = var.tags
-  target_groups             = local.target_groups
-  target_group_weights      = var.target_group_weights
-  validate_certificates     = var.validate_certificates
-  vpc_id                    = module.network.vpc.id
+  alarm_actions              = var.alarm_actions
+  alarm_evaluation_minutes   = var.alarm_evaluation_minutes
+  create_domain_aliases      = var.create_aliases ? local.domain_names : []
+  description                = "Flightdeck cluster load balancer"
+  failure_threshold          = var.failure_threshold
+  hosted_zone_name           = var.hosted_zone_name
+  issue_certificate_domains  = var.issue_certificates ? local.domain_names : []
+  legacy_target_group_names  = var.legacy_target_group_names
+  name                       = join("-", concat(var.namespace, [var.name]))
+  primary_certificate_domain = coalesce(var.certificate_domain_name, var.primary_domain_name)
+  security_group_name        = join("-", concat(var.namespace, [var.name]))
+  slow_response_threshold    = var.slow_response_threshold
+  subnet_ids                 = module.network.public_subnet_ids
+  tags                       = var.tags
+  target_groups              = local.target_groups
+  target_group_weights       = var.target_group_weights
+  validate_certificates      = var.validate_certificates
+  vpc_id                     = module.network.vpc.id
 
   depends_on = [module.network]
 }
@@ -45,6 +42,11 @@ locals {
     values(module.cluster_name).*.shared_tags...
   )
 
+  # terraform-alb-ingress v0.8.0 replaced the old create_aliases/issue_certificates
+  # booleans with explicit domain lists; this reconstructs the same "primary +
+  # alternatives" bundling the old boolean-driven behavior used.
+  domain_names = concat([var.primary_domain_name], var.alternative_domain_names)
+
   target_groups = zipmap(
     var.cluster_names,
     [

aws/ingress/versions.tf

@@ -4,7 +4,7 @@ terraform {
     aws = {
       configuration_aliases = [aws.cluster, aws.route53]
       source                = "hashicorp/aws"
-      version               = "~> 5.0"
+      version               = "~> 6.0"
     }
   }
 }

aws/waf/README.md

@@ -55,13 +55,13 @@ Note: For each rule, if you are providing a country list, you can only specify e
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 5.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 6.0 |
 
 ## Modules
 

aws/waf/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.0"
+      version = "~> 6.0"
     }
   }
 }