fix: DToSS-7699 Azure SQL Backup Retention config (#759)

rfk-nc · web-flow · commit bb964f28c580 · 2025-03-04T09:08:23.000Z
* Fix: DTOSS-7699: Add Azure SQL Backup Retention

* Fix: DTOSS-7699: Add Azure SQL Backup Retention

* Fix: DTOSS-7699: Add Azure SQL Backup Retention

* Template versions refs
diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-int-core.yaml b/.azuredevops/pipelines/cd-infrastructure-int-core.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: aa87e2c36c4c3c88d4aeadcef6813e464d68621d
+      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
       endpoint: NHSDigital
 
 variables:
diff --git a/infrastructure/tf-core/environments/preprod.tfvars b/infrastructure/tf-core/environments/preprod.tfvars
@@ -1083,6 +1083,14 @@ sqlserver = {
       sku                  = "S7"
       storage_account_type = "GeoZone"
       zone_redundant       = false
+
+      short_term_retention_policy = 35
+      long_term_retention_policy = {
+        weekly_retention  = "P4W"
+        monthly_retention = "P12M"
+        yearly_retention  = "P10Y"
+        week_of_year      = 1
+      }
     }
   }
 
diff --git a/infrastructure/tf-core/sql_server.tf b/infrastructure/tf-core/sql_server.tf
@@ -47,6 +47,10 @@ module "azure_sql_server" {
   # FW Rules
   firewall_rules = var.sqlserver.fw_rules
 
+  # Backup Retention Policies
+  short_term_retention_policy = var.sqlserver.dbs.cohman.short_term_retention_policy
+  long_term_retention_policy  = var.sqlserver.dbs.cohman.long_term_retention_policy
+
   # Private Endpoint Configuration if enabled
   private_endpoint_properties = var.features.private_endpoints_enabled ? {
     private_dns_zone_ids_sql             = [data.terraform_remote_state.hub.outputs.private_dns_zones["${each.key}-azure_sql"].id]
diff --git a/infrastructure/tf-core/variables.tf b/infrastructure/tf-core/variables.tf
@@ -342,6 +342,13 @@ variable "sqlserver" {
       storage_account_type = optional(string, "Local")
       zone_redundant       = optional(bool, false)
 
+      short_term_retention_policy = optional(number, null)
+      long_term_retention_policy = optional(object({
+        weekly_retention  = optional(string, null)
+        monthly_retention = optional(string, null)
+        yearly_retention  = optional(string, null)
+        week_of_year      = optional(number, null)
+      }), {})
     })), {})
 
     # FW Rules

Original file line number	Diff line number	Diff line change
`@@ -1083,6 +1083,14 @@ sqlserver = {`
`1083`	`1083`	`sku = "S7"`
`1084`	`1084`	`storage_account_type = "GeoZone"`
`1085`	`1085`	`zone_redundant = false`
	`1086`	`+`
	`1087`	`+ short_term_retention_policy = 35`
	`1088`	`+ long_term_retention_policy = {`
	`1089`	`+ weekly_retention = "P4W"`
	`1090`	`+ monthly_retention = "P12M"`
	`1091`	`+ yearly_retention = "P10Y"`
	`1092`	`+ week_of_year = 1`
	`1093`	`+ }`
`1086`	`1094`	`}`
`1087`	`1095`	`}`
`1088`	`1096`