feat: Add sigint_rollback argument support to ECS service

tiago-vieira-sqills · tiago-vieira-sqills · commit afb2f8db084e · 2025-08-29T16:14:43.000+01:00
diff --git a/README.md b/README.md
diff --git a/examples/container-definition/README.md b/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.6 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2 |
 
 ## Providers
diff --git a/examples/container-definition/versions.tf b/examples/container-definition/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.6"
     }
     null = {
       source  = "hashicorp/null"
diff --git 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 |
 |------|---------|
 | <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.6 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.6 |
 
 ## Modules
 
diff --git a/examples/ec2-autoscaling/versions.tf b/examples/ec2-autoscaling/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.6"
     }
   }
 }
diff --git 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 |
 |------|---------|
 | <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.6 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.4 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 6.6 |
 
 ## Modules
 
diff --git a/examples/fargate/versions.tf b/examples/fargate/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.6"
     }
   }
 }
diff --git a/main.tf b/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
diff --git a/modules/service/README.md b/modules/service/README.md
@@ -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 |
diff --git a/modules/service/main.tf b/modules/service/main.tf
@@ -279,6 +279,11 @@ resource "aws_ecs_service" "this" {
     }
   }
 
+  sigint_rollback = (
+    lookup(var.deployment_controller, "type", "ECS") == "ECS" &&
+    var.wait_for_steady_state == true
+  ) ? var.sigint_rollback : false
+
   tags            = merge(var.tags, var.service_tags)
   task_definition = local.task_definition
   triggers        = var.triggers
diff --git a/modules/service/variables.tf b/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)
diff --git a/variables.tf b/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)
diff --git a/versions.tf b/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }
diff --git a/wrappers/service/main.tf b/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, {})
diff --git a/wrappers/service/versions.tf b/wrappers/service/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 6.4"
+      version = ">= 6.11"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`aws = {`
`6`	`6`	`source = "hashicorp/aws"`
`7`		`- version = ">= 6.4"`
	`7`	`+ version = ">= 6.6"`
`8`	`8`	`}`
`9`	`9`	`null = {`
`10`	`10`	`source = "hashicorp/null"`
Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,11 @@ resource "aws_ecs_service" "this" {`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
	`282`	`+ sigint_rollback = (`
	`283`	`+ lookup(var.deployment_controller, "type", "ECS") == "ECS" &&`
	`284`	`+ var.wait_for_steady_state == true`
	`285`	`+ ) ? var.sigint_rollback : false`
	`286`	`+`
`282`	`287`	`tags = merge(var.tags, var.service_tags)`
`283`	`288`	`task_definition = local.task_definition`
`284`	`289`	`triggers = var.triggers`