Add multiple copy_action support

lgallard · Jul 16, 2021 · 80a721e · 80a721e
1 parent 7f977b3
commit 80a721e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.12.0 (July 16, 2021)
+
+ENHANCEMENTS:
+
+* Add multiple `copy_action` support (thanks @unni-kr)
+
 ## 0.11.6 (May 13, 2021)
 
 FIXES:
@@ -31,7 +37,6 @@ ENHANCEMENTS:
 * Add .gitignore file
 * Update README
 
-
 ## 0.11.2 (April 10, 2021)
 
 FIXES:

diff --git a/README.md b/README.md
@@ -45,13 +45,15 @@ module "aws_backup_example" {
         cold_storage_after = 0
         delete_after       = 30
       },
-      copy_action = {
-        lifecycle = {
-          cold_storage_after = 0
-          delete_after       = 90
+      copy_actions = [
+        {
+          lifecycle = {
+            cold_storage_after = 0
+            delete_after       = 90
+          },
+          destination_vault_arn = "arn:aws:backup:us-west-2:123456789101:backup-vault:Default"
         },
-        destination_vault_arn = "arn:aws:backup:us-west-2:123456789101:backup-vault:Default"
-      }
+      ]
       recovery_point_tags = {
         Environment = "production"
       }

diff --git a/examples/complete_plan/main.tf b/examples/complete_plan/main.tf
@@ -33,13 +33,22 @@ module "aws_backup_example" {
         cold_storage_after = 0
         delete_after       = 30
       },
-      copy_action = {
-        lifecycle = {
-          cold_storage_after = 0
-          delete_after       = 90
+      copy_actions = [
+        {
+          lifecycle = {
+            cold_storage_after = 0
+            delete_after       = 90
+          },
+          destination_vault_arn = "arn:aws:backup:us-west-2:123456789101:backup-vault:Default"
         },
-        destination_vault_arn = "arn:aws:backup:us-west-2:123456789101:backup-vault:Default"
-      }
+        {
+          lifecycle = {
+            cold_storage_after = 0
+            delete_after       = 90
+          },
+          destination_vault_arn = "arn:aws:backup:us-east-2:123456789101:backup-vault:Default"
+        },
+      ]
       recovery_point_tags = {
         Environment = "production"
       }

diff --git a/examples/complete_plan/variables.tf b/examples/complete_plan/variables.tf
@@ -1,4 +1,4 @@
 variable "env" {
-  type    = map
+  type    = map(any)
   default = {}
 }
diff --git a/examples/selection_by_tags/main.tf b/examples/selection_by_tags/main.tf
@@ -31,7 +31,7 @@ module "aws_backup_example" {
       start_window        = 120
       completion_window   = 360
       lifecycle           = {}
-      copy_action         = {}
+      copy_actions        = []
       recovery_point_tags = {}
     },
   ]

diff --git a/examples/selection_by_tags/variables.tf b/examples/selection_by_tags/variables.tf
@@ -1,4 +1,4 @@
 variable "env" {
-  type    = map
+  type    = map(any)
   default = {}
 }
diff --git a/main.tf b/main.tf
@@ -25,7 +25,7 @@ resource "aws_backup_plan" "ab_plan" {
 
       # Lifecycle
       dynamic "lifecycle" {
-        for_each = length(lookup(rule.value, "lifecycle")) == 0 ? [] : [lookup(rule.value, "lifecycle", {})]
+        for_each = length(lookup(rule.value, "lifecycle", {})) == 0 ? [] : [lookup(rule.value, "lifecycle", {})]
         content {
           cold_storage_after = lookup(lifecycle.value, "cold_storage_after", 0)
           delete_after       = lookup(lifecycle.value, "delete_after", 90)
@@ -34,7 +34,7 @@ resource "aws_backup_plan" "ab_plan" {
 
       # Copy action
       dynamic "copy_action" {
-        for_each = length(lookup(rule.value, "copy_action", {})) == 0 ? [] : [lookup(rule.value, "copy_action", {})]
+        for_each = lookup(rule.value, "copy_actions", [])
         content {
           destination_vault_arn = lookup(copy_action.value, "destination_vault_arn", null)
 
@@ -48,7 +48,6 @@ resource "aws_backup_plan" "ab_plan" {
           }
         }
       }
-
     }
   }