From ad28be962318bcb547c725ad8d8580ba6170aa98 Mon Sep 17 00:00:00 2001
From: Robert Fairburn <8029478+rfairburn@users.noreply.github.com>
Date: Mon, 14 Jul 2025 17:46:13 -0500
Subject: [PATCH] Fix maintenance window and rds engine version dogfood
 (#30791)

---
 .../dogfood/terraform/aws-tf-module/entra.tf           | 10 +++++-----
 infrastructure/dogfood/terraform/aws-tf-module/free.tf |  7 ++++---
 infrastructure/dogfood/terraform/aws-tf-module/main.tf |  7 ++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/infrastructure/dogfood/terraform/aws-tf-module/entra.tf b/infrastructure/dogfood/terraform/aws-tf-module/entra.tf
index 3b9455ded2..aa65ca492a 100644
--- a/infrastructure/dogfood/terraform/aws-tf-module/entra.tf
+++ b/infrastructure/dogfood/terraform/aws-tf-module/entra.tf
@@ -3,16 +3,16 @@ variable "entra_api_key" {}
 resource "aws_iam_policy" "entra_conditional_access" {
   name   = "fleet-entra-conditional-access"
   policy = data.aws_iam_policy_document.entra_conditional_access.json
-}     
-    
+}
+
 data "aws_iam_policy_document" "entra_conditional_access" {
   statement {
     actions = [
       "secretsmanager:GetSecretValue",
-    ] 
+    ]
     resources = [aws_secretsmanager_secret.entra_conditional_access.arn]
-  } 
-} 
+  }
+}
 
 resource "aws_secretsmanager_secret" "entra_conditional_access" {
   name = "dogfood-entra-conditional-access"
diff --git a/infrastructure/dogfood/terraform/aws-tf-module/free.tf b/infrastructure/dogfood/terraform/aws-tf-module/free.tf
index 5592281db6..aff83138ba 100644
--- a/infrastructure/dogfood/terraform/aws-tf-module/free.tf
+++ b/infrastructure/dogfood/terraform/aws-tf-module/free.tf
@@ -24,9 +24,10 @@ module "free" {
     }
   }
   rds_config = {
-    name                = local.customer_free
-    engine_version      = "8.0.mysql_aurora.3.07.1"
-    snapshot_identifier = "arn:aws:rds:us-east-2:611884880216:cluster-snapshot:a2023-03-06-pre-migration"
+    preferred_maintenance_window = "fri:04:00-fri:05:00"
+    name                         = local.customer_free
+    engine_version               = "8.0.mysql_aurora.3.08.2"
+    snapshot_identifier          = "arn:aws:rds:us-east-2:611884880216:cluster-snapshot:a2023-03-06-pre-migration"
     db_parameters = {
       # 8mb up from 262144 (256k) default
       sort_buffer_size = 8388608
diff --git a/infrastructure/dogfood/terraform/aws-tf-module/main.tf b/infrastructure/dogfood/terraform/aws-tf-module/main.tf
index 2f6883b2c0..8760195939 100644
--- a/infrastructure/dogfood/terraform/aws-tf-module/main.tf
+++ b/infrastructure/dogfood/terraform/aws-tf-module/main.tf
@@ -90,9 +90,10 @@ module "main" {
     name = local.customer
   }
   rds_config = {
-    name                = local.customer
-    engine_version      = "8.0.mysql_aurora.3.07.1"
-    snapshot_identifier = "arn:aws:rds:us-east-2:611884880216:cluster-snapshot:a2023-03-06-pre-migration"
+    preferred_maintenance_window = "fri:04:00-fri:05:00"
+    name                         = local.customer
+    engine_version               = "8.0.mysql_aurora.3.08.2"
+    snapshot_identifier          = "arn:aws:rds:us-east-2:611884880216:cluster-snapshot:a2023-03-06-pre-migration"
     db_parameters = {
       # 8mb up from 262144 (256k) default
       sort_buffer_size = 8388608