Merge pull request #1695 from atlassian/confluence/fix-deployment-type

confluence/fix-deployment-type

Author: OlehStefanyshyn

app/util/api/confluence_clients.py

@@ -202,9 +202,9 @@ def get_system_info_page(self):
         }
 
         auth_body = {
-            'destination': '/admin/systeminfo.action',
             'authenticate': 'Confirm',
-            'password': self.password
+            'destination': '/admin/systeminfo.action',
+            'password': self.password,
         }
 
         login_page_response = self.session.get(login_url)
@@ -219,12 +219,11 @@ def get_system_info_page(self):
         else:
             self.session.post(url=tsv_auth_url, json=tsv_login_body)
 
-        self.headers['X-Atlassian-Token'] = 'no-check'
-        system_info_html = self.session.post(url=auth_url, data=auth_body, headers=self.headers)
+        system_info_html = self.session.post(url=auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify)
         return system_info_html.content.decode("utf-8")
 
     def get_deployment_type(self):
-        html_pattern = 'com.atlassian.dcapt.deployment=terraform'
+        html_pattern = 'deployment=terraform'
         confluence_system_page = self.get_system_info_page()
         if confluence_system_page.count(html_pattern):
             return 'terraform'