From d318bc5695d0fc41f1e6236aef2784d305f400ed Mon Sep 17 00:00:00 2001 From: ashle001 Date: Fri, 26 Feb 2021 09:37:21 -0500 Subject: [PATCH 1/6] add hpsa, hpom --- it-windows-base/ports.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/it-windows-base/ports.tf b/it-windows-base/ports.tf index b61bb5e..8d71865 100644 --- a/it-windows-base/ports.tf +++ b/it-windows-base/ports.tf @@ -24,6 +24,9 @@ locals { n_ansible = ["172.24.12.239/32"] n_encase = ["148.129.121.72/32"] n_riverbed = ["172.24.100.107/32"] + n_hpsa = ["172.24.100.141/32", "172.24.100.154/32", "172.24.100.165/32"] + n_hpomtcp = ["172.24.105.24/32"] + n_hpomudp = ["172.24.105.24/32"] source_groups = ["all", "external"] name = var.name ports = [ @@ -36,6 +39,9 @@ locals { [4445, 4445, "tcp", "EnCase", local.n_encase, ["external"]], [5986, 5986, "tcp", "WinRM-https", local.n_ansible, ["external"]], [27401, 27401, "tcp", "TransactionAgent", local.n_riverbed, ["external"]], + [1002, 1002, "tcp", "HPSA", local.n_hpsa, ["external"]], + [383, 383, "tcp", HPOM, local.n_hpomtcp, ["external"]], + [383, 383, "udp", HPOM, local.n_hpomudp, ["externa;"]], ] # these are ignored From 4f950aeee5c534d9fa7646ca50d70f2382d13698 Mon Sep 17 00:00:00 2001 From: ashle001 Date: Fri, 26 Feb 2021 09:37:21 -0500 Subject: [PATCH 2/6] ADD HPSA, HPOM INC000002652291 --- it-windows-base/ports.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/it-windows-base/ports.tf b/it-windows-base/ports.tf index b61bb5e..8d71865 100644 --- a/it-windows-base/ports.tf +++ b/it-windows-base/ports.tf @@ -24,6 +24,9 @@ locals { n_ansible = ["172.24.12.239/32"] n_encase = ["148.129.121.72/32"] n_riverbed = ["172.24.100.107/32"] + n_hpsa = ["172.24.100.141/32", "172.24.100.154/32", "172.24.100.165/32"] + n_hpomtcp = ["172.24.105.24/32"] + n_hpomudp = ["172.24.105.24/32"] source_groups = ["all", "external"] name = var.name ports = [ @@ -36,6 +39,9 @@ locals { [4445, 4445, "tcp", "EnCase", local.n_encase, ["external"]], [5986, 5986, "tcp", "WinRM-https", local.n_ansible, ["external"]], [27401, 27401, "tcp", "TransactionAgent", local.n_riverbed, ["external"]], + [1002, 1002, "tcp", "HPSA", local.n_hpsa, ["external"]], + [383, 383, "tcp", HPOM, local.n_hpomtcp, ["external"]], + [383, 383, "udp", HPOM, local.n_hpomudp, ["externa;"]], ] # these are ignored From 1a0eae3451dee9c2ca698c7e21b7be01429ed17b Mon Sep 17 00:00:00 2001 From: ashle001 Date: Fri, 26 Feb 2021 10:15:31 -0500 Subject: [PATCH 3/6] add hpsa, hpom INC000002652291 --- it-windows-base/ports.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/it-windows-base/ports.tf b/it-windows-base/ports.tf index 8d71865..810091d 100644 --- a/it-windows-base/ports.tf +++ b/it-windows-base/ports.tf @@ -25,8 +25,7 @@ locals { n_encase = ["148.129.121.72/32"] n_riverbed = ["172.24.100.107/32"] n_hpsa = ["172.24.100.141/32", "172.24.100.154/32", "172.24.100.165/32"] - n_hpomtcp = ["172.24.105.24/32"] - n_hpomudp = ["172.24.105.24/32"] + n_hpom = ["172.24.105.24/32"] source_groups = ["all", "external"] name = var.name ports = [ @@ -40,8 +39,8 @@ locals { [5986, 5986, "tcp", "WinRM-https", local.n_ansible, ["external"]], [27401, 27401, "tcp", "TransactionAgent", local.n_riverbed, ["external"]], [1002, 1002, "tcp", "HPSA", local.n_hpsa, ["external"]], - [383, 383, "tcp", HPOM, local.n_hpomtcp, ["external"]], - [383, 383, "udp", HPOM, local.n_hpomudp, ["externa;"]], + [383, 383, "tcp", HPOM, local.n_hpom, ["external"]], + [383, 383, "udp", HPOM, local.n_hpom, ["externa;"]], ] # these are ignored From 201b2558b090cbe5655c5d159742b139c6f249c5 Mon Sep 17 00:00:00 2001 From: ashle001 Date: Fri, 26 Feb 2021 10:33:52 -0500 Subject: [PATCH 4/6] HPSA ports - INC000002652291 --- it-windows-base/ports.tf | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/it-windows-base/ports.tf b/it-windows-base/ports.tf index 23e69de..6b9aee2 100644 --- a/it-windows-base/ports.tf +++ b/it-windows-base/ports.tf @@ -25,12 +25,7 @@ locals { n_encase = ["148.129.121.72/32"] n_riverbed = ["172.24.100.107/32"] n_hpsa = ["172.24.100.141/32", "172.24.100.154/32", "172.24.100.165/32"] -<<<<<<< HEAD n_hpom = ["172.24.105.24/32"] -======= - n_hpomtcp = ["172.24.105.24/32"] - n_hpomudp = ["172.24.105.24/32"] ->>>>>>> d318bc5695d0fc41f1e6236aef2784d305f400ed source_groups = ["all", "external"] name = var.name ports = [ @@ -44,8 +39,8 @@ locals { [5986, 5986, "tcp", "WinRM-https", local.n_ansible, ["external"]], [27401, 27401, "tcp", "TransactionAgent", local.n_riverbed, ["external"]], [1002, 1002, "tcp", "HPSA", local.n_hpsa, ["external"]], - [383, 383, "tcp", HPOM, local.n_hpom, ["external"]], - [383, 383, "udp", HPOM, local.n_hpom, ["external"]], + [383, 383, "tcp", "HPOM", local.n_hpom, ["external"]], + [383, 383, "udp", "HPOM", local.n_hpom, ["external"]], ] # these are ignored From a2b3ca8f756f8b830d4e9c2c62b2e9bac99c4128 Mon Sep 17 00:00:00 2001 From: ashle001 Date: Fri, 26 Feb 2021 11:10:31 -0500 Subject: [PATCH 5/6] update version CHANGELOG and created_by tag --- it-windows-base/CHANGELOG.md | 3 +++ it-windows-base/main.tf | 1 + it-windows-base/version.tf | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/it-windows-base/CHANGELOG.md b/it-windows-base/CHANGELOG.md index 07e5f43..a3405d8 100644 --- a/it-windows-base/CHANGELOG.md +++ b/it-windows-base/CHANGELOG.md @@ -5,3 +5,6 @@ * add EnCase source 148.129.71.121 to 4445/tcp (ticket INC000002587282) * add Riverbed Transaction Agent (formerly appcapture) 172.24.100.107 to 27401/tcp +# v1.2 -- 20210226 + * add HPSA source 172.24.100.141/32, 172.24.100.154/32, 172.24.100.166/32 to 1002/tcp (ticket INC000002652291) + * add HPOM source 172.24.105.24/32 to 383/tcp and udp (ticket INC000002652291) diff --git a/it-windows-base/main.tf b/it-windows-base/main.tf index 62c3f03..2c45a16 100644 --- a/it-windows-base/main.tf +++ b/it-windows-base/main.tf @@ -114,6 +114,7 @@ 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)))), ) diff --git a/it-windows-base/version.tf b/it-windows-base/version.tf index 5190b69..1ee6619 100644 --- a/it-windows-base/version.tf +++ b/it-windows-base/version.tf @@ -1,3 +1,3 @@ locals { - _module_version = "1.1" + _module_version = "1.2.0" } From 1ad24501fbcf760e458b249a24b8f88b3c8a56cc Mon Sep 17 00:00:00 2001 From: ashle001 Date: Fri, 26 Feb 2021 11:18:22 -0500 Subject: [PATCH 6/6] update latest change entry --- it-windows-base/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it-windows-base/CHANGELOG.md b/it-windows-base/CHANGELOG.md index a3405d8..4315820 100644 --- a/it-windows-base/CHANGELOG.md +++ b/it-windows-base/CHANGELOG.md @@ -6,5 +6,5 @@ * add Riverbed Transaction Agent (formerly appcapture) 172.24.100.107 to 27401/tcp # v1.2 -- 20210226 - * add HPSA source 172.24.100.141/32, 172.24.100.154/32, 172.24.100.166/32 to 1002/tcp (ticket INC000002652291) - * add HPOM source 172.24.105.24/32 to 383/tcp and udp (ticket INC000002652291) + * add HPSA and HPOM + * ticket INC000002652291