From bfa1ed5d460a893e0fcf530c64f75beaa568380b Mon Sep 17 00:00:00 2001 From: dspeck1 Date: Thu, 12 Sep 2024 12:21:19 -0500 Subject: [PATCH] Add point in time recovery variable --- .../deployments/science-platform/cloudsql/main.tf | 4 +++- .../science-platform/cloudsql/variables.tf | 5 +++++ .../science-platform/env/dev-cloudsql.tfvars | 13 +++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/environment/deployments/science-platform/cloudsql/main.tf b/environment/deployments/science-platform/cloudsql/main.tf index e43c1ced..5435cbd8 100644 --- a/environment/deployments/science-platform/cloudsql/main.tf +++ b/environment/deployments/science-platform/cloudsql/main.tf @@ -1,3 +1,4 @@ +# Butler Registry DP02 module "db_butler_registry_dp02" { source = "../../../../modules/cloudsql/postgres-private" authorized_networks = [ @@ -26,7 +27,7 @@ module "db_butler_registry_dp02" { enabled = var.butler_registry_dp02_backups_enabled start_time = var.butler_registry_dp02_backups_start_time location = "us-central1" - point_in_time_recovery_enabled = true + point_in_time_recovery_enabled = var.butler_registry_dp02_backups_point_in_time_recovery_enabled } } @@ -77,6 +78,7 @@ data "google_compute_network" "network" { project = var.project_id } +# Science Platform Database module "db_science_platform" { source = "../../../../modules/cloudsql/postgres-sql" diff --git a/environment/deployments/science-platform/cloudsql/variables.tf b/environment/deployments/science-platform/cloudsql/variables.tf index 6640efd7..eb0326bf 100644 --- a/environment/deployments/science-platform/cloudsql/variables.tf +++ b/environment/deployments/science-platform/cloudsql/variables.tf @@ -118,6 +118,11 @@ variable "butler_registry_dp02_backups_start_time" { default = "09:00" } +variable "butler_registry_dp02_backups_point_in_time_recovery_enabled" { + type = bool + description = "Enable Point in Time Recovery for backups" + default = true +} // Science Platform Database variables diff --git a/environment/deployments/science-platform/env/dev-cloudsql.tfvars b/environment/deployments/science-platform/env/dev-cloudsql.tfvars index 9906c518..f64742d5 100644 --- a/environment/deployments/science-platform/env/dev-cloudsql.tfvars +++ b/environment/deployments/science-platform/env/dev-cloudsql.tfvars @@ -13,16 +13,17 @@ butler_registry_dp02_database_flags = [ { name = "max_connections", value = "400" }, { name = "password_encryption", value = "scram-sha-256" } ] -butler_registry_dp02_ipv4_enabled = true -butler_registry_dp02_db_maintenance_window_day = 1 -butler_registry_dp02_db_maintenance_window_hour = 23 -butler_registry_dp02_db_maintenance_window_update_track = "stable" -butler_registry_dp02_backups_enabled = false +butler_registry_dp02_ipv4_enabled = true +butler_registry_dp02_db_maintenance_window_day = 1 +butler_registry_dp02_db_maintenance_window_hour = 23 +butler_registry_dp02_db_maintenance_window_update_track = "stable" +butler_registry_dp02_backups_enabled = false +butler_registry_dp02_backups_point_in_time_recovery_enabled = false # Science Platform Database science_platform_maintenance_window_day = 1 -science_platform_db_maintenance_window_hour = 22 +science_platform_db_maintenance_window_hour = 22 science_platform_db_maintenance_window_update_track = "canary" science_platform_backups_enabled = true