[NRL-853] WIP - Switch copy_action to list, still more to do on that

Author: mattdean3-nhs

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

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

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

@@ -17,11 +17,11 @@ resource "aws_backup_plan" "default" {
         cold_storage_after = rule.value.lifecycle.cold_storage_after != null ? rule.value.lifecycle.cold_storage_after : null
       }
       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.lifecycle.delete_after
-            cold_storage_after = copy_action.value.lifecycle.cold_storage_after
+            delete_after       = copy_action.value.delete_after
+            cold_storage_after = copy_action.value.cold_storage_after != null ? copy_action.value.cold_storage_after : null
           }
           destination_vault_arn = var.backup_copy_vault_arn
         }

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

@@ -78,18 +78,18 @@ variable "backup_plan_config" {
     enable                    = bool
     selection_tag             = string
     compliance_resource_types = list(string)
-    rules = list(object({
+    rules = optional(list(object({
       name                     = string
       schedule                 = string
       enable_continuous_backup = optional(bool)
       lifecycle = object({
         delete_after       = optional(number)
         cold_storage_after = optional(number)
       })
-      copy_action = optional(object({
+      copy_action = optional(list(object({
         delete_after = optional(number)
-      }))
-    }))
+      })))
+    })))
   })
 }
 variable "backup_plan_config_dynamodb" {
@@ -106,10 +106,10 @@ variable "backup_plan_config_dynamodb" {
         delete_after       = number
         cold_storage_after = optional(number)
       })
-      copy_action = optional(object({
+      copy_action = optional(list(object({
         delete_after       = optional(number)
         cold_storage_after = optional(number)
-      }))
+      })))
     })))
   })