refactor: Initial pass at variable type definitions for service module'

terraform-aws-modules · Nov 23, 2024 · 9ef8b25 · 9ef8b25
1 parent 8e053ee
commit 9ef8b25
Show file tree

Hide file tree

Showing 27 changed files with 758 additions and 458 deletions.
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Terraform min/max versions
         id: minMax
-        uses: clowdhaus/[email protected]
+        uses: clowdhaus/[email protected].10.1
         with:
           directory: ${{ matrix.directory }}
 
@@ -88,7 +88,7 @@ jobs:
 
       - name: Terraform min/max versions
         id: minMax
-        uses: clowdhaus/[email protected]
+        uses: clowdhaus/[email protected].10.1
 
       - name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
         uses: clowdhaus/terraform-composite-actions/[email protected]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
-## [5.11.4](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v5.11.3...v5.11.4) (2024-08-07)
+## [5.11.4](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v5.11.3.10...v5.11.4) (2024-08-07)
 
 
 ### Bug Fixes
 
 * Local `cluster_name` error when `var.cluster_arn` is empty ([#218](https://github.com/terraform-aws-modules/terraform-aws-ecs/issues/218)) ([42f11fe](https://github.com/terraform-aws-modules/terraform-aws-ecs/commit/42f11fe46b1f2a00125af0ee98813bff25d0bc46))
 
-## [5.11.3](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v5.11.2...v5.11.3) (2024-07-05)
+## [5.11.3.10](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v5.11.2...v5.11.3.10) (2024-07-05)
 
 
 ### Bug Fixes
@@ -198,7 +198,7 @@ All notable changes to this project will be documented in this file.
 
 * Ensure that launch type is not specified when a capacity provider strategy is set on a service ([#80](https://github.com/terraform-aws-modules/terraform-aws-ecs/issues/80)) ([873cccf](https://github.com/terraform-aws-modules/terraform-aws-ecs/commit/873cccf1ea23b87fec8bffe0a4825178f0b1cacf))
 
-## [5.0.0](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v4.1.3...v5.0.0) (2023-04-21)
+## [5.0.0](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v4.1.3.10...v5.0.0) (2023-04-21)
 
 
 ### ⚠ BREAKING CHANGES
@@ -209,7 +209,7 @@ All notable changes to this project will be documented in this file.
 
 * Add support for creating ECS service and container definition ([#76](https://github.com/terraform-aws-modules/terraform-aws-ecs/issues/76)) ([57244e6](https://github.com/terraform-aws-modules/terraform-aws-ecs/commit/57244e69abea685f7d45352abc994779b5f6d352))
 
-### [4.1.3](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v4.1.2...v4.1.3) (2023-01-24)
+### [4.1.3.10](https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v4.1.2...v4.1.3.10) (2023-01-24)
 
 
 ### Bug Fixes
@@ -380,8 +380,8 @@ All notable changes to this project will be documented in this file.
 - Added changelog
 
 
-<a name="v1.3.0"></a>
-## [v1.3.0] - 2019-03-08
+<a name="v1.3.10.0"></a>
+## [v1.3.10.0] - 2019-03-08
 
 - Add tag support for ECS module
 
@@ -446,8 +446,8 @@ All notable changes to this project will be documented in this file.
 [v2.2.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v2.1.0...v2.2.0
 [v2.1.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v2.0.0...v2.1.0
 [v2.0.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.4.0...v2.0.0
-[v1.4.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.3.0...v1.4.0
-[v1.3.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.2.0...v1.3.0
+[v1.4.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.3.10.0...v1.4.0
+[v1.3.10.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.2.0...v1.3.10.0
 [v1.2.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v1.0.0...v1.1.0
 [v1.0.0]: https://github.com/terraform-aws-modules/terraform-aws-ecs/compare/v0.0.1...v1.0.0
diff --git a/README.md b/README.md
@@ -159,8 +159,8 @@ module "ecs" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
 
 ## Providers
 

diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -26,14 +26,14 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
 
 ## Modules
 

diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.3.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.63"
+      version = ">= 5.77"
     }
   }
 }
diff --git a/examples/ec2-autoscaling/README.md b/examples/ec2-autoscaling/README.md
@@ -26,14 +26,14 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
 
 ## Modules
 

diff --git a/examples/ec2-autoscaling/versions.tf b/examples/ec2-autoscaling/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.3.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.63"
+      version = ">= 5.77"
     }
   }
 }
diff --git a/examples/fargate/README.md b/examples/fargate/README.md
@@ -26,14 +26,14 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
 
 ## Modules
 
@@ -78,7 +78,6 @@ No inputs.
 | <a name="output_service_security_group_id"></a> [service\_security\_group\_id](#output\_service\_security\_group\_id) | ID of the security group |
 | <a name="output_service_task_definition_arn"></a> [service\_task\_definition\_arn](#output\_service\_task\_definition\_arn) | Full ARN of the Task Definition (including both `family` and `revision`) |
 | <a name="output_service_task_definition_family"></a> [service\_task\_definition\_family](#output\_service\_task\_definition\_family) | The unique name of the task definition |
-| <a name="output_service_task_definition_family_revision"></a> [service\_task\_definition\_family\_revision](#output\_service\_task\_definition\_family\_revision) | The family and revision (family:revision) of the task definition |
 | <a name="output_service_task_definition_revision"></a> [service\_task\_definition\_revision](#output\_service\_task\_definition\_revision) | Revision of the task in a particular family |
 | <a name="output_service_task_exec_iam_role_arn"></a> [service\_task\_exec\_iam\_role\_arn](#output\_service\_task\_exec\_iam\_role\_arn) | Task execution IAM role ARN |
 | <a name="output_service_task_exec_iam_role_name"></a> [service\_task\_exec\_iam\_role\_name](#output\_service\_task\_exec\_iam\_role\_name) | Task execution IAM role name |

diff --git a/examples/fargate/main.tf b/examples/fargate/main.tf
@@ -160,21 +160,19 @@ module "ecs_service" {
   }
 
   subnet_ids = module.vpc.private_subnets
-  security_group_rules = {
+  security_group_ingress_rules = {
     alb_ingress_3000 = {
-      type                     = "ingress"
-      from_port                = local.container_port
-      to_port                  = local.container_port
-      protocol                 = "tcp"
       description              = "Service port"
+      from_port                = local.container_port
+      ip_protocol              = "tcp"
       source_security_group_id = module.alb.security_group_id
     }
+  }
+  security_group_egress_rules = {
     egress_all = {
-      type        = "egress"
-      from_port   = 0
       to_port     = 0
-      protocol    = "-1"
-      cidr_blocks = ["0.0.0.0/0"]
+      ip_protocol = "-1"
+      cidr_ipv4   = "0.0.0.0/0"
     }
   }
 
@@ -225,13 +223,11 @@ module "ecs_task_definition" {
 
   subnet_ids = module.vpc.private_subnets
 
-  security_group_rules = {
+  security_group_egress_rules = {
     egress_all = {
-      type        = "egress"
-      from_port   = 0
       to_port     = 0
-      protocol    = "-1"
-      cidr_blocks = ["0.0.0.0/0"]
+      ip_protocol = "-1"
+      cidr_ipv4   = "0.0.0.0/0"
     }
   }
 

diff --git a/examples/fargate/outputs.tf b/examples/fargate/outputs.tf
@@ -76,11 +76,6 @@ output "service_task_definition_family" {
   value       = module.ecs_service.task_definition_family
 }
 
-output "service_task_definition_family_revision" {
-  description = "The family and revision (family:revision) of the task definition"
-  value       = module.ecs_service.task_definition_family_revision
-}
-
 output "service_task_exec_iam_role_name" {
   description = "Task execution IAM role name"
   value       = module.ecs_service.task_exec_iam_role_name
@@ -159,7 +154,7 @@ output "task_definition_run_task_command" {
   description = "awscli command to run the standalone task"
   value       = <<EOT
     aws ecs run-task --cluster ${module.ecs_cluster.name} \
-      --task-definition ${module.ecs_task_definition.task_definition_family_revision} \
+      --task-definition ${module.ecs_task_definition.task_definition_family}:${module.ecs_task_definition.task_definition_revision} \
       --network-configuration "awsvpcConfiguration={subnets=[${join(",", module.vpc.private_subnets)}],securityGroups=[${module.ecs_task_definition.security_group_id}]}" \
       --region ${local.region}
   EOT

diff --git a/examples/fargate/versions.tf b/examples/fargate/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.3.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.63"
+      version = ">= 5.77"
     }
   }
 }
diff --git a/main.tf b/main.tf
@@ -200,7 +200,8 @@ module "service" {
   security_group_name            = try(each.value.security_group_name, null)
   security_group_use_name_prefix = try(each.value.security_group_use_name_prefix, true)
   security_group_description     = try(each.value.security_group_description, null)
-  security_group_rules           = lookup(each.value, "security_group_rules", {})
+  security_group_ingress_rules   = lookup(each.value, "security_group_ingress_rules", {})
+  security_group_egress_rules    = lookup(each.value, "security_group_egress_rules", {})
   security_group_tags            = try(each.value.security_group_tags, {})
 
   tags = merge(var.tags, try(each.value.tags, {}))

diff --git a/modules/cluster/README.md b/modules/cluster/README.md
@@ -136,14 +136,14 @@ module "ecs_cluster" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
 
 ## Modules
 

diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.3.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.63"
+      version = ">= 5.77"
     }
   }
 }
diff --git a/modules/container-definition/README.md b/modules/container-definition/README.md
@@ -115,14 +115,14 @@ module "example_ecs_container_definition" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.63 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.10 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.77 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.63 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.77 |
 
 ## Modules
 

diff --git a/modules/container-definition/versions.tf b/modules/container-definition/versions.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 1.3"
+  required_version = ">= 1.3.10"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.63"
+      version = ">= 5.77"
     }
   }
 }