From 08c9219f48d850a10e25d541cd32dee1d4f3e416 Mon Sep 17 00:00:00 2001
From: Benoit Bayszczak <benoit.bayszczak@adevinta.com>
Date: Mon, 7 Sep 2020 14:40:30 +0200
Subject: [PATCH] rename 'approle_auth_path' to 'default_auth_path' & fix
 kwargs.get

---
 awx/main/credential_plugins/hashivault.py             | 11 +++++------
 .../test/awx/test_credential_input_source.py          |  4 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/awx/main/credential_plugins/hashivault.py b/awx/main/credential_plugins/hashivault.py
index a61c80ecf4..82b34dd0ec 100644
--- a/awx/main/credential_plugins/hashivault.py
+++ b/awx/main/credential_plugins/hashivault.py
@@ -41,11 +41,12 @@ base_inputs = {
         'secret': True,
         'help_text': _('The Secret ID for AppRole Authentication')
     }, {
-        'id': 'approle_auth_path',
+        'id': 'default_auth_path',
         'label': _('Path to Approle Auth'),
         'type': 'string',
         'multiline': False,
-        'help_text': _('The path where the AppRole Authentication method is mounted e.g, approle')
+        'default': 'approle',
+        'help_text': _('The AppRole Authentication path to use if one isn\'t provided in the metadata when linking to an input field. Defaults to \'approle\'')
     }
     ],
     'metadata': [{
@@ -126,10 +127,8 @@ def approle_auth(**kwargs):
     role_id = kwargs['role_id']
     secret_id = kwargs['secret_id']
     # we first try to use the 'auth_path' from the metadata
-    # if not found we try to fetch the 'approle_auth_path' from inputs
-    # if not found we use the default value 'approle'
-    auth_path = \
-        kwargs.get('auth_path', kwargs.get('approle_auth_path', "approle"))
+    # if not found we try to fetch the 'default_auth_path' from inputs
+    auth_path = kwargs.get('auth_path') or kwargs['default_auth_path']
 
     url = urljoin(kwargs['url'], 'v1')
     cacert = kwargs.get('cacert', None)
diff --git a/awx_collection/test/awx/test_credential_input_source.py b/awx_collection/test/awx/test_credential_input_source.py
index 96d768275e..703ad4adb3 100644
--- a/awx_collection/test/awx/test_credential_input_source.py
+++ b/awx_collection/test/awx/test_credential_input_source.py
@@ -123,7 +123,7 @@ def source_cred_hashi_secret(organization):
             "token": "myApiKey",
             "role_id": "role",
             "secret_id": "secret",
-            "approle_auth_path": "path-to-approle"
+            "default_auth_path": "path-to-approle"
         }
     )
 
@@ -158,8 +158,6 @@ def test_hashi_secret_credential_source(run_module, admin_user, organization, so
     assert cis.metadata['secret_backend'] == "backend"
     assert cis.metadata['secret_key'] == "a_key"
     assert cis.source_credential.name == source_cred_hashi_secret.name
-    assert cis.source_credential.approle_auth_path == \
-           source_cred_hashi_secret.inputs["approle_auth_path"]
     assert cis.target_credential.name == tgt_cred.name
     assert cis.input_field_name == 'password'
     assert result['id'] == cis.pk