diff --git a/README.md b/README.md index 10be022..47a0667 100644 --- a/README.md +++ b/README.md @@ -186,13 +186,13 @@ module "api_gateway" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.0 | +| [aws](#requirement\_aws) | >= 6.27 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.0 | +| [aws](#provider\_aws) | >= 6.27 | ## Modules diff --git a/examples/complete-http/README.md b/examples/complete-http/README.md index 6418cc5..08e254e 100644 --- a/examples/complete-http/README.md +++ b/examples/complete-http/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.0 | +| [aws](#requirement\_aws) | >= 6.27 | | [local](#requirement\_local) | >= 2.5 | | [null](#requirement\_null) | >= 2.0 | | [tls](#requirement\_tls) | >= 3.1 | @@ -29,7 +29,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.0 | +| [aws](#provider\_aws) | >= 6.27 | | [local](#provider\_local) | >= 2.5 | | [null](#provider\_null) | >= 2.0 | | [tls](#provider\_tls) | >= 3.1 | @@ -40,9 +40,9 @@ Note that this example may create resources which cost money. Run `terraform des |------|--------|---------| | [api\_gateway](#module\_api\_gateway) | ../../ | n/a | | [api\_gateway\_disabled](#module\_api\_gateway\_disabled) | ../../ | n/a | -| [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 7.0 | -| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 | -| [step\_function](#module\_step\_function) | terraform-aws-modules/step-functions/aws | ~> 4.0 | +| [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 8.0 | +| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 5.0 | +| [step\_function](#module\_step\_function) | terraform-aws-modules/step-functions/aws | ~> 5.0 | ## Resources diff --git a/examples/complete-http/main.tf b/examples/complete-http/main.tf index 197e2ba..5893700 100644 --- a/examples/complete-http/main.tf +++ b/examples/complete-http/main.tf @@ -54,8 +54,7 @@ module "api_gateway" { create_certificate = true mutual_tls_authentication = { - truststore_uri = "s3://${module.s3_bucket.s3_bucket_id}/${aws_s3_object.this.id}" - truststore_version = aws_s3_object.this.version_id + truststore_uri = "s3://${module.s3_bucket.s3_bucket_id}/${aws_s3_object.this.id}" } # Routes & Integration(s) @@ -227,7 +226,7 @@ resource "aws_cognito_user_pool" "this" { module "step_function" { source = "terraform-aws-modules/step-functions/aws" - version = "~> 4.0" + version = "~> 5.0" name = local.name role_name = "${local.name}-step-function" @@ -281,7 +280,7 @@ resource "null_resource" "download_package" { module "lambda_function" { source = "terraform-aws-modules/lambda/aws" - version = "~> 7.0" + version = "~> 8.0" function_name = local.name description = "My awesome lambda function" @@ -311,7 +310,7 @@ module "lambda_function" { module "s3_bucket" { source = "terraform-aws-modules/s3-bucket/aws" - version = "~> 3.0" + version = "~> 5.0" bucket_prefix = "${local.name}-" diff --git a/examples/complete-http/versions.tf b/examples/complete-http/versions.tf index 3a14bd1..ff34820 100644 --- a/examples/complete-http/versions.tf +++ b/examples/complete-http/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.0" + version = ">= 6.27" } local = { source = "hashicorp/local" diff --git a/examples/vpc-link-http/README.md b/examples/vpc-link-http/README.md index f193765..e264a48 100644 --- a/examples/vpc-link-http/README.md +++ b/examples/vpc-link-http/README.md @@ -20,26 +20,26 @@ 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.0 | +| [aws](#requirement\_aws) | >= 6.27 | | [null](#requirement\_null) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 6.0 | +| [aws](#provider\_aws) | >= 6.27 | | [null](#provider\_null) | >= 2.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [alb](#module\_alb) | terraform-aws-modules/alb/aws | ~> 9.0 | +| [alb](#module\_alb) | terraform-aws-modules/alb/aws | ~> 10.0 | | [api\_gateway](#module\_api\_gateway) | ../../ | n/a | | [api\_gateway\_security\_group](#module\_api\_gateway\_security\_group) | terraform-aws-modules/security-group/aws | ~> 5.0 | -| [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 7.0 | +| [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 8.0 | | [lambda\_security\_group](#module\_lambda\_security\_group) | terraform-aws-modules/security-group/aws | ~> 5.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 6.0 | ## Resources diff --git a/examples/vpc-link-http/main.tf b/examples/vpc-link-http/main.tf index 77f238b..2c9d6f5 100644 --- a/examples/vpc-link-http/main.tf +++ b/examples/vpc-link-http/main.tf @@ -83,7 +83,7 @@ module "api_gateway" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 5.0" + version = "~> 6.0" name = local.name cidr = local.vpc_cidr @@ -116,7 +116,7 @@ module "api_gateway_security_group" { module "alb" { source = "terraform-aws-modules/alb/aws" - version = "~> 9.0" + version = "~> 10.0" name = local.name @@ -176,7 +176,7 @@ resource "null_resource" "download_package" { module "lambda_function" { source = "terraform-aws-modules/lambda/aws" - version = "~> 7.0" + version = "~> 8.0" function_name = local.name description = "My awesome lambda function" diff --git a/examples/vpc-link-http/versions.tf b/examples/vpc-link-http/versions.tf index 736440e..7ddc6c1 100644 --- a/examples/vpc-link-http/versions.tf +++ b/examples/vpc-link-http/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.0" + version = ">= 6.27" } null = { source = "hashicorp/null" diff --git a/examples/websocket/README.md b/examples/websocket/README.md index 49d2546..7a0b379 100644 --- a/examples/websocket/README.md +++ b/examples/websocket/README.md @@ -51,7 +51,7 @@ connected (press CTRL+C to quit) | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.5.7 | -| [aws](#requirement\_aws) | >= 6.0 | +| [aws](#requirement\_aws) | >= 6.27 | ## Providers @@ -62,10 +62,10 @@ No providers. | Name | Source | Version | |------|--------|---------| | [api\_gateway](#module\_api\_gateway) | ../../ | n/a | -| [connect\_lambda\_function](#module\_connect\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 4.0 | -| [disconnect\_lambda\_function](#module\_disconnect\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 4.0 | -| [dynamodb\_table](#module\_dynamodb\_table) | terraform-aws-modules/dynamodb-table/aws | ~> 3.0 | -| [send\_message\_lambda\_function](#module\_send\_message\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 4.0 | +| [connect\_lambda\_function](#module\_connect\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 8.0 | +| [disconnect\_lambda\_function](#module\_disconnect\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 8.0 | +| [dynamodb\_table](#module\_dynamodb\_table) | terraform-aws-modules/dynamodb-table/aws | ~> 5.0 | +| [send\_message\_lambda\_function](#module\_send\_message\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 8.0 | ## Resources diff --git a/examples/websocket/main.tf b/examples/websocket/main.tf index c6229b4..03ac6d0 100644 --- a/examples/websocket/main.tf +++ b/examples/websocket/main.tf @@ -126,13 +126,13 @@ module "api_gateway" { module "connect_lambda_function" { source = "terraform-aws-modules/lambda/aws" - version = "~> 4.0" + version = "~> 8.0" function_name = "${local.name}-onConnect" description = "Websocket onConnect handler" source_path = ["function/onConnect.js"] handler = "onConnect.handler" - runtime = "nodejs20.x" + runtime = "nodejs24.x" architectures = ["arm64"] memory_size = 256 publish = true @@ -158,13 +158,13 @@ module "connect_lambda_function" { module "disconnect_lambda_function" { source = "terraform-aws-modules/lambda/aws" - version = "~> 4.0" + version = "~> 8.0" function_name = "${local.name}-onDisconnect" description = "Websocket onDisconnect handler" source_path = ["function/onDisconnect.js"] handler = "onDisconnect.handler" - runtime = "nodejs20.x" + runtime = "nodejs24.x" architectures = ["arm64"] memory_size = 256 publish = true @@ -190,13 +190,13 @@ module "disconnect_lambda_function" { module "send_message_lambda_function" { source = "terraform-aws-modules/lambda/aws" - version = "~> 4.0" + version = "~> 8.0" function_name = "${local.name}-sendMessage" description = "Websocket sendMessage handler" source_path = ["function/sendMessage.js"] handler = "sendMessage.handler" - runtime = "nodejs20.x" + runtime = "nodejs24.x" architectures = ["arm64"] memory_size = 256 publish = true @@ -227,7 +227,7 @@ module "send_message_lambda_function" { module "dynamodb_table" { source = "terraform-aws-modules/dynamodb-table/aws" - version = "~> 3.0" + version = "~> 5.0" name = local.dynamodb_table_name hash_key = "connectionId" diff --git a/examples/websocket/versions.tf b/examples/websocket/versions.tf index db13b0a..6c9e0f6 100644 --- a/examples/websocket/versions.tf +++ b/examples/websocket/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.0" + version = ">= 6.27" } } } diff --git a/main.tf b/main.tf index e45a9c0..f0e5bc8 100644 --- a/main.tf +++ b/main.tf @@ -43,10 +43,7 @@ resource "aws_apigatewayv2_api" "this" { target = local.is_http ? var.target : null version = var.api_version - tags = merge( - { terraform-aws-modules = "apigateway-v2" }, - var.tags, - ) + tags = var.tags } ################################################################################ diff --git a/versions.tf b/versions.tf index db13b0a..4fc026f 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,13 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.0" + version = ">= 6.27" } } + + provider_meta "aws" { + user_agent = [ + "github.com/terraform-aws-modules" + ] + } } diff --git a/wrappers/versions.tf b/wrappers/versions.tf index db13b0a..4fc026f 100644 --- a/wrappers/versions.tf +++ b/wrappers/versions.tf @@ -4,7 +4,13 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 6.0" + version = ">= 6.27" } } + + provider_meta "aws" { + user_agent = [ + "github.com/terraform-aws-modules" + ] + } }