From 32fce43311b6c9bde8ef9884326df821225087ac Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Wed, 13 Feb 2019 18:32:00 +0530 Subject: [PATCH] hashi_vault: fix multiple spaces in params (#51524) Fixes param parsing in hashi_vault Signed-off-by: Abhijeet Kasurde --- lib/ansible/plugins/lookup/hashi_vault.py | 4 ++-- .../lookup_hashi_vault/tasks/token_test.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ansible/plugins/lookup/hashi_vault.py b/lib/ansible/plugins/lookup/hashi_vault.py index b58280cc463..1071b13d6af 100644 --- a/lib/ansible/plugins/lookup/hashi_vault.py +++ b/lib/ansible/plugins/lookup/hashi_vault.py @@ -252,11 +252,11 @@ class HashiVault: class LookupModule(LookupBase): - def run(self, terms, variables, **kwargs): + def run(self, terms, variables=None, **kwargs): if not HAS_HVAC: raise AnsibleError("Please pip install hvac to use the hashi_vault lookup module.") - vault_args = terms[0].split(' ') + vault_args = terms[0].split() vault_dict = {} ret = [] diff --git a/test/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/token_test.yml b/test/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/token_test.yml index 1f4828e5a3a..927881da898 100644 --- a/test/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/token_test.yml +++ b/test/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/token_test.yml @@ -5,11 +5,12 @@ set_fact: secret1: "{{ lookup('hashi_vault', conn_params ~ 'secret=' ~ vault_base_path ~ '/secret1 auth_method=token token=' ~ user_token) }}" secret2: "{{ lookup('hashi_vault', conn_params ~ 'secret=' ~ vault_base_path ~ '/secret2 token=' ~ user_token) }}" + secret3: "{{ lookup('hashi_vault', conn_params ~ ' secret=' ~ vault_base_path ~ '/secret2 token=' ~ user_token) }}" - name: 'Check secret values' fail: msg: 'unexpected secret values' - when: secret1['data']['value'] != 'foo1' or secret2['data']['value'] != 'foo2' + when: secret1['data']['value'] != 'foo1' or secret2['data']['value'] != 'foo2' or secret3['data']['value'] != 'foo2' - name: 'Failure expected when erroneous credentials are used' vars: