Moving mtls to secure and normal presets

Author: alexbourret

parameter-sets/credential/parameter-set.json

@@ -119,6 +119,27 @@
             "label": "User key/values",
             "description": "User defined keys/values that can be used later in url, query string...",
             "type": "KEY_VALUE_LIST"
+        },
+        {
+            "name": "use_mtls",
+            "label": " ",
+            "description": "Use mTLS",
+            "type": "BOOLEAN",
+            "defaultValue": false
+        },
+        {
+            "name": "mtls_certificate_path",
+            "label": "Path to certificate",
+            "description": "",
+            "type": "STRING",
+            "visibilityCondition": "model.use_mtls==true"
+        },
+        {
+            "name": "mtls_key_path",
+            "label": "Path to key",
+            "description": "",
+            "type": "STRING",
+            "visibilityCondition": "model.use_mtls==true"
         }
     ]
 }

parameter-sets/secure-basic/parameter-set.json

@@ -38,6 +38,27 @@
                     "label": "NTLM"
                 }
             ]
+        },
+        {
+            "name": "use_mtls",
+            "label": " ",
+            "description": "Use mTLS",
+            "type": "BOOLEAN",
+            "defaultValue": false
+        },
+        {
+            "name": "mtls_certificate_path",
+            "label": "Path to certificate",
+            "description": "",
+            "type": "STRING",
+            "visibilityCondition": "model.use_mtls==true"
+        },
+        {
+            "name": "mtls_key_path",
+            "label": "Path to key",
+            "description": "",
+            "type": "STRING",
+            "visibilityCondition": "model.use_mtls==true"
         }
     ]
 }

parameter-sets/secure-oauth/parameter-set.json

@@ -47,6 +47,27 @@
             "label": "Domain",
             "description": "",
             "type": "STRING"
+        },
+        {
+            "name": "use_mtls",
+            "label": " ",
+            "description": "Use mTLS",
+            "type": "BOOLEAN",
+            "defaultValue": false
+        },
+        {
+            "name": "mtls_certificate_path",
+            "label": "Path to certificate",
+            "description": "",
+            "type": "STRING",
+            "visibilityCondition": "model.use_mtls==true"
+        },
+        {
+            "name": "mtls_key_path",
+            "label": "Path to key",
+            "description": "",
+            "type": "STRING",
+            "visibilityCondition": "model.use_mtls==true"
         }
     ]
 }

python-lib/rest_api_client.py

@@ -59,9 +59,17 @@ def __init__(self, credential, secure_credentials, endpoint, custom_key_values={
             self.requests_kwargs.update({"verify": False})
         else:
             self.requests_kwargs.update({"verify": True})
-        if endpoint.get("use_mtls", False):
-            mtls_certificate_path = endpoint.get("mtls_certificate_path")
-            mtls_key_path = endpoint.get("mtls_key_path")
+        if credential.get("use_mtls", False):
+            mtls_certificate_path = credential.get("mtls_certificate_path")
+            mtls_key_path = credential.get("mtls_key_path")
+            self.requests_kwargs.update(
+                {
+                    "cert": (mtls_certificate_path, mtls_key_path)
+                }
+            )
+        if secure_credentials.get("use_mtls", False):
+            mtls_certificate_path = secure_credentials.get("mtls_certificate_path")
+            mtls_key_path = secure_credentials.get("mtls_key_path")
             self.requests_kwargs.update(
                 {
                     "cert": (mtls_certificate_path, mtls_key_path)

tests/python/integration/test_scenario.py

@@ -57,3 +57,7 @@ def test_run_api_connect_xml_handling(user_dss_clients):
 
 def test_run_api_connect_parameters_renaming(user_dss_clients):
     dss_scenario.run(user_dss_clients, project_key=TEST_PROJECT_KEY, scenario_id="COLUMNPARAMETERRENAMING")
+
+
+def test_run_api_connect_mtls(user_dss_clients):
+    dss_scenario.run(user_dss_clients, project_key=TEST_PROJECT_KEY, scenario_id="MTLS")