Infrastructure tweaks

- Unique secret names on re-creation
- Unique names for security groups

Author: TheOneFromNorway

terraform/app/ssm_parameters.tf

@@ -25,21 +25,27 @@ resource "aws_ssm_parameter" "cloud_variables" {
 }
 
 resource "aws_secretsmanager_secret" "jwt_sign" {
-  name                    = "rep-jwt-signing-secret-${var.environment}"
+  name                    = "rep-jwt-signing-secret-${var.environment}-${substr(uuid(), 0, 4)}"
   description             = "Secret for jwt signing"
   recovery_window_in_days = 7
   tags = {
     Name = "jwt-signing-${var.environment}"
   }
+  lifecycle {
+    ignore_changes = [name]
+  }
 }
 
 resource "aws_secretsmanager_secret" "reporting_flask" {
-  name                    = "reporting-cookie-secret-${var.environment}"
+  name                    = "reporting-cookie-secret-${var.environment}-${substr(uuid(), 0, 4)}"
   description             = "Secret for signing cookies in the reporting service"
   recovery_window_in_days = 7
   tags = {
     Name = "reporting-cookie-secret-${var.environment}"
   }
+  lifecycle {
+    ignore_changes = [name]
+  }
 }
 
 ephemeral "aws_secretsmanager_random_password" "reporting_flask" {

terraform/app/valkey.tf

@@ -112,7 +112,7 @@ resource "aws_cloudwatch_log_group" "valkey_engine_log" {
 }
 
 resource "aws_security_group" "reporting_valkey" {
-  name        = "mavis-cache-${var.environment}"
+  name        = "mavis-cache-reporting-${var.environment}"
   description = "Security group for Valkey ElastiCache for the reporting service"
   vpc_id      = aws_vpc.application_vpc.id
 

terraform/app/variables.tf

@@ -121,9 +121,9 @@ variable "enable_enhanced_db_monitoring" {
 locals {
   is_production = var.environment == "production"
   parameter_store_variables = tomap({ #TODO: Remove once all variables are sourced from application config
-    MAVIS__ACADEMIC_YEAR_TODAY_OVERRIDE             = ""
-    MAVIS__ACADEMIC_YEAR_NUMBER_OF_PREPARATION_DAYS = ""
-    MAVIS__PDS__ENQUEUE_BULK_UPDATES                = ""
+    MAVIS__ACADEMIC_YEAR_TODAY_OVERRIDE             = "a"
+    MAVIS__ACADEMIC_YEAR_NUMBER_OF_PREPARATION_DAYS = "a"
+    MAVIS__PDS__ENQUEUE_BULK_UPDATES                = "a"
     MAVIS__PDS__RATE_LIMIT_PER_SECOND               = 5
     GOOD_JOB_MAX_THREADS                            = 5
     SIDEKIQ_CONCURRENCY                             = 5