mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Return all elements in a more robust way
If a trailing ':' is set or not, always return all secrets from a path. This was a bug mostly fixed by this PR. Update examples.
This commit is contained in:
parent
6b6746dcee
commit
6a6ea663ea
1 changed files with 16 additions and 10 deletions
|
@ -47,18 +47,24 @@ DOCUMENTATION = """
|
||||||
"""
|
"""
|
||||||
|
|
||||||
EXAMPLES = """
|
EXAMPLES = """
|
||||||
- debug: msg="{{ lookup('hashi_vault', 'secret=secret/hello:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
|
- debug:
|
||||||
|
msg: "{{ lookup('hashi_vault', 'secret=secret/hello:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
|
||||||
|
|
||||||
- debug: msg="{{ lookup('hashi_vault', 'secret=secret/hello-object token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
|
- name: Return all secrets from a path
|
||||||
|
debug:
|
||||||
|
msg: "{{ lookup('hashi_vault', 'secret=secret/hello token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
|
||||||
|
|
||||||
- name: Vault that requires authentication via ldap
|
- name: Vault that requires authentication via LDAP
|
||||||
debug: msg="{{ lookup('hashi_vault', 'secret=secret/hello:value auth_method=ldap mount_point=ldap username=myuser password=mypas url=http://myvault:8200')}}"
|
debug:
|
||||||
|
msg: "{{ lookup('hashi_vault', 'secret=secret/hello:value auth_method=ldap mount_point=ldap username=myuser password=mypas url=http://myvault:8200')}}"
|
||||||
|
|
||||||
- name: Using an ssl vault
|
- name: Using an ssl vault
|
||||||
debug: msg="{{ lookup('hashi_vault', 'secret=secret/hola:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=https://myvault:8200 validate_certs=False')}}"
|
debug:
|
||||||
|
msg: "{{ lookup('hashi_vault', 'secret=secret/hola:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=https://myvault:8200 validate_certs=False')}}"
|
||||||
|
|
||||||
- name: using certificate auth
|
- name: using certificate auth
|
||||||
debug: msg="{{ lookup('hashi_vault', 'secret=secret/hi:value token=xxxx-xxx-xxx url=https://myvault:8200 validate_certs=True cacert=/cacert/path/ca.pem')}}"
|
debug:
|
||||||
|
msg: "{{ lookup('hashi_vault', 'secret=secret/hi:value token=xxxx-xxx-xxx url=https://myvault:8200 validate_certs=True cacert=/cacert/path/ca.pem')}}"
|
||||||
"""
|
"""
|
||||||
|
|
||||||
RETURN = """
|
RETURN = """
|
||||||
|
@ -102,10 +108,10 @@ class HashiVault:
|
||||||
if len(s_f) >= 2:
|
if len(s_f) >= 2:
|
||||||
self.secret_field = s_f[1]
|
self.secret_field = s_f[1]
|
||||||
else:
|
else:
|
||||||
self.secret_field = 'ALL_OBJECT_ELEMENTS'
|
self.secret_field = ''
|
||||||
|
|
||||||
# if a particular backend is asked for (and its method exists) we call it, otherwise drop through to using
|
# If a particular backend is asked for (and its method exists) we call it, otherwise drop through to using
|
||||||
# token auth. this means if a particular auth backend is requested and a token is also given, then we
|
# token auth. This means if a particular auth backend is requested and a token is also given, then we
|
||||||
# ignore the token and attempt authentication against the specified backend.
|
# ignore the token and attempt authentication against the specified backend.
|
||||||
#
|
#
|
||||||
# to enable a new auth backend, simply add a new 'def auth_<type>' method below.
|
# to enable a new auth backend, simply add a new 'def auth_<type>' method below.
|
||||||
|
@ -145,7 +151,7 @@ class HashiVault:
|
||||||
if data is None:
|
if data is None:
|
||||||
raise AnsibleError("The secret %s doesn't seem to exist for hashi_vault lookup" % self.secret)
|
raise AnsibleError("The secret %s doesn't seem to exist for hashi_vault lookup" % self.secret)
|
||||||
|
|
||||||
if self.secret_field == 'ALL_OBJECT_ELEMENTS': # secret was specified without trailing ':'
|
if self.secret_field == '':
|
||||||
return data['data']
|
return data['data']
|
||||||
|
|
||||||
if self.secret_field not in data['data']:
|
if self.secret_field not in data['data']:
|
||||||
|
|
Loading…
Reference in a new issue