From 5e1a009cf38c24a5aceb6cf424ba2ceeaa1f074a Mon Sep 17 00:00:00 2001
From: Thomas Rogozinski <trogozinski@atlassian.com>
Date: Thu, 21 Jul 2022 16:39:08 +1000
Subject: [PATCH 1/3] Update atl_hazelcast_network_aws_tag_key to read
 environment var

---
 roles/confluence_config/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index d39d683..a536049 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -13,7 +13,7 @@ atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}"
 atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}"
 atl_db_preferredtestquery: "{{ lookup('env', 'ATL_DB_PREFERREDTESTQUERY') or 'select version();' }}"
 
-atl_hazelcast_network_aws_tag_key: "Cluster"
+atl_hazelcast_network_aws_tag_key: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_KEY') }}"
 atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
 atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_REGION') }}"
 atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"

From 5d42a935179a7a084056cce54cd83bc864589324 Mon Sep 17 00:00:00 2001
From: Adam Brokes <adam.brokes@gmail.com>
Date: Mon, 25 Jul 2022 16:50:06 +1000
Subject: [PATCH 2/3] Add a test case for atl_hazelcast_network_aws_tag_key
 value

---
 roles/confluence_config/molecule/default/converge.yml          | 1 +
 roles/confluence_config/molecule/default/tests/test_default.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/roles/confluence_config/molecule/default/converge.yml b/roles/confluence_config/molecule/default/converge.yml
index 632e11c..636e9aa 100644
--- a/roles/confluence_config/molecule/default/converge.yml
+++ b/roles/confluence_config/molecule/default/converge.yml
@@ -20,6 +20,7 @@
     atl_proxy_name: "localhost"
     atl_proxy_port: "80"
     atl_db_preferredtestquery: "select 1;"
+    atl_hazelcast_network_aws_tag_key: "my-cluster-tag"
 
   roles:
     - role: linux_common
diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index 246f030..c8fc29a 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -80,6 +80,7 @@ def test_confluence_config_file(host):
     assert f.contains('<property name="hibernate.connection.password">molecule_password</property>')
     assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
     assert f.contains('<property name="confluence.webapp.context.path">/foo</property>')
+    assert f.contains('<property name="confluence.cluster.aws.tag.key">my-cluster-tag</property>')
 
 @pytest.mark.parametrize('font', [
 #    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'

From b32ff0ea031cd6abbd1d3a2753d09c65974d0f25 Mon Sep 17 00:00:00 2001
From: Adam Brokes <adam.brokes@gmail.com>
Date: Mon, 25 Jul 2022 16:50:27 +1000
Subject: [PATCH 3/3] Set the default for atl_hazelcast_network_aws_tag_key if
 env variable is missing

---
 roles/confluence_config/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index a536049..d755769 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -13,7 +13,7 @@ atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}"
 atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}"
 atl_db_preferredtestquery: "{{ lookup('env', 'ATL_DB_PREFERREDTESTQUERY') or 'select version();' }}"
 
-atl_hazelcast_network_aws_tag_key: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_KEY') }}"
+atl_hazelcast_network_aws_tag_key: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_KEY') or 'Cluster' }}"
 atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
 atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_REGION') }}"
 atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"