feat(terraform): vol5223 add timeouts for batch commands

infra/terraform/environments/dev/main.tf

@@ -253,22 +253,27 @@ module "service" {
       {
         name     = "clean-up-variations",
         commands = ["batch:clean-up-variations"],
+        timeout  = 43200,
       },
       {
         name     = "cns",
         commands = ["batch:cns"],
+        timeout  = 43200,
       },
       {
         name     = "create-psv-licence-surrender-task",
         commands = ["batch:create-psv-licence-surrender-task"],
+        timeout  = 43200,
       },
       {
         name     = "psv-operator-list-export",
         commands = ["batch:data-gov-uk-export", "-v", "--report-name=psv-operator-list", "--path=/tmp/"],
+        timeout  = 43200,
       },
       {
         name     = "international-goods-export",
         commands = ["batch:data-gov-uk-export", "-v", "--report-name=international-goods", "--path=/tmp/"],
+        timeout  = 43200,
       },
       {
         name     = "data-retention-populate",
@@ -293,22 +298,27 @@ module "service" {
       {
         name     = "digital-continuation-reminders",
         commands = ["batch:digital-continuation-reminders"],
+        timeout  = 43200,
       },
       {
         name     = "duplicate-vehicle-warning",
         commands = ["batch:duplicate-vehicle-warning"],
+        timeout  = 43200,
       },
       {
-        name     = "enqueue-ch-compare"
+        name     = "enqueue-ch-compare",
         commands = ["batch:enqueue-ch-compare"],
+        timeout  = 1800,
       },
       {
         name     = "expire-bus-registration",
         commands = ["batch:expire-bus-registration"],
+        timeout  = 43200,
       },
       {
         name     = "flag-urgent-tasks",
         commands = ["batch:flag-urgent-tasks"],
+        timeout  = 1800,
       },
       {
         name     = "import-users-from-csv",
@@ -317,18 +327,22 @@ module "service" {
       {
         name     = "inspection-request-email",
         commands = ["batch:inspection-request-email"],
+        timeout  = 1800,
       },
       {
         name     = "interim-end-date-enforcement",
         commands = ["batch:interim-end-date-enforcement"],
+        timeout  = 43200,
       },
       {
         name     = "last-tm-letter",
         commands = ["batch:last-tm-letter"],
+        timeout  = 43200,
       },
       {
         name     = "licence-status-rules",
         commands = ["batch:licence-status-rules"],
+        timeout  = 1800,
       },
       {
         name     = "process-cl",
@@ -337,18 +351,22 @@ module "service" {
       {
         name     = "process-inbox",
         commands = ["batch:process-inbox"],
+        timeout  = 43200,
       },
       {
         name     = "process-ntu",
         commands = ["batch:process-ntu"],
+        timeout  = 43200,
       },
       {
         name     = "remove-read-audit",
         commands = ["batch:remove-read-audit"],
+        timeout  = 43200,
       },
       {
         name     = "resolve-payments",
         commands = ["batch:resolve-payments"],
+        timeout  = 150,
       },
       {
         name     = "system-parameter",
@@ -361,66 +379,82 @@ module "service" {
       {
         name     = "close-expired-windows",
         commands = ["permits:close-expired-windows"],
+        timeout  = 43200,
       },
       {
         name     = "mark-expired-permits",
         commands = ["permits:mark-expired-permits"],
+        timeout  = 43200,
       },
       {
         name     = "process-queue-general",
         commands = ["queue:process-queue", "--exclude", "que_typ_ch_compare,que_typ_create_gds_vehicle_list,que_typ_create_psv_vehicle_list,que_typ_disc_printing,que_typ_print,que_typ_disc_printing_print,que_typ_create_com_lic,que_typ_remove_deleted_docs,que_typ_permit_generate,que_typ_permit_print,que_typ_run_ecmt_scoring,que_typ_accept_ecmt_scoring,que_typ_irhp_permits_allocate"],
+        timeout  = 90,
       },
       {
         name     = "process-queue-community-licences",
         commands = ["queue:process-queue", "--type", "que_typ_create_com_lic"],
+        timeout  = 90,
       },
       {
         name     = "process-queue-disc-generation",
         commands = ["queue:process-queue", "--type", "que_typ_create_gds_vehicle_list,que_typ_create_psv_vehicle_list,que_typ_disc_printing"],
+        timeout  = 90,
       },
       {
         name     = "process-queue-disc-print",
         commands = ["queue:process-queue", "--type", "que_typ_disc_printing_print", "--queue-duration", "840"],
+        timeout  = 850,
       },
       {
         name     = "process-queue-ecmt-accept",
         commands = ["queue:process-queue", "--type", "que_typ_accept_ecmt_scoring"],
+        timeout  = 90,
       },
       {
         name     = "process-queue-irhp-allocate",
         commands = ["queue:process-queue", "--type", "que_typ_run_ecmt_scoring"],
+        timeout  = 90,
       },
       {
         name     = "process-queue-permit-generation",
         commands = ["queue:process-queue", "--type", "que_typ_permit_generate"],
+        timeout  = 90,
       },
       {
         name     = "process-queue-permit-print",
         commands = ["queue:process-queue", "--type", "que_typ_permit_print", "--queue-duration", "840"],
+        timeout  = 850,
       },
       {
         name     = "process-queue-print",
         commands = ["queue:process-queue", "--type", "que_typ_print"],
+        timeout  = 90,
       },
       {
         name     = "process-company-profile",
         commands = ["queue:process-company-profile"],
+        timeout  = 150,
       },
       {
         name     = "company-profile-dlq",
         commands = ["queue:company-profile-dlq"],
+        timeout  = 900,
       },
       {
         name     = "process-insolvency",
         commands = ["queue:process-insolvency"],
+        timeout  = 900,
       },
       {
         name     = "process-insolvency-dlq",
         commands = ["queue:process-insolvency-dlq"],
+        timeout  = 900,
       },
       {
         name     = "transxchange-consumer",
         commands = ["queue:transxchange-consumer"],
+        timeout  = 90,
       },
     ]
   }

infra/terraform/modules/service/README.md

@@ -45,7 +45,7 @@
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_assets_version"></a> [assets\_version](#input\_assets\_version) | The version of the assets | `string` | n/a | yes |
-| <a name="input_batch"></a> [batch](#input\_batch) | Configuration for the batch process | <pre>object({<br>    version    = string<br>    repository = string<br>    subnet_ids = list(string)<br>    task_iam_role_statements = list(object({<br>      effect    = string<br>      actions   = list(string)<br>      resources = list(string)<br>    }))<br>    jobs = list(object({<br>      name     = string<br>      commands = list(string)<br>      cpu      = optional(number, 1)<br>      memory   = optional(number, 2048)<br>    }))<br>  })</pre> | n/a | yes |
+| <a name="input_batch"></a> [batch](#input\_batch) | Configuration for the batch process | <pre>object({<br>    version    = string<br>    repository = string<br>    subnet_ids = list(string)<br>    task_iam_role_statements = list(object({<br>      effect    = string<br>      actions   = list(string)<br>      resources = list(string)<br>    }))<br>    jobs = list(object({<br>      name     = string<br>      commands = list(string)<br>      cpu      = optional(number, 1)<br>      memory   = optional(number, 2048)<br>      timeout  = optional(number, 300)<br>    }))<br>  })</pre> | n/a | yes |
 | <a name="input_domain_name"></a> [domain\_name](#input\_domain\_name) | The domain name for the environment | `string` | n/a | yes |
 | <a name="input_environment"></a> [environment](#input\_environment) | The environment to deploy to | `string` | n/a | yes |
 | <a name="input_services"></a> [services](#input\_services) | The services to deploy | <pre>map(object({<br>    version    = string<br>    repository = string<br>    cpu        = number<br>    memory     = number<br>    task_iam_role_statements = list(object({<br>      effect    = string<br>      actions   = list(string)<br>      resources = list(string)<br>    }))<br>    add_cdn_url_to_env        = optional(bool, false)<br>    lb_listener_arn           = string<br>    listener_rule_priority    = optional(number, 10)<br>    listener_rule_host_header = optional(string, "*")<br>    security_group_ids        = list(string)<br>    subnet_ids                = list(string)<br>    vpc_id                    = optional(string, null)<br>  }))</pre> | `{}` | no |

infra/terraform/modules/service/batch.tf

@@ -71,7 +71,7 @@ locals {
       }
     })
 
-    attempt_duration_seconds = 60
+    attempt_duration_seconds = job.timeout
     retry_strategy           = local.default_retry_policy
   } }
 }

infra/terraform/modules/service/variables.tf

@@ -57,6 +57,7 @@ variable "batch" {
       commands = list(string)
       cpu      = optional(number, 1)
       memory   = optional(number, 2048)
+      timeout  = optional(number, 300)
     }))
   })
 }