From 89b731a0cb5cb09be65f4dc6e0aa172c186aaa8c Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Thu, 21 Feb 2019 15:10:36 -0500
Subject: [PATCH] Improve the HashiCorp Vault KV name and field
 labels/help_text

---
 awx/main/credential_plugins/hashivault.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/awx/main/credential_plugins/hashivault.py b/awx/main/credential_plugins/hashivault.py
index 27828b4e18..0fd14bd051 100644
--- a/awx/main/credential_plugins/hashivault.py
+++ b/awx/main/credential_plugins/hashivault.py
@@ -6,27 +6,27 @@ from hvac import Client
 hashi_inputs = {
     'fields': [{
         'id': 'url',
-        'label': 'Hashivault Server URL',
+        'label': 'Server URL',
         'type': 'string',
-        'help_text': 'The Hashivault server url.'
+        'help_text': 'The URL to the HashiCorp Vault',
     }, {
         'id': 'secret_path',
         'label': 'Secret Path',
         'type': 'string',
-        'help_text': 'The path to the secret.'
+        'help_text': 'The path to the secret e.g., /some-engine/some-secret/',
     }, {
         'id': 'secret_field',
         'label': 'Secret Field',
         'type': 'string',
-        'help_text': 'The data field to access on the secret.'
+        'help_text': 'The name of the key to look up in the secret.',
     }, {
         'id': 'token',
         'label': 'Token',
         'type': 'string',
         'secret': True,
-        'help_text': 'An access token for the Hashivault server.'
+        'help_text': 'The access token used to authenticate to the Vault server',
     }],
-    'required': ['url', 'secret_path', 'token'],
+    'required': ['url', 'secret_path', 'secret_field', 'token'],
 }
 
 
@@ -45,4 +45,4 @@ def hashi_backend(**kwargs):
     return response['data']
 
 
-hashivault_plugin = CredentialPlugin('Hashivault', inputs=hashi_inputs, backend=hashi_backend)
+hashivault_plugin = CredentialPlugin('HashiCorp Vault KV Lookup', inputs=hashi_inputs, backend=hashi_backend)