feat: Add sigint_rollback argument support to ECS service

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.99.5
+    rev: v1.100.0
     hooks:
       - id: terraform_wrapper_module_for_each
       - id: terraform_fmt
@@ -24,7 +24,7 @@ repos:
           - '--args=--only=terraform_workspace_remote'
       - id: terraform_validate
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer

examples/complete/README.md

@@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.11 |
 
 ## Modules
 

examples/complete/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

examples/container-definition/README.md

@@ -22,7 +22,7 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2 |
 
 ## Providers

examples/container-definition/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
     null = {
       source  = "hashicorp/null"

examples/ec2-autoscaling/README.md

@@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.11 |
 
 ## Modules
 

examples/ec2-autoscaling/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

examples/fargate/README.md

@@ -27,13 +27,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.11 |
 
 ## Modules
 

examples/fargate/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

main.tf

@@ -88,6 +88,7 @@ module "service" {
   scheduling_strategy                = each.value.scheduling_strategy
   service_connect_configuration      = each.value.service_connect_configuration
   service_registries                 = each.value.service_registries
+  sigint_rollback                    = each.value.sigint_rollback
   timeouts                           = each.value.timeouts
   triggers                           = each.value.triggers
   volume_configuration               = each.value.volume_configuration

modules/cluster/README.md

@@ -135,13 +135,13 @@ module "ecs_cluster" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.11 |
 
 ## Modules
 

modules/cluster/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

modules/container-definition/README.md

@@ -116,13 +116,13 @@ module "example_ecs_container_definition" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.11 |
 
 ## Modules
 

modules/container-definition/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

modules/service/README.md

@@ -170,13 +170,13 @@ module "ecs_service" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.4 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 6.11 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.11 |
 
 ## Modules
 
@@ -308,6 +308,7 @@ module "ecs_service" {
 | <a name="input_service_connect_configuration"></a> [service\_connect\_configuration](#input\_service\_connect\_configuration) | The ECS Service Connect configuration for this service to discover and connect to services, and be discovered by, and connected from, other services within a namespace | <pre>object({<br/>    enabled = optional(bool, true)<br/>    log_configuration = optional(object({<br/>      log_driver = string<br/>      options    = optional(map(string))<br/>      secret_option = optional(list(object({<br/>        name       = string<br/>        value_from = string<br/>      })))<br/>    }))<br/>    namespace = optional(string)<br/>    service = optional(list(object({<br/>      client_alias = optional(object({<br/>        dns_name = optional(string)<br/>        port     = number<br/>        test_traffic_rules = optional(list(object({<br/>          header = optional(object({<br/>            name = string<br/>            value = object({<br/>              exact = string<br/>            })<br/>          }))<br/>        })))<br/>      }))<br/>      discovery_name        = optional(string)<br/>      ingress_port_override = optional(number)<br/>      port_name             = string<br/>      timeout = optional(object({<br/>        idle_timeout_seconds        = optional(number)<br/>        per_request_timeout_seconds = optional(number)<br/>      }))<br/>      tls = optional(object({<br/>        issuer_cert_authority = object({<br/>          aws_pca_authority_arn = string<br/>        })<br/>        kms_key  = optional(string)<br/>        role_arn = optional(string)<br/>      }))<br/>    })))<br/>  })</pre> | `null` | no |
 | <a name="input_service_registries"></a> [service\_registries](#input\_service\_registries) | Service discovery registries for the service | <pre>object({<br/>    container_name = optional(string)<br/>    container_port = optional(number)<br/>    port           = optional(number)<br/>    registry_arn   = string<br/>  })</pre> | `null` | no |
 | <a name="input_service_tags"></a> [service\_tags](#input\_service\_tags) | A map of additional tags to add to the service | `map(string)` | `{}` | no |
+| <a name="input_sigint_rollback"></a> [sigint\_rollback](#input\_sigint\_rollback) | Whether to enable graceful termination of deployments using SIGINT signals. Only applicable when using ECS deployment controller and requires wait\_for\_steady\_state = true. Default is false | `bool` | `null` | no |
 | <a name="input_skip_destroy"></a> [skip\_destroy](#input\_skip\_destroy) | If true, the task is not deleted when the service is deleted | `bool` | `null` | no |
 | <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | List of subnets to associate with the task or service | `list(string)` | `[]` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to add to all resources | `map(string)` | `{}` | no |

modules/service/main.tf

@@ -279,6 +279,8 @@ resource "aws_ecs_service" "this" {
     }
   }
 
+  sigint_rollback = try(var.deployment_configuration.strategy, null) == "BLUE_GREEN" ? var.sigint_rollback : null
+
   tags            = merge(var.tags, var.service_tags)
   task_definition = local.task_definition
   triggers        = var.triggers

modules/service/variables.tf

@@ -195,6 +195,12 @@ variable "security_group_ids" {
   nullable    = false
 }
 
+variable "sigint_rollback" {
+  description = "Whether to enable graceful termination of deployments using SIGINT signals. Only applicable when using ECS deployment controller and requires wait_for_steady_state = true. Default is false"
+  type        = bool
+  default     = null
+}
+
 variable "subnet_ids" {
   description = "List of subnets to associate with the task or service"
   type        = list(string)

modules/service/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

variables.tf

@@ -374,6 +374,7 @@ variable "services" {
       port           = optional(number)
       registry_arn   = string
     }))
+    sigint_rollback = optional(bool)
     timeouts = optional(object({
       create = optional(string)
       update = optional(string)

versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

wrappers/cluster/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

wrappers/container-definition/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

wrappers/service/main.tf

@@ -104,6 +104,7 @@ module "wrapper" {
   service_connect_configuration           = try(each.value.service_connect_configuration, var.defaults.service_connect_configuration, null)
   service_registries                      = try(each.value.service_registries, var.defaults.service_registries, null)
   service_tags                            = try(each.value.service_tags, var.defaults.service_tags, {})
+  sigint_rollback                         = try(each.value.sigint_rollback, var.defaults.sigint_rollback, null)
   skip_destroy                            = try(each.value.skip_destroy, var.defaults.skip_destroy, null)
   subnet_ids                              = try(each.value.subnet_ids, var.defaults.subnet_ids, [])
   tags                                    = try(each.value.tags, var.defaults.tags, {})

wrappers/service/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

wrappers/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }