From a209c513ed2f2ac3a97af9b11478e1a40bdfb750 Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Wed, 26 Oct 2022 11:50:23 +1100
Subject: [PATCH 1/3] ITPLT-2221 Remove the superfluous slash. The
 atl_tomcat_contextpath varible already contains a slash

---
 roles/confluence_config/templates/confluence.cfg.xml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index c1d5563..7b5dd08 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -39,7 +39,7 @@
     <property name="confluence.cluster.name">{{ atl_aws_stack_name }}</property>
     <property name="confluence.cluster.ttl">1</property>
     {% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %}
-        <property name="confluence.webapp.context.path">/{{ atl_tomcat_contextpath }}</property>
+        <property name="confluence.webapp.context.path">{{ atl_tomcat_contextpath }}</property>
     {% endif %}
 
   </properties>

From bf789f9727083f3ec5c003962c2b1dc8ec0d7b13 Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Wed, 26 Oct 2022 13:36:38 +1100
Subject: [PATCH 2/3] ITPLT-2221 Molecule test assert changed to ensure context
 path is with a slash (as it would be when adding cloudformation params)

---
 roles/confluence_config/molecule/default/tests/test_default.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index c8fc29a..9bf11b3 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -38,7 +38,7 @@ def test_server_file(host):
     assert f.exists
     assert f.contains('Connector port="8080"')
     assert f.contains('Server port="8005"')
-    assert f.contains('<Context path="foo"')
+    assert f.contains('<Context path="/foo"')
     assert f.contains('maxThreads="200"')
     assert f.contains('minSpareThreads="10"')
     assert f.contains('connectionTimeout="20000"')

From fba4bba5bb22579e46fefce4b6ca05ce0271175d Mon Sep 17 00:00:00 2001
From: Glenn Stewart <gstewart@atlassian.com>
Date: Wed, 26 Oct 2022 13:48:28 +1100
Subject: [PATCH 3/3] ITPLT-2221 Molecule test assert changed to ensure context
 path is with a slash (as it would be when adding cloudformation params)

---
 roles/confluence_config/molecule/default/converge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/confluence_config/molecule/default/converge.yml b/roles/confluence_config/molecule/default/converge.yml
index 636e9aa..5a7ee00 100644
--- a/roles/confluence_config/molecule/default/converge.yml
+++ b/roles/confluence_config/molecule/default/converge.yml
@@ -16,7 +16,7 @@
     atl_autologin_cookie_age: "COOKIEAGE"
     atl_local_ipv4: "1.1.1.1"
     atl_tomcat_scheme: "http"
-    atl_tomcat_contextpath: "foo"
+    atl_tomcat_contextpath: "/foo"
     atl_proxy_name: "localhost"
     atl_proxy_port: "80"
     atl_db_preferredtestquery: "select 1;"