diff --git a/README.md b/README.md index f3770da..5a95a64 100644 --- a/README.md +++ b/README.md @@ -357,13 +357,13 @@ See [patterns.md](https://github.com/terraform-aws-modules/terraform-aws-alb/blo | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.25 | +| [aws](#requirement\_aws) | >= 6.27 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.25 | +| [aws](#provider\_aws) | >= 6.27 | ## Modules diff --git a/examples/complete-alb/README.md b/examples/complete-alb/README.md index 3aa4bcb..251c637 100644 --- a/examples/complete-alb/README.md +++ b/examples/complete-alb/README.md @@ -20,7 +20,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.25 | +| [aws](#requirement\_aws) | >= 6.27 | | [null](#requirement\_null) | >= 2.0 | | [random](#requirement\_random) | >= 3.6 | @@ -28,7 +28,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.25 | +| [aws](#provider\_aws) | >= 6.27 | | [null](#provider\_null) | >= 2.0 | | [random](#provider\_random) | >= 3.6 | diff --git a/examples/complete-alb/versions.tf b/examples/complete-alb/versions.tf index 5b2c8d6..5cce6ce 100644 --- a/examples/complete-alb/versions.tf +++ b/examples/complete-alb/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } null = { source = "hashicorp/null" diff --git a/examples/complete-nlb/README.md b/examples/complete-nlb/README.md index c98841a..e95d620 100644 --- a/examples/complete-nlb/README.md +++ b/examples/complete-nlb/README.md @@ -20,13 +20,13 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.25 | +| [aws](#requirement\_aws) | >= 6.27 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.25 | +| [aws](#provider\_aws) | >= 6.27 | ## Modules diff --git a/examples/complete-nlb/versions.tf b/examples/complete-nlb/versions.tf index 6713582..6c9e0f6 100644 --- a/examples/complete-nlb/versions.tf +++ b/examples/complete-nlb/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } } } diff --git a/examples/mutual-auth-alb/README.md b/examples/mutual-auth-alb/README.md index 7205d08..89992e5 100644 --- a/examples/mutual-auth-alb/README.md +++ b/examples/mutual-auth-alb/README.md @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.25 | +| [aws](#requirement\_aws) | >= 6.27 | | [null](#requirement\_null) | >= 2.0 | | [tls](#requirement\_tls) | >= 4.0 | @@ -29,7 +29,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.25 | +| [aws](#provider\_aws) | >= 6.27 | | [null](#provider\_null) | >= 2.0 | | [tls](#provider\_tls) | >= 4.0 | diff --git a/examples/mutual-auth-alb/versions.tf b/examples/mutual-auth-alb/versions.tf index 1604d50..915325a 100644 --- a/examples/mutual-auth-alb/versions.tf +++ b/examples/mutual-auth-alb/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } null = { source = "hashicorp/null" diff --git a/main.tf b/main.tf index 23b1bd3..eb8672f 100644 --- a/main.tf +++ b/main.tf @@ -4,7 +4,6 @@ data "aws_partition" "current" { locals { create = var.create && var.putin_khuylo - tags = merge(var.tags, { terraform-aws-modules = "alb" }) } ################################################################################ @@ -98,7 +97,7 @@ resource "aws_lb" "this" { } subnets = var.subnets - tags = local.tags + tags = var.tags xff_header_processing_mode = var.xff_header_processing_mode dynamic "timeouts" { @@ -307,7 +306,7 @@ resource "aws_lb_listener" "this" { tcp_idle_timeout_seconds = coalesce(each.value.protocol, var.default_protocol) == "TCP" ? each.value.tcp_idle_timeout_seconds : null tags = merge( - local.tags, + var.tags, each.value.tags, ) } @@ -606,7 +605,7 @@ resource "aws_lb_listener_rule" "this" { } tags = merge( - local.tags, + var.tags, each.value.tags, ) } @@ -743,7 +742,7 @@ resource "aws_lb_target_group" "this" { vpc_id = coalesce(each.value.vpc_id, var.vpc_id) tags = merge( - local.tags, + var.tags, each.value.tags, ) @@ -834,7 +833,7 @@ resource "aws_security_group" "this" { description = coalesce(var.security_group_description, "Security group for ${local.security_group_name} ${var.load_balancer_type} load balancer") vpc_id = var.vpc_id - tags = merge(local.tags, var.security_group_tags) + tags = merge(var.tags, var.security_group_tags) lifecycle { create_before_destroy = true diff --git a/modules/lb_trust_store/README.md b/modules/lb_trust_store/README.md index b79142a..9e1b38b 100644 --- a/modules/lb_trust_store/README.md +++ b/modules/lb_trust_store/README.md @@ -30,13 +30,13 @@ module "trust_store" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.25 | +| [aws](#requirement\_aws) | >= 6.27 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.25 | +| [aws](#provider\_aws) | >= 6.27 | ## Modules diff --git a/modules/lb_trust_store/versions.tf b/modules/lb_trust_store/versions.tf index 6713582..4fc026f 100644 --- a/modules/lb_trust_store/versions.tf +++ b/modules/lb_trust_store/versions.tf @@ -4,7 +4,13 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } } + + provider_meta "aws" { + user_agent = [ + "github.com/terraform-aws-modules" + ] + } } diff --git a/versions.tf b/versions.tf index 6713582..4fc026f 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,13 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } } + + provider_meta "aws" { + user_agent = [ + "github.com/terraform-aws-modules" + ] + } } diff --git a/wrappers/lb_trust_store/versions.tf b/wrappers/lb_trust_store/versions.tf index 6713582..4fc026f 100644 --- a/wrappers/lb_trust_store/versions.tf +++ b/wrappers/lb_trust_store/versions.tf @@ -4,7 +4,13 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } } + + provider_meta "aws" { + user_agent = [ + "github.com/terraform-aws-modules" + ] + } } diff --git a/wrappers/versions.tf b/wrappers/versions.tf index 6713582..4fc026f 100644 --- a/wrappers/versions.tf +++ b/wrappers/versions.tf @@ -4,7 +4,13 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.25" + version = ">= 6.27" } } + + provider_meta "aws" { + user_agent = [ + "github.com/terraform-aws-modules" + ] + } }