mirror of
https://github.com/LIV2/ansible-modules-hashivault.git
synced 2025-12-06 06:32:48 +00:00
Fix root rotation statements in connection details
This commit is contained in:
parent
357ce417a8
commit
2af0b1880d
@ -47,6 +47,7 @@ options:
|
||||
- Specifies the database statements to be executed to rotate the root user's credentials. See the plugin's
|
||||
API page for more information on support and formatting for this parameter.
|
||||
default: []
|
||||
aliases: [ root_rotation_statements ]
|
||||
password_policy:
|
||||
description:
|
||||
- The name of the password policy to use when generating passwords for this database. If not specified,
|
||||
@ -82,7 +83,7 @@ def main():
|
||||
argspec['config_file'] = dict(required=False, type='str', default=None)
|
||||
argspec['plugin_name'] = dict(required=False, type='str')
|
||||
argspec['allowed_roles'] = dict(required=False, type='list', default=[])
|
||||
argspec['root_credentials_rotate_statements'] = dict(required=False, type='list', default=[])
|
||||
argspec['root_credentials_rotate_statements'] = dict(required=False, type='list', aliases=['root_rotation_statements'], default=[])
|
||||
argspec['verify_connection'] = dict(required=False, type='bool', default=True)
|
||||
argspec['connection_details'] = dict(required=True, type='dict')
|
||||
argspec['password_policy'] = dict(required=False, type='str')
|
||||
@ -115,14 +116,14 @@ def hashivault_db_secret_engine_config(module):
|
||||
desired_state['allowed_roles'] = params.get('allowed_roles')
|
||||
desired_state['verify_connection'] = params.get('verify_connection')
|
||||
desired_state['password_policy'] = params.get('password_policy')
|
||||
desired_state['root_credentials_rotate_statements'] = params.get('root_credentials_rotate_statements')
|
||||
desired_state['root_rotation_statements'] = params.get('root_credentials_rotate_statements')
|
||||
connection_details = params.get('connection_details')
|
||||
desired_state.update(connection_details)
|
||||
del connection_details["password"]
|
||||
|
||||
# not a required param but must ensure a value for current vs desired object comparison
|
||||
if 'root_credentials_rotate_statements' not in desired_state:
|
||||
desired_state['root_credentials_rotate_statements'] = []
|
||||
if 'root_rotation_statements' not in desired_state:
|
||||
desired_state['root_rotation_statements'] = []
|
||||
|
||||
exists = False
|
||||
current_state = {}
|
||||
@ -145,9 +146,11 @@ def hashivault_db_secret_engine_config(module):
|
||||
changed = True
|
||||
if v['connection_url'] != desired_state['connection_url']:
|
||||
changed = True
|
||||
else:
|
||||
if v != desired_state[k]:
|
||||
elif k == 'root_credentials_rotate_statements':
|
||||
if v != desired_state['root_rotation_statements']:
|
||||
changed = True
|
||||
elif v != desired_state[k]:
|
||||
changed = True
|
||||
elif state == 'present':
|
||||
changed = True
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user