From 7dfc401e3ddc607f3f1a7a19eb8200b3a7007a4b Mon Sep 17 00:00:00 2001
From: roch <trinque@free.fr>
Date: Mon, 22 Jul 2024 10:32:21 +0100
Subject: [PATCH] Fix use of govuk_chat_retry_message-ttl variable

---
 terraform/projects/app-publishing-amazonmq/main.tf            | 1 +
 .../publishing-rabbitmq-schema.json.tpl                       | 2 +-
 terraform/projects/app-publishing-amazonmq/variables.tf       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/terraform/projects/app-publishing-amazonmq/main.tf b/terraform/projects/app-publishing-amazonmq/main.tf
index 31d881ba2..b77507f09 100644
--- a/terraform/projects/app-publishing-amazonmq/main.tf
+++ b/terraform/projects/app-publishing-amazonmq/main.tf
@@ -268,6 +268,7 @@ resource "local_sensitive_file" "amazonmq_rabbitmq_definitions" {
       for user, pw in random_password.mq_user : user => pw.result
     }
     publishing_amazonmq_broker_name = var.publishing_amazonmq_broker_name
+    govuk_chat_retry_message-ttl    = var.govuk_chat_retry_message-ttl
   })
 }
 
diff --git a/terraform/projects/app-publishing-amazonmq/publishing-rabbitmq-schema.json.tpl b/terraform/projects/app-publishing-amazonmq/publishing-rabbitmq-schema.json.tpl
index ead5aafd8..1167c54a8 100644
--- a/terraform/projects/app-publishing-amazonmq/publishing-rabbitmq-schema.json.tpl
+++ b/terraform/projects/app-publishing-amazonmq/publishing-rabbitmq-schema.json.tpl
@@ -139,7 +139,7 @@
       "apply-to": "queues",
       "definition": {
         "dead-letter-exchange": "govuk_chat_dlx",
-        "message-ttl":"${govuk_chat_retry_message-ttl}",
+        "message-ttl":${govuk_chat_retry_message-ttl},
         "ha-mode": "all",
         "ha-sync-mode": "automatic"
       },
diff --git a/terraform/projects/app-publishing-amazonmq/variables.tf b/terraform/projects/app-publishing-amazonmq/variables.tf
index 1c34d9773..72c3140b8 100644
--- a/terraform/projects/app-publishing-amazonmq/variables.tf
+++ b/terraform/projects/app-publishing-amazonmq/variables.tf
@@ -46,9 +46,9 @@ variable "publishing_amazonmq_broker_name" {
 }
 
 variable "govuk_chat_retry_message-ttl" {
-  type        = string
+  type        = number
   description = "Time in miliseconds before messages in the govuk_chat_retry queue expires and are sent back to the govuk_chat_published_ducoments queue through the dead letter mechanism"
-  default     = "300000"
+  default     = 300000
 }
 
 variable "elb_internal_certname" {