fix: Always send filter map in replication config (#105)

terraform-aws-modules · Aug 13, 2021 · 43e845e · 43e845e
1 parent 29de41c
commit 43e845e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/examples/s3-replication/main.tf b/examples/s3-replication/main.tf
@@ -58,7 +58,7 @@ module "s3_bucket" {
 
     rules = [
       {
-        id       = "foo"
+        id       = "something-with-kms-and-filter"
         status   = "Enabled"
         priority = 10
 
@@ -86,25 +86,45 @@ module "s3_bucket" {
         }
       },
       {
-        id       = "bar"
+        id       = "something-with-filter"
         status   = "Enabled"
         priority = 20
 
+        filter = {
+          prefix = "two"
+          tags = {
+            ReplicateMe = "Yes"
+          }
+        }
+
         destination = {
           bucket        = "arn:aws:s3:::${local.destination_bucket_name}"
           storage_class = "STANDARD"
         }
-
+      },
+      {
+        id       = "everything-with-filter"
+        status   = "Enabled"
+        priority = 30
 
         filter = {
-          prefix = "two"
-          tags = {
-            ReplicateMe = "Yes"
-          }
+          prefix = ""
         }
 
+        destination = {
+          bucket        = "arn:aws:s3:::${local.destination_bucket_name}"
+          storage_class = "STANDARD"
+        }
       },
+      {
+        id     = "everything-without-filters"
+        status = "Enabled"
 
+        destination = {
+          bucket        = "arn:aws:s3:::${local.destination_bucket_name}"
+          storage_class = "STANDARD"
+        }
+      },
     ]
   }
 

diff --git a/main.tf b/main.tf
@@ -172,8 +172,16 @@ resource "aws_s3_bucket" "this" {
             }
           }
 
+          # Send empty map if `filter` is an empty map or absent entirely
           dynamic "filter" {
-            for_each = length(keys(lookup(rules.value, "filter", {}))) == 0 ? [] : [lookup(rules.value, "filter", {})]
+            for_each = length(keys(lookup(rules.value, "filter", {}))) == 0 ? [{}] : []
+
+            content {}
+          }
+
+          # Send `filter` if it is present and has at least one field
+          dynamic "filter" {
+            for_each = length(keys(lookup(rules.value, "filter", {}))) != 0 ? [lookup(rules.value, "filter", {})] : []
 
             content {
               prefix = lookup(filter.value, "prefix", null)