From bcda729a5e23ee320f2029aff6d2f9015432c709 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Fri, 29 Jul 2022 09:01:12 -0400
Subject: [PATCH]  - common    -fix map() and list()

---
 CHANGELOG.md        | 3 +++
 common/kms.tf       | 2 +-
 common/resources.tf | 4 ++--
 common/version.tf   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6052e4f..4cee705 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -138,3 +138,6 @@ This works with the Terraform AWS provider 4.x, released 2022-02.
   - kms_key
     - add variable multi_region
 
+* 3.3.1 -- 2022-07-28
+   - common
+     -fix map() and list()
diff --git a/common/kms.tf b/common/kms.tf
index e7410d0..784fef2 100644
--- a/common/kms.tf
+++ b/common/kms.tf
@@ -26,7 +26,7 @@ resource "aws_kms_key" "key" {
     local.base_tags,
     var.tags,
     local.enforced_tags,
-    map("Name", local.kms_key_name)
+    { "Name" = local.kms_key_name }
   )
 }
 
diff --git a/common/resources.tf b/common/resources.tf
index d2341b5..8e57512 100644
--- a/common/resources.tf
+++ b/common/resources.tf
@@ -34,7 +34,7 @@ locals {
     "variable" : "s3:x-amz-acl"
     "values" : var.bucket_owner == "BucketOwnerPreferred" ? "bucket-owner-full-control" : ""
   }
-  s3_bucket_conditions_list = list(local.condition_allowed_cidr, local.condition_allowed_endpoints)
+  s3_bucket_conditions_list = [local.condition_allowed_cidr, local.condition_allowed_endpoints]
   s3_bucket_conditions      = [for x in local.s3_bucket_conditions_list : x if length(x.values) > 0]
 
   metadata_tags = merge(
@@ -85,7 +85,7 @@ resource "aws_s3_bucket" "this" {
     local.base_tags,
     var.tags,
     local.enforced_tags,
-    map("Name", local.bucket_name)
+    { "Name" = local.bucket_name }
   )
 }
 
diff --git a/common/version.tf b/common/version.tf
index d164368..8ed9d71 100644
--- a/common/version.tf
+++ b/common/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "3.3.0"
+  _module_version = "3.3.1"
 }