From e3efa6085cf04e82b112a314a3dd23c6fcbf788d Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Fri, 3 Jun 2022 13:19:40 -0400
Subject: [PATCH] change map() to {}

---
 CHANGELOG.md        | 28 ++++++++++++++++++----------
 common/resources.tf | 10 ++++++----
 common/version.tf   |  2 +-
 web/CHANGELOG.md    | 11 ++++++++---
 web/main.tf         | 10 ++++++----
 web/version.tf      |  2 +-
 6 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38caa8e..a017d11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,43 +1,51 @@
 # CHANGELOG
 
-* v2.0.0 -- 20210528
+## version 2.x
+
+* 2.0.0 -- 20210528
   - create a common set of files to not replicate the logic
   - consolidate all the submodules to use the common structure
 
-* v2.1.0 -- 20211021
+* 2.1.0 -- 20211021
   - sas
     - add sas submodule, which can be used for a general module or a specific application module
 
-* v2.2.0 -- 20211022
+* 2.2.0 -- 20211022
   - custom
     - create custom submodule, requires port list passed
 
-* v2.2.1 -- 20211022
+* 2.2.1 -- 20211022
   - custom
     - add ingress_self_* option
 
-* v2.2.2 -- 20211025
+* 2.2.2 -- 20211025
   - custom
     - make ingress_self stuff work
     - fix missing default egress
 
-* v2.2.3 -- 20211026
+* 2.2.3 -- 20211026
   - sas
     - fix ports, self_port_list
 
-* v2.2.4 -- 20211027
+* 2.2.4 -- 20211027
   - common (sas, custom)
     - add flag `enable_default_egress` (ALL), default is true
 
+* 2.2.5 -- 2022-06-03
+  - common and web
+    - change map() to {}
+
 # OLDER
 
 ## web
 
-* v1.0.0 -- 20210604
+* 1.0.0 -- 20210604
   - add module version, update tags
 
-* v1.1.0 -- 20210915
+* 1.1.0 -- 20210915
   - enable use of ingress_networks and egress_networks for pre-defined port list
 
-* v1.1.1 -- 20210929
+* 1.1.1 -- 20210929
   - fix default egress to be 0/0 for web submodule
+
+
diff --git a/common/resources.tf b/common/resources.tf
index c85d3c0..fe75443 100644
--- a/common/resources.tf
+++ b/common/resources.tf
@@ -151,10 +151,12 @@ resource "aws_security_group" "this_security_group" {
   }
 
   tags = merge(
-    map("Name", "sg-${local.name}"),
     var.tags,
-    map("boc:created_by", "terraform"),
-    map("boc:tf_module_version", local._module_version),
-    map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))),
+    {
+      "Name"                  = "sg-${local.name}"
+      "boc:created_by"        = "terraform"
+      "boc:tf_module_version" = local._module_version
+      "boc:vpc:info"          = join(" ", compact(list(var.vpc_id, var.vpc_full_name)))
+    }
   )
 }
diff --git a/common/version.tf b/common/version.tf
index 258a790..050a06d 100644
--- a/common/version.tf
+++ b/common/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "2.2.4"
+  _module_version = "2.2.5"
 }
diff --git a/web/CHANGELOG.md b/web/CHANGELOG.md
index 3523043..26ccd32 100644
--- a/web/CHANGELOG.md
+++ b/web/CHANGELOG.md
@@ -1,8 +1,13 @@
-# v1.0.0 -- 20210604
+# version 1.x
+
+* 1.0.0 -- 20210604
   - add module version, update tags
 
-# v1.1.0 -- 20210915
+* 1.1.0 -- 20210915
   - enable use of ingress_networks and egress_networks for pre-defined port list
 
-# v1.1.1 -- 20210929
+* 1.1.1 -- 20210929
   - fix default egress to be 0/0 for web submodule
+
+* 1.1.2 -- 2022-06-03
+  - change map() to {}
diff --git a/web/main.tf b/web/main.tf
index e1edc45..fdfd703 100644
--- a/web/main.tf
+++ b/web/main.tf
@@ -120,10 +120,12 @@ resource "aws_security_group" "this_security_group" {
   }
 
   tags = merge(
-    map("Name", "sg-${local.name}"),
     var.tags,
-    map("boc:created_by", "terraform"),
-    map("boc:tf_module_version", local._module_version),
-    map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))),
+    {
+      "Name"                  = "sg-${local.name}"
+      "boc:created_by"        = "terraform"
+      "boc:tf_module_version" = local._module_version
+      "boc:vpc:info"          = join(" ", compact(list(var.vpc_id, var.vpc_full_name)))
+    }
   )
 }
diff --git a/web/version.tf b/web/version.tf
index a6a90ee..1cc6d9a 100644
--- a/web/version.tf
+++ b/web/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "1.1.1"
+  _module_version = "1.1.2"
 }