Merge pull request #1543 from alphagov/samsimpson1/remove-shared-redis

AmazonMQ fixes
alphagov · Dec 3, 2024 · b2f0f9c · b2f0f9c
2 parents 700ce24 + c6605c1
commit b2f0f9c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/terraform/deployments/govuk-publishing-infrastructure/amazonmq.tf b/terraform/deployments/govuk-publishing-infrastructure/amazonmq.tf
@@ -275,6 +275,7 @@ resource "aws_lambda_function" "post_config_to_amazonmq" {
   role          = aws_iam_role.post_config_to_amazonmq.arn
   handler       = "amazonmq_post_config.lambda_handler"
   runtime       = "python3.12"
+  timeout       = 10
 
   vpc_config {
     subnet_ids         = aws_mq_broker.publishing_amazonmq.subnet_ids

diff --git a/terraform/deployments/tfc-configuration/variables-integration.tf b/terraform/deployments/tfc-configuration/variables-integration.tf
@@ -564,7 +564,7 @@ module "variable-set-amazonmq-integration" {
 
   name = "amazonmq-integration"
   tfvars = {
-    amazonmq_engine_version                       = "3.13.6"
+    amazonmq_engine_version                       = "3.13"
     amazonmq_deployment_mode                      = "SINGLE_INSTANCE"
     amazonmq_maintenance_window_start_day_of_week = "MONDAY"
     amazonmq_maintenance_window_start_time_utc    = "07:00"

diff --git a/terraform/deployments/tfc-configuration/variables-production.tf b/terraform/deployments/tfc-configuration/variables-production.tf
@@ -591,7 +591,7 @@ module "variable-set-amazonmq-production" {
 
   name = "amazonmq-production"
   tfvars = {
-    amazonmq_engine_version                       = "3.13.6"
+    amazonmq_engine_version                       = "3.13"
     amazonmq_deployment_mode                      = "CLUSTER_MULTI_AZ"
     amazonmq_maintenance_window_start_day_of_week = "WEDNESDAY"
     amazonmq_maintenance_window_start_time_utc    = "06:00"

diff --git a/terraform/deployments/tfc-configuration/variables-staging.tf b/terraform/deployments/tfc-configuration/variables-staging.tf
@@ -576,7 +576,7 @@ module "variable-set-amazonmq-staging" {
 
   name = "amazonmq-staging"
   tfvars = {
-    amazonmq_engine_version                       = "3.13.6"
+    amazonmq_engine_version                       = "3.13"
     amazonmq_deployment_mode                      = "SINGLE_INSTANCE"
     amazonmq_maintenance_window_start_day_of_week = "MONDAY"
     amazonmq_maintenance_window_start_time_utc    = "07:00"