External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9295 from jainnikhil30/add_diff_support

Browse Source 
add support for diff mode in tower_settings module

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-02-15 16:52:32 +00:00
committed by GitHub
parent 67f1f9ac69 3ad2bb1bb9
commit 8bcc91518e
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx_collection/plugins/modules/tower_settings.py
View File

@@ -133,7 +133,7 @@ def main():
existing_settings = module.get_endpoint('settings/all')['json'] existing_settings = module.get_endpoint('settings/all')['json']
# Begin a json response # Begin a json response
json_response = {'changed': False, 'old_values': {}} json_output = {'changed': False, 'old_values': {}, 'new_values': {}}
# Check any of the settings to see if anything needs to be updated # Check any of the settings to see if anything needs to be updated
needs_update = False needs_update = False
@@ -141,18 +141,29 @@ def main():
if a_setting not in existing_settings or existing_settings[a_setting] != new_settings[a_setting]: if a_setting not in existing_settings or existing_settings[a_setting] != new_settings[a_setting]:
# At least one thing is different so we need to patch # At least one thing is different so we need to patch
needs_update = True needs_update = True
json_response['old_values'][a_setting] = existing_settings[a_setting] json_output['old_values'][a_setting] = existing_settings[a_setting]
json_output['new_values'][a_setting] = new_settings[a_setting]
if module._diff:
json_output['diff'] = {
'before': json_output['old_values'],
'after': json_output['new_values']
}
# If nothing needs an update we can simply exit with the response (as not changed) # If nothing needs an update we can simply exit with the response (as not changed)
if not needs_update: if not needs_update:
module.exit_json(**json_response) module.exit_json(**json_output)
if module.check_mode and module._diff:
json_output['changed'] = True
module.exit_json(**json_output)
# Make the call to update the settings # Make the call to update the settings
response = module.patch_endpoint('settings/all', **{'data': new_settings}) response = module.patch_endpoint('settings/all', **{'data': new_settings})
if response['status_code'] == 200: if response['status_code'] == 200:
# Set the changed response to True # Set the changed response to True
json_response['changed'] = True json_output['changed'] = True
# To deal with the old style values we need to return 'value' in the response # To deal with the old style values we need to return 'value' in the response
new_values = {} new_values = {}
@@ -161,11 +172,11 @@ def main():
# If we were using a name we will just add a value of a string, otherwise we will return an array in values # If we were using a name we will just add a value of a string, otherwise we will return an array in values
if name is not None: if name is not None:
json_response['value'] = new_values[name] json_output['value'] = new_values[name]
else: else:
json_response['values'] = new_values json_output['values'] = new_values
module.exit_json(**json_response) module.exit_json(**json_output)
elif 'json' in response and '__all__' in response['json']: elif 'json' in response and '__all__' in response['json']:
module.fail_json(msg=response['json']['__all__']) module.fail_json(msg=response['json']['__all__'])
else: else: