Skip to content

Commit a722a63

Browse files
authored
Revert db upgrade (#3463)
This PR reverts the DB update. The handling of non-default parameter groups needs to be fixed and tested
2 parents c65d23d + 7ff4ffe commit a722a63

File tree

4 files changed

+14
-34
lines changed

4 files changed

+14
-34
lines changed

terraform/app/env/qa.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,3 @@ http_hosts = {
2525
appspec_bucket = "nhse-mavis-appspec-bucket-qa"
2626
minimum_web_replicas = 2
2727
maximum_web_replicas = 4
28-
29-
rds_engine_version = "16.8"
30-
rds_maintenance_window = "tue:02:30-tue:03:00"

terraform/app/env/test.tfvars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ http_hosts = {
2020
MAVIS__GIVE_OR_REFUSE_CONSENT_HOST = "test.mavistesting.com"
2121
}
2222
appspec_bucket = "nhse-mavis-appspec-bucket-test"
23-
24-
rds_engine_version = "16.8"
25-
rds_maintenance_window = "tue:02:30-tue:03:00"

terraform/app/rds.tf

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,19 @@ resource "aws_db_subnet_group" "aurora_subnet_group" {
3434
}
3535

3636
resource "aws_rds_cluster" "aurora_cluster" {
37-
cluster_identifier = var.resource_name.db_cluster
38-
engine = "aurora-postgresql"
39-
engine_mode = "provisioned"
40-
engine_version = var.rds_engine_version
41-
database_name = "manage_vaccinations"
42-
master_username = "postgres"
43-
manage_master_user_password = var.db_secret_arn == null
44-
storage_encrypted = true
45-
backup_retention_period = var.backup_retention_period
46-
skip_final_snapshot = !local.is_production
47-
db_subnet_group_name = aws_db_subnet_group.aurora_subnet_group.name
48-
vpc_security_group_ids = [aws_security_group.rds_security_group.id]
49-
deletion_protection = true
50-
allow_major_version_upgrade = true
51-
preferred_maintenance_window = var.rds_maintenance_window
37+
cluster_identifier = var.resource_name.db_cluster
38+
engine = "aurora-postgresql"
39+
engine_mode = "provisioned"
40+
engine_version = "14.9"
41+
database_name = "manage_vaccinations"
42+
master_username = "postgres"
43+
manage_master_user_password = var.db_secret_arn == null
44+
storage_encrypted = true
45+
backup_retention_period = var.backup_retention_period
46+
skip_final_snapshot = !local.is_production
47+
db_subnet_group_name = aws_db_subnet_group.aurora_subnet_group.name
48+
vpc_security_group_ids = [aws_security_group.rds_security_group.id]
49+
deletion_protection = true
5250

5351
serverlessv2_scaling_configuration {
5452
max_capacity = var.max_aurora_capacity_units

terraform/app/variables.tf

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -229,19 +229,7 @@ variable "backup_retention_period" {
229229
description = "The number of days to retain backups for the RDS cluster."
230230
}
231231

232-
variable "rds_engine_version" {
233-
type = string
234-
default = "14.9"
235-
description = "The version of the database engine to use for the RDS cluster."
236-
}
237-
238-
variable "rds_maintenance_window" {
239-
type = string
240-
default = "sun:02:30-sun:03:00"
241-
description = "The preferred maintenance window for the RDS cluster."
242-
}
243-
244-
########## ECS/Scaling Configuration ##########
232+
########## ESC/Scaling Configuration ##########
245233

246234
variable "minimum_web_replicas" {
247235
type = number

0 commit comments

Comments
 (0)