From 5b61ee37c7fb2dca3eb0e6eacd791d69fb19b02f Mon Sep 17 00:00:00 2001
From: Basma1912 <basad@mozilla.com>
Date: Fri, 19 Jan 2024 11:34:41 -0500
Subject: [PATCH] revert back the discourse rds apply immediately to false and
 update the rds moderator cert

---
 terraform/applications/discourse/variables.tf     | 4 ++--
 terraform/applications/moderator/mysql.tf         | 1 +
 terraform/applications/moderator/variables.tf     | 7 ++++++-
 terraform/applications/moderator/variables.tfvars | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/terraform/applications/discourse/variables.tf b/terraform/applications/discourse/variables.tf
index 1f204e4..4c29eab 100644
--- a/terraform/applications/discourse/variables.tf
+++ b/terraform/applications/discourse/variables.tf
@@ -25,7 +25,7 @@ locals {
       redis_num_nodes        = 1
       redis_version          = "5.0.6"
       ca_cert_identifier     = "rds-ca-rsa4096-g1"
-      apply_immediately      = true
+      apply_immediately      = false
 
 
     }
@@ -42,7 +42,7 @@ locals {
       redis_num_nodes        = 1
       redis_version          = "5.0.6"
       ca_cert_identifier     = "rds-ca-rsa4096-g1"
-      apply_immediately      = true
+      apply_immediately      = false
     }
   }
 
diff --git a/terraform/applications/moderator/mysql.tf b/terraform/applications/moderator/mysql.tf
index cd64881..b1b1fa4 100644
--- a/terraform/applications/moderator/mysql.tf
+++ b/terraform/applications/moderator/mysql.tf
@@ -39,4 +39,5 @@ resource "aws_db_instance" "moderator" {
   db_subnet_group_name        = aws_db_subnet_group.moderator-db.id
   vpc_security_group_ids      = [aws_security_group.moderator-db.id]
   apply_immediately           = true
+  ca_cert_identifier          = var.ca_cert_identifier
 }
diff --git a/terraform/applications/moderator/variables.tf b/terraform/applications/moderator/variables.tf
index 7d697b2..324562f 100644
--- a/terraform/applications/moderator/variables.tf
+++ b/terraform/applications/moderator/variables.tf
@@ -29,7 +29,7 @@ variable "mysql_storage_max" {
 }
 
 variable "mysql_version" {
-  default = "5.6"
+  default = "5.7.42"
   type    = string
 }
 
@@ -52,3 +52,8 @@ variable "region" {
   default = "us-west-2"
   type    = string
 }
+
+variable "ca_cert_identifier" {
+  default     = "rds-ca-rsa4096-g1"
+  description = "Allows you to modify the underlying RDS certificate"
+}
diff --git a/terraform/applications/moderator/variables.tfvars b/terraform/applications/moderator/variables.tfvars
index f628d4d..99cff41 100644
--- a/terraform/applications/moderator/variables.tfvars
+++ b/terraform/applications/moderator/variables.tfvars
@@ -4,7 +4,7 @@ moderator_mozilla       = "moderator.allizom.org"
 mysql_instance          = "db.t3.micro"
 mysql_storage_allocated = 5
 mysql_storage_max       = 20
-mysql_version           = "5.7"
+mysql_version           = "5.7.42"
 project                 = "moderator"
 project_desc            = "moderator.allizom.org"
 project_email           = "it-sre@mozilla.com"