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

Prioritize integer names over IDs more effectively

Browse Source
This commit is contained in:
beeankha
2020-08-21 15:03:30 -04:00
parent 54317236f3
commit 75a0c0ab1e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,11 +126,21 @@ class TowerAPIModule(TowerModule):
if response['json']['count'] == 1: if response['json']['count'] == 1:
return response['json']['results'][0] return response['json']['results'][0]
elif response['json']['count'] == 2: elif response['json']['count'] > 1:
object_to_return = None
for tower_object in response['json']['results']: for tower_object in response['json']['results']:
if tower_object['name'] == name_or_id: # Name takes priority, so we match on name first
return tower_object # If we already have an object to return and it has the right name, we need to fail
# We shouldn't get here because we found 2 objects and ID has to be unique, so one of the objects must have a matching name if object_to_return and object_to_return['name'] == name_or_id:
self.fail_json(msg="The requested name or id was ambiguous and resulted in too many items")
# If we found an object ID with this name (which has to be unique) and we don't already have
# something to return, select this object for now
elif tower_object['id'] == name_or_id and not object_to_return:
object_to_return = tower_object
# Otherwise this is the first named object we found, so record that as what to return
else:
object_to_return = tower_object
return object_to_return
elif response['json']['count'] == 0: elif response['json']['count'] == 0:
self.fail_json(msg="The {0} {1} was not found on the Tower server".format(endpoint, name_or_id)) self.fail_json(msg="The {0} {1} was not found on the Tower server".format(endpoint, name_or_id))
else: else: