[NRL-853] Fix backup config params. Fix cron definitions

Author: mattdean3-nhs

terraform/account-wide-infrastructure/dev/aws-backup.tf

@@ -113,7 +113,7 @@ module "source" {
     "rules" : [
       {
         "copy_action" : [{
-          "delete_after" : 4
+          "delete_after" : 4,
         }],
         "lifecycle" : {
           "delete_after" : 2
@@ -135,7 +135,7 @@ module "source" {
         "name" : "daily",
         "schedule" : "cron(0 0 * * ? *)",
         "copy_action" : [{
-          "delete_after" : 4
+          "delete_after" : 4,
         }],
 
         "lifecycle" : {
@@ -144,7 +144,7 @@ module "source" {
       },
       {
         "name" : "monthly"
-        "schedule" : "cron(30 0 * * 4#1)" # first Thursday each month from 00:30
+        "schedule" : "cron(30 0 ? * 4#1)" # first Thursday each month from 00:30
         "copy_action" : [{
           "cold_storage_after" : 3,
           "delete_after" : 100 # ensures there will always be min 3
@@ -156,10 +156,10 @@ module "source" {
       },
       {
         "name" : "weekly"               # overlaps with monthly
-        "schedule" : "cron(30 0 * * 4)" # every Thursday from 00:30 to precede releases
+        "schedule" : "cron(30 0 ? * 4)" # every Thursday from 00:30 to precede releases
         "copy_action" : [{
           "cold_storage_after" : 14 # ensures 2 warm including one from previous release
-          "delete_after" : 100
+          "delete_after" : 105
         }],
         "lifecycle" : {
           "delete_after" : 2

terraform/account-wide-infrastructure/modules/backup-source/backup_plan.tf

@@ -11,17 +11,17 @@ resource "aws_backup_plan" "default" {
       rule_name                = rule.value.name
       target_vault_name        = aws_backup_vault.main.name
       schedule                 = rule.value.schedule
-      enable_continuous_backup = rule.value.enable_continuous_backup != null ? rule.value.enable_continuous_backup : null
+      enable_continuous_backup = rule.value.enable_continuous_backup
       lifecycle {
-        delete_after       = rule.value.lifecycle.delete_after != null ? rule.value.lifecycle.delete_after : null
-        cold_storage_after = rule.value.lifecycle.cold_storage_after != null ? rule.value.lifecycle.cold_storage_after : null
+        delete_after       = rule.value.lifecycle.delete_after
+        cold_storage_after = rule.value.lifecycle.cold_storage_after
       }
       dynamic "copy_action" {
         for_each = rule.value.copy_action
         content {
           lifecycle {
             delete_after       = copy_action.value.delete_after
-            cold_storage_after = copy_action.value.cold_storage_after != null ? copy_action.value.cold_storage_after : null
+            cold_storage_after = copy_action.value.cold_storage_after
           }
           destination_vault_arn = var.backup_copy_vault_arn
         }
@@ -45,11 +45,11 @@ resource "aws_backup_plan" "dynamodb" {
       target_vault_name = aws_backup_vault.main.name
       schedule          = rule.value.schedule
       lifecycle {
-        delete_after       = rule.value.lifecycle.delete_after != null ? rule.value.lifecycle.delete_after : null
-        cold_storage_after = rule.value.lifecycle.cold_storage_after != null ? rule.value.lifecycle.cold_storage_after : null
+        delete_after       = rule.value.lifecycle.delete_after
+        cold_storage_after = rule.value.lifecycle.cold_storage_after
       }
       dynamic "copy_action" {
-        for_each = rule.value.copy_action != null ? rule.value.copy_action : {}
+        for_each = rule.value.copy_action
         content {
           lifecycle {
             delete_after       = copy_action.value.delete_after

terraform/account-wide-infrastructure/modules/backup-source/variables.tf

@@ -87,7 +87,8 @@ variable "backup_plan_config" {
         cold_storage_after = optional(number)
       })
       copy_action = optional(list(object({
-        delete_after = optional(number)
+        delete_after       = optional(number)
+        cold_storage_after = optional(number)
       })))
     })))
   })