diff --git a/README.md b/README.md index 38089db..f644209 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ This module uses Semver. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -76,6 +76,7 @@ No modules. | [capacity\_providers](#input\_capacity\_providers) | List of short names or full Amazon Resource Names (ARNs) of one or more capacity providers to associate with the cluster. Valid values also include `FARGATE` and `FARGATE_SPOT`. | `list(string)` | `null` | no | | [default\_capacity\_provider\_strategy](#input\_default\_capacity\_provider\_strategy) | The capacity provider strategy to use by default for the cluster. Can be one or more. List of map with corresponding items in docs. [Terraform Docs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_cluster#default_capacity_provider_strategy) | `list(any)` | `[]` | no | | [enable\_container\_insights](#input\_enable\_container\_insights) | Enable container insights. | `bool` | `false` | no | +| [execute\_command\_configuration](#input\_execute\_command\_configuration) | Map with execute command configuration. [Terraform Docs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_cluster#execute_command_configuration) | `any` | `null` | no | | [name](#input\_name) | Cluster name. | `string` | n/a | yes | | [settings](#input\_settings) | List of maps with cluster settings. For example, this can be used to enable CloudWatch Container Insights for a cluster. [Terraform Docs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_cluster#setting) | `list(any)` | `[]` | no | | [tags](#input\_tags) | Key-value mapping of resource tags. | `map(string)` | `{}` | no | diff --git a/examples/complete-ecs/README.md b/examples/complete-ecs/README.md index f3c6971..1b31d48 100644 --- a/examples/complete-ecs/README.md +++ b/examples/complete-ecs/README.md @@ -31,7 +31,7 @@ $ terraform apply | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -46,7 +46,7 @@ $ terraform apply |------|--------|---------| | [alb](#module\_alb) | terraform-aws-modules/alb/aws | 5.13.0 | | [alb\_security\_group](#module\_alb\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | -| [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 3.0 | +| [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 7.0 | | [asg\_autoscaling](#module\_asg\_autoscaling) | ../../modules/autoscaling/asg-target-tracking/ecs-reservation | n/a | | [easy\_ec2](#module\_easy\_ec2) | ../../modules/simple/ec2 | n/a | | [easy\_fargate](#module\_easy\_fargate) | ../../modules/simple/fargate | n/a | @@ -56,7 +56,7 @@ $ terraform apply | [ecs\_security\_group](#module\_ecs\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | | [fargate\_service\_autoscaling\_target](#module\_fargate\_service\_autoscaling\_target) | ../../modules/core/ecs-autoscaling-target | n/a | | [fargate\_target\_request\_autoscaling](#module\_fargate\_target\_request\_autoscaling) | ../../modules/autoscaling/alb-target-tracking/target-requests-count | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | ## Resources diff --git a/examples/complete-ecs/autoscaling.tf b/examples/complete-ecs/autoscaling.tf index 1dc5e92..5456759 100644 --- a/examples/complete-ecs/autoscaling.tf +++ b/examples/complete-ecs/autoscaling.tf @@ -3,7 +3,7 @@ module "asg_autoscaling" { source = "../../modules/autoscaling/asg-target-tracking/ecs-reservation" name = "${local.prefix}-autoscale" - autoscaling_group_name = module.asg.this_autoscaling_group_name + autoscaling_group_name = module.asg.autoscaling_group_id ecs_cluster_name = module.ecs_cluster.name enable_cpu_based_autoscaling = true diff --git a/examples/complete-ecs/support_infra.tf b/examples/complete-ecs/support_infra.tf index de3f173..800d450 100644 --- a/examples/complete-ecs/support_infra.tf +++ b/examples/complete-ecs/support_infra.tf @@ -4,7 +4,7 @@ data "aws_ssm_parameter" "ami_image" { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 2.0" + version = "~> 5.0" name = "${local.prefix}-vpc" cidr = local.vpc_cidr @@ -17,7 +17,6 @@ module "vpc" { dhcp_options_domain_name_servers = ["AmazonProvidedDNS"] enable_ipv6 = var.enable_ipv6 - assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_ipv6_prefixes = range(length(local.vpc_azs)) } @@ -127,21 +126,20 @@ resource "aws_lb_listener_rule" "fargate" { module "asg" { source = "terraform-aws-modules/autoscaling/aws" - version = "~> 3.0" + version = "~> 7.0" name = "${local.prefix}-asg" - image_id = data.aws_ssm_parameter.ami_image.value - instance_type = "t2.micro" - security_groups = [module.ecs_security_group.security_group_id] - vpc_zone_identifier = module.vpc.public_subnets - min_size = 1 - max_size = 10 - desired_capacity = 1 - health_check_type = "EC2" - associate_public_ip_address = true + image_id = data.aws_ssm_parameter.ami_image.value + instance_type = "t2.micro" + security_groups = [module.ecs_security_group.security_group_id] + vpc_zone_identifier = module.vpc.public_subnets + min_size = 1 + max_size = 10 + desired_capacity = 1 + health_check_type = "EC2" user_data = templatefile("../templates/ec2_userdata.tpl", { ecs_cluster = module.ecs_cluster.name }) - iam_instance_profile = var.instance_profile_arn + iam_instance_profile_arn = var.instance_profile_arn } diff --git a/examples/complete-ecs/versions.tf b/examples/complete-ecs/versions.tf index 1ae4ee9..88a651b 100644 --- a/examples/complete-ecs/versions.tf +++ b/examples/complete-ecs/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/examples/easy/ec2-alb/README.md b/examples/easy/ec2-alb/README.md index 0188600..5809c4f 100644 --- a/examples/easy/ec2-alb/README.md +++ b/examples/easy/ec2-alb/README.md @@ -24,7 +24,7 @@ To test that it's working: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -39,11 +39,11 @@ To test that it's working: |------|--------|---------| | [alb](#module\_alb) | terraform-aws-modules/alb/aws | 5.13.0 | | [alb\_security\_group](#module\_alb\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | -| [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 3.0 | +| [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 7.0 | | [easy\_ec2](#module\_easy\_ec2) | ../../../modules/simple/ec2 | n/a | | [ec2\_security\_group](#module\_ec2\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | | [ecs\_cluster](#module\_ecs\_cluster) | ../../.. | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | ## Resources diff --git a/examples/easy/ec2-alb/main.tf b/examples/easy/ec2-alb/main.tf index 3f0a4b2..1e5535e 100644 --- a/examples/easy/ec2-alb/main.tf +++ b/examples/easy/ec2-alb/main.tf @@ -16,7 +16,7 @@ locals { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 2.0" + version = "~> 5.0" name = "${local.prefix}-vpc" cidr = local.vpc_cidr @@ -29,7 +29,6 @@ module "vpc" { dhcp_options_domain_name_servers = ["AmazonProvidedDNS"] enable_ipv6 = var.enable_ipv6 - assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_ipv6_prefixes = range(length(local.vpc_azs)) } @@ -107,23 +106,22 @@ module "alb" { module "asg" { source = "terraform-aws-modules/autoscaling/aws" - version = "~> 3.0" + version = "~> 7.0" name = "${local.prefix}-asg" - image_id = data.aws_ssm_parameter.ami_image.value - instance_type = "t2.micro" - security_groups = [module.ec2_security_group.security_group_id] - vpc_zone_identifier = module.vpc.public_subnets - min_size = 1 - max_size = 2 - desired_capacity = 1 - health_check_type = "EC2" - associate_public_ip_address = true + image_id = data.aws_ssm_parameter.ami_image.value + instance_type = "t2.micro" + security_groups = [module.ec2_security_group.security_group_id] + vpc_zone_identifier = module.vpc.public_subnets + min_size = 1 + max_size = 2 + desired_capacity = 1 + health_check_type = "EC2" user_data = templatefile("../../templates/ec2_userdata.tpl", { ecs_cluster = module.ecs_cluster.name }) - iam_instance_profile = var.instance_profile_arn + iam_instance_profile_arn = var.instance_profile_arn } # This module usage starts here diff --git a/examples/easy/ec2-alb/versions.tf b/examples/easy/ec2-alb/versions.tf index 1ae4ee9..88a651b 100644 --- a/examples/easy/ec2-alb/versions.tf +++ b/examples/easy/ec2-alb/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/examples/easy/ec2/README.md b/examples/easy/ec2/README.md index bfeebd0..8bf3b8a 100644 --- a/examples/easy/ec2/README.md +++ b/examples/easy/ec2/README.md @@ -30,7 +30,7 @@ $ terraform apply | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -43,11 +43,11 @@ $ terraform apply | Name | Source | Version | |------|--------|---------| -| [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 4.0 | +| [asg](#module\_asg) | terraform-aws-modules/autoscaling/aws | ~> 7.0 | | [easy\_ec2](#module\_easy\_ec2) | ../../../modules/simple/ec2 | n/a | | [ec2\_security\_group](#module\_ec2\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | | [ecs\_cluster](#module\_ecs\_cluster) | ../../.. | n/a | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | ## Resources diff --git a/examples/easy/ec2/main.tf b/examples/easy/ec2/main.tf index a253063..a39e5b6 100644 --- a/examples/easy/ec2/main.tf +++ b/examples/easy/ec2/main.tf @@ -16,7 +16,7 @@ locals { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 2.0" + version = "~> 5.0" name = "${local.prefix}-vpc" cidr = local.vpc_cidr @@ -29,7 +29,6 @@ module "vpc" { dhcp_options_domain_name_servers = ["AmazonProvidedDNS"] enable_ipv6 = var.enable_ipv6 - assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_ipv6_prefixes = range(length(local.vpc_azs)) } @@ -55,19 +54,18 @@ module "ec2_security_group" { module "asg" { source = "terraform-aws-modules/autoscaling/aws" - version = "~> 4.0" + version = "~> 7.0" name = "${local.prefix}-asg" - image_id = data.aws_ssm_parameter.ami_image.value - instance_type = "t2.micro" - security_groups = [module.ec2_security_group.security_group_id] - vpc_zone_identifier = module.vpc.public_subnets - min_size = 1 - max_size = 2 - desired_capacity = 1 - health_check_type = "EC2" - associate_public_ip_address = true + image_id = data.aws_ssm_parameter.ami_image.value + instance_type = "t2.micro" + security_groups = [module.ec2_security_group.security_group_id] + vpc_zone_identifier = module.vpc.public_subnets + min_size = 1 + max_size = 2 + desired_capacity = 1 + health_check_type = "EC2" user_data = templatefile("../../templates/ec2_userdata.tpl", { ecs_cluster = module.ecs_cluster.name }) diff --git a/examples/easy/ec2/versions.tf b/examples/easy/ec2/versions.tf index 1ae4ee9..88a651b 100644 --- a/examples/easy/ec2/versions.tf +++ b/examples/easy/ec2/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/examples/easy/fargate-alb/README.md b/examples/easy/fargate-alb/README.md index 7798de9..74bc600 100644 --- a/examples/easy/fargate-alb/README.md +++ b/examples/easy/fargate-alb/README.md @@ -31,7 +31,7 @@ $ terraform apply | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -49,7 +49,7 @@ $ terraform apply | [easy\_fargate](#module\_easy\_fargate) | ../../../modules/simple/fargate | n/a | | [ecs\_cluster](#module\_ecs\_cluster) | ../../.. | n/a | | [task\_security\_group](#module\_task\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | ## Resources diff --git a/examples/easy/fargate-alb/main.tf b/examples/easy/fargate-alb/main.tf index 30fad6b..b73d55b 100644 --- a/examples/easy/fargate-alb/main.tf +++ b/examples/easy/fargate-alb/main.tf @@ -12,7 +12,7 @@ locals { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 2.0" + version = "~> 5.0" name = "${local.prefix}-vpc" cidr = local.vpc_cidr @@ -25,7 +25,6 @@ module "vpc" { dhcp_options_domain_name_servers = ["AmazonProvidedDNS"] enable_ipv6 = var.enable_ipv6 - assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_assign_ipv6_address_on_creation = var.enable_ipv6 public_subnet_ipv6_prefixes = range(length(local.vpc_azs)) } diff --git a/examples/easy/fargate-alb/versions.tf b/examples/easy/fargate-alb/versions.tf index 1ae4ee9..88a651b 100644 --- a/examples/easy/fargate-alb/versions.tf +++ b/examples/easy/fargate-alb/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/examples/easy/fargate-spot/README.md b/examples/easy/fargate-spot/README.md index 7e7127a..8394aaf 100644 --- a/examples/easy/fargate-spot/README.md +++ b/examples/easy/fargate-spot/README.md @@ -36,7 +36,7 @@ $ terraform apply | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -52,7 +52,7 @@ $ terraform apply | [easy\_fargate](#module\_easy\_fargate) | ../../../modules/simple/fargate-spot | n/a | | [ecs\_cluster](#module\_ecs\_cluster) | ../../.. | n/a | | [task\_security\_group](#module\_task\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | ## Resources diff --git a/examples/easy/fargate-spot/main.tf b/examples/easy/fargate-spot/main.tf index e20a1f2..50b5458 100644 --- a/examples/easy/fargate-spot/main.tf +++ b/examples/easy/fargate-spot/main.tf @@ -11,7 +11,7 @@ locals { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 2.0" + version = "~> 5.0" name = "${local.prefix}-vpc" cidr = local.vpc_cidr @@ -24,7 +24,6 @@ module "vpc" { dhcp_options_domain_name_servers = ["AmazonProvidedDNS"] enable_ipv6 = true - assign_ipv6_address_on_creation = true public_subnet_assign_ipv6_address_on_creation = true public_subnet_ipv6_prefixes = range(length(local.vpc_azs)) } diff --git a/examples/easy/fargate-spot/versions.tf b/examples/easy/fargate-spot/versions.tf index 1ae4ee9..88a651b 100644 --- a/examples/easy/fargate-spot/versions.tf +++ b/examples/easy/fargate-spot/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/examples/easy/fargate/README.md b/examples/easy/fargate/README.md index 0b08ad0..171349d 100644 --- a/examples/easy/fargate/README.md +++ b/examples/easy/fargate/README.md @@ -29,7 +29,7 @@ $ terraform apply | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers @@ -45,7 +45,7 @@ $ terraform apply | [easy\_fargate](#module\_easy\_fargate) | ../../../modules/simple/fargate | n/a | | [ecs\_cluster](#module\_ecs\_cluster) | ../../.. | n/a | | [task\_security\_group](#module\_task\_security\_group) | terraform-aws-modules/security-group/aws | ~> 4.0 | -| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 2.0 | +| [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 5.0 | ## Resources diff --git a/examples/easy/fargate/main.tf b/examples/easy/fargate/main.tf index c59a2c8..19c5ffc 100644 --- a/examples/easy/fargate/main.tf +++ b/examples/easy/fargate/main.tf @@ -11,7 +11,7 @@ locals { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "~> 2.0" + version = "~> 5.0" name = "${local.prefix}-vpc" cidr = local.vpc_cidr @@ -24,7 +24,6 @@ module "vpc" { dhcp_options_domain_name_servers = ["AmazonProvidedDNS"] enable_ipv6 = true - assign_ipv6_address_on_creation = true public_subnet_assign_ipv6_address_on_creation = true public_subnet_ipv6_prefixes = range(length(local.vpc_azs)) } diff --git a/examples/easy/fargate/versions.tf b/examples/easy/fargate/versions.tf index 1ae4ee9..88a651b 100644 --- a/examples/easy/fargate/versions.tf +++ b/examples/easy/fargate/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/main.tf b/main.tf index b5a5aff..3600159 100644 --- a/main.tf +++ b/main.tf @@ -21,6 +21,33 @@ resource "aws_ecs_cluster" "main" { } } + dynamic "configuration" { + for_each = var.execute_command_configuration != null ? [1] : [] + + content { + dynamic "execute_command_configuration" { + for_each = [var.execute_command_configuration] + + content { + kms_key_id = try(execute_command_configuration.value.kms_key_id, null) + logging = try(execute_command_configuration.value.logging, null) + + dynamic "log_configuration" { + for_each = try([execute_command_configuration.value.log_configuration], []) + + content { + cloud_watch_encryption_enabled = try(log_configuration.value.cloud_watch_encryption_enabled, null) + cloud_watch_log_group_name = try(log_configuration.value.cloud_watch_log_group_name, null) + s3_bucket_name = try(log_configuration.value.s3_bucket_name, null) + s3_bucket_encryption_enabled = try(log_configuration.value.s3_bucket_encryption_enabled, null) + s3_key_prefix = try(log_configuration.value.s3_key_prefix, null) + } + } + } + } + } + } + lifecycle { create_before_destroy = true } diff --git a/modules/autoscaling/alb-target-tracking/target-requests-count/README.md b/modules/autoscaling/alb-target-tracking/target-requests-count/README.md index 6d3de63..c72ce54 100644 --- a/modules/autoscaling/alb-target-tracking/target-requests-count/README.md +++ b/modules/autoscaling/alb-target-tracking/target-requests-count/README.md @@ -63,7 +63,7 @@ module "ecs_service_scaling" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/autoscaling/alb-target-tracking/target-requests-count/versions.tf b/modules/autoscaling/alb-target-tracking/target-requests-count/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/autoscaling/alb-target-tracking/target-requests-count/versions.tf +++ b/modules/autoscaling/alb-target-tracking/target-requests-count/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/autoscaling/alb-target-tracking/target-response-time/README.md b/modules/autoscaling/alb-target-tracking/target-response-time/README.md index fa9a224..4dbce74 100644 --- a/modules/autoscaling/alb-target-tracking/target-response-time/README.md +++ b/modules/autoscaling/alb-target-tracking/target-response-time/README.md @@ -64,7 +64,7 @@ module "ecs_service_scaling" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/autoscaling/alb-target-tracking/target-response-time/versions.tf b/modules/autoscaling/alb-target-tracking/target-response-time/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/autoscaling/alb-target-tracking/target-response-time/versions.tf +++ b/modules/autoscaling/alb-target-tracking/target-response-time/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/autoscaling/asg-target-tracking/ecs-reservation/README.md b/modules/autoscaling/asg-target-tracking/ecs-reservation/README.md index afe2839..8473f85 100644 --- a/modules/autoscaling/asg-target-tracking/ecs-reservation/README.md +++ b/modules/autoscaling/asg-target-tracking/ecs-reservation/README.md @@ -78,7 +78,7 @@ module "asg_scaling" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/autoscaling/asg-target-tracking/ecs-reservation/versions.tf b/modules/autoscaling/asg-target-tracking/ecs-reservation/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/autoscaling/asg-target-tracking/ecs-reservation/versions.tf +++ b/modules/autoscaling/asg-target-tracking/ecs-reservation/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/autoscaling/ecs-scheduled/README.md b/modules/autoscaling/ecs-scheduled/README.md index 795be3e..db57a7a 100644 --- a/modules/autoscaling/ecs-scheduled/README.md +++ b/modules/autoscaling/ecs-scheduled/README.md @@ -40,7 +40,7 @@ module "ecs_scaling_scheduled" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/autoscaling/ecs-scheduled/versions.tf b/modules/autoscaling/ecs-scheduled/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/autoscaling/ecs-scheduled/versions.tf +++ b/modules/autoscaling/ecs-scheduled/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/autoscaling/ecs-target-tracking/service-utilization/README.md b/modules/autoscaling/ecs-target-tracking/service-utilization/README.md index eda496d..5000305 100644 --- a/modules/autoscaling/ecs-target-tracking/service-utilization/README.md +++ b/modules/autoscaling/ecs-target-tracking/service-utilization/README.md @@ -55,7 +55,7 @@ module "ecs_service_scaling" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/autoscaling/ecs-target-tracking/service-utilization/versions.tf b/modules/autoscaling/ecs-target-tracking/service-utilization/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/autoscaling/ecs-target-tracking/service-utilization/versions.tf +++ b/modules/autoscaling/ecs-target-tracking/service-utilization/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/core/ecs-autoscaling-target/README.md b/modules/core/ecs-autoscaling-target/README.md index 913657b..e5e41ec 100644 --- a/modules/core/ecs-autoscaling-target/README.md +++ b/modules/core/ecs-autoscaling-target/README.md @@ -54,7 +54,7 @@ module "ecs_service_scaling_target" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/core/ecs-autoscaling-target/versions.tf b/modules/core/ecs-autoscaling-target/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/core/ecs-autoscaling-target/versions.tf +++ b/modules/core/ecs-autoscaling-target/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/core/service/README.md b/modules/core/service/README.md index 6f05f37..1364791 100644 --- a/modules/core/service/README.md +++ b/modules/core/service/README.md @@ -15,7 +15,7 @@ Since this module is the closest to the `resources` form, there are a lot of cus | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/core/service/versions.tf b/modules/core/service/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/core/service/versions.tf +++ b/modules/core/service/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/core/task/README.md b/modules/core/task/README.md index e9ab275..ff8be56 100644 --- a/modules/core/task/README.md +++ b/modules/core/task/README.md @@ -11,7 +11,7 @@ Almost a 1-1 mapping to `resources`. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/core/task/versions.tf b/modules/core/task/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/core/task/versions.tf +++ b/modules/core/task/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/iam/ecs-instance-profile/README.md b/modules/iam/ecs-instance-profile/README.md index e7a3655..c22ad5a 100644 --- a/modules/iam/ecs-instance-profile/README.md +++ b/modules/iam/ecs-instance-profile/README.md @@ -9,7 +9,7 @@ Module to generate IAM Instance Profile (and Role) for EC2 instances backing ECS | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/iam/ecs-instance-profile/versions.tf b/modules/iam/ecs-instance-profile/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/iam/ecs-instance-profile/versions.tf +++ b/modules/iam/ecs-instance-profile/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/scheduled-actions/README.md b/modules/scheduled-actions/README.md index ea9eba6..05ceefc 100644 --- a/modules/scheduled-actions/README.md +++ b/modules/scheduled-actions/README.md @@ -75,7 +75,7 @@ module "ecs_fargate_cron" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/scheduled-actions/versions.tf b/modules/scheduled-actions/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/scheduled-actions/versions.tf +++ b/modules/scheduled-actions/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/simple/ec2/README.md b/modules/simple/ec2/README.md index c84e47f..0ac20f9 100644 --- a/modules/simple/ec2/README.md +++ b/modules/simple/ec2/README.md @@ -19,7 +19,7 @@ Creates the following: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/simple/ec2/versions.tf b/modules/simple/ec2/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/simple/ec2/versions.tf +++ b/modules/simple/ec2/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/simple/fargate-spot/README.md b/modules/simple/fargate-spot/README.md index 4807b31..7882593 100644 --- a/modules/simple/fargate-spot/README.md +++ b/modules/simple/fargate-spot/README.md @@ -23,7 +23,7 @@ Creates the following: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/simple/fargate-spot/versions.tf b/modules/simple/fargate-spot/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/simple/fargate-spot/versions.tf +++ b/modules/simple/fargate-spot/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/modules/simple/fargate/README.md b/modules/simple/fargate/README.md index 6881cea..bee8115 100644 --- a/modules/simple/fargate/README.md +++ b/modules/simple/fargate/README.md @@ -19,7 +19,7 @@ Creates the following: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.0 | | [aws](#requirement\_aws) | >= 3.74.0 | ## Providers diff --git a/modules/simple/fargate/versions.tf b/modules/simple/fargate/versions.tf index 1ae4ee9..88a651b 100644 --- a/modules/simple/fargate/versions.tf +++ b/modules/simple/fargate/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { diff --git a/variables.tf b/variables.tf index 169a41f..c66b531 100644 --- a/variables.tf +++ b/variables.tf @@ -27,6 +27,12 @@ variable "enable_container_insights" { type = bool } +variable "execute_command_configuration" { + description = "Map with execute command configuration. [Terraform Docs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecs_cluster#execute_command_configuration)" + default = null + type = any +} + variable "tags" { description = "Key-value mapping of resource tags." default = {} diff --git a/versions.tf b/versions.tf index 1ae4ee9..88a651b 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = {