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

Bug fixes for username and delete data

Browse Source
This commit is contained in:
John Westcott IV
2020-01-29 11:50:56 -05:00
committed by beeankha
parent 89e92bd337
commit 6d90cac3f9
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx_collection/plugins/module_utils/tower_api.py
View File

@@ -357,12 +357,18 @@ class TowerModule(AnsibleModule):
# If we have an item, we can try to delete it # If we have an item, we can try to delete it
try: try:
item_url = existing_item['url'] item_url = existing_item['url']
item_name = existing_item['name'] item_type = existing_item['type']
item_type = existing_item['url']
item_id = existing_item['id'] item_id = existing_item['id']
except KeyError as ke: except KeyError as ke:
self.fail_json(msg="Unable to process delete of item due to missing data {0}".format(ke)) self.fail_json(msg="Unable to process delete of item due to missing data {0}".format(ke))
if 'name' in existing_item:
item_name = existing_item['name']
elif 'username' in existing_item:
item_name = existing_item['username']
else:
self.fail_json(msg="Unable to process delete of {} due to missing name".format(item_type))
response = self.delete_endpoint(item_url) response = self.delete_endpoint(item_url)
if not handle_response: if not handle_response:
@@ -423,7 +429,12 @@ class TowerModule(AnsibleModule):
if not handle_response: if not handle_response:
return response return response
elif response['status_code'] == 201: elif response['status_code'] == 201:
self.json_output['name'] = response['json']['name'] self.json_output['name'] = 'unknown'
if 'name' in response['json']:
self.json_output['name'] = response['json']['name']
elif 'username' in response['json']:
# User objects return username instead of name
self.json_output['name'] = response['json']['username']
self.json_output['id'] = response['json']['id'] self.json_output['id'] = response['json']['id']
self.json_output['changed'] = True self.json_output['changed'] = True
if on_create is None: if on_create is None: