diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7900442e..b84d048d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.99.0 + rev: v1.99.4 hooks: - id: terraform_fmt - id: terraform_wrapper_module_for_each diff --git a/README.md b/README.md index 8e20fbc0..31018c77 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ module "ecs" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers diff --git a/examples/complete/README.md b/examples/complete/README.md index 9d20e63d..aeb35d11 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.66.1 | +| [aws](#provider\_aws) | >= 4.66.1, < 6.0.0 | ## Modules diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 682191e7..722daa2f 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/examples/ec2-autoscaling/README.md b/examples/ec2-autoscaling/README.md index ff7a998d..e824d587 100644 --- a/examples/ec2-autoscaling/README.md +++ b/examples/ec2-autoscaling/README.md @@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.66.1 | +| [aws](#provider\_aws) | >= 4.66.1, < 6.0.0 | ## Modules diff --git a/examples/ec2-autoscaling/versions.tf b/examples/ec2-autoscaling/versions.tf index 682191e7..722daa2f 100644 --- a/examples/ec2-autoscaling/versions.tf +++ b/examples/ec2-autoscaling/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/examples/fargate/README.md b/examples/fargate/README.md index 49d4697d..706d1f95 100644 --- a/examples/fargate/README.md +++ b/examples/fargate/README.md @@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.66.1 | +| [aws](#provider\_aws) | >= 4.66.1, < 6.0.0 | ## Modules diff --git a/examples/fargate/versions.tf b/examples/fargate/versions.tf index 682191e7..722daa2f 100644 --- a/examples/fargate/versions.tf +++ b/examples/fargate/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/modules/cluster/README.md b/modules/cluster/README.md index 282943b5..16b1486a 100644 --- a/modules/cluster/README.md +++ b/modules/cluster/README.md @@ -135,13 +135,13 @@ module "ecs_cluster" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.66.1 | +| [aws](#provider\_aws) | >= 4.66.1, < 6.0.0 | ## Modules diff --git a/modules/cluster/main.tf b/modules/cluster/main.tf index cecf7e44..8b29e845 100644 --- a/modules/cluster/main.tf +++ b/modules/cluster/main.tf @@ -40,6 +40,15 @@ resource "aws_ecs_cluster" "this" { } } } + + dynamic "managed_storage_configuration" { + for_each = try([configuration.value.managed_storage_configuration], [{}]) + + content { + fargate_ephemeral_storage_kms_key_id = try(managed_storage_configuration.value.fargate_ephemeral_storage_kms_key_id, null) + kms_key_id = try(managed_storage_configuration.value.kms_key_id, null) + } + } } } @@ -67,6 +76,15 @@ resource "aws_ecs_cluster" "this" { } } } + + dynamic "managed_storage_configuration" { + for_each = try([configuration.value.managed_storage_configuration], [{}]) + + content { + fargate_ephemeral_storage_kms_key_id = try(managed_storage_configuration.value.fargate_ephemeral_storage_kms_key_id, null) + kms_key_id = try(managed_storage_configuration.value.kms_key_id, null) + } + } } } diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf index 682191e7..722daa2f 100644 --- a/modules/cluster/versions.tf +++ b/modules/cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/modules/container-definition/README.md b/modules/container-definition/README.md index 6ed52ac7..34eec18d 100644 --- a/modules/container-definition/README.md +++ b/modules/container-definition/README.md @@ -116,13 +116,13 @@ module "example_ecs_container_definition" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.66.1 | +| [aws](#provider\_aws) | >= 4.66.1, < 6.0.0 | ## Modules diff --git a/modules/container-definition/versions.tf b/modules/container-definition/versions.tf index 682191e7..722daa2f 100644 --- a/modules/container-definition/versions.tf +++ b/modules/container-definition/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/modules/service/README.md b/modules/service/README.md index 9296ad7f..db7fd777 100644 --- a/modules/service/README.md +++ b/modules/service/README.md @@ -167,13 +167,13 @@ module "ecs_service" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | >= 4.66.1 | +| [aws](#requirement\_aws) | >= 4.66.1, < 6.0.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.66.1 | +| [aws](#provider\_aws) | >= 4.66.1, < 6.0.0 | ## Modules diff --git a/modules/service/versions.tf b/modules/service/versions.tf index 682191e7..722daa2f 100644 --- a/modules/service/versions.tf +++ b/modules/service/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/versions.tf b/versions.tf index 682191e7..722daa2f 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/wrappers/cluster/versions.tf b/wrappers/cluster/versions.tf index 682191e7..722daa2f 100644 --- a/wrappers/cluster/versions.tf +++ b/wrappers/cluster/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/wrappers/container-definition/versions.tf b/wrappers/container-definition/versions.tf index 682191e7..722daa2f 100644 --- a/wrappers/container-definition/versions.tf +++ b/wrappers/container-definition/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/wrappers/service/versions.tf b/wrappers/service/versions.tf index 682191e7..722daa2f 100644 --- a/wrappers/service/versions.tf +++ b/wrappers/service/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } } diff --git a/wrappers/versions.tf b/wrappers/versions.tf index 682191e7..722daa2f 100644 --- a/wrappers/versions.tf +++ b/wrappers/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.66.1" + version = ">= 4.66.1, < 6.0.0" } } }