External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Materialize label page after getting 204 code (#14010)

Browse Source
This commit is contained in:
Alan Rominger
2023-05-16 16:12:18 -04:00
committed by GitHub
parent fa05f55512
commit 433c28caa8
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awxkit/awxkit/api/pages/api.py
View File

@@ -288,7 +288,18 @@ class ApiV2(base.Base):
if asset['natural_key']['type'] == 'user': if asset['natural_key']['type'] == 'user':
# We should only impose a default password if the resource doesn't exist. # We should only impose a default password if the resource doesn't exist.
post_data.setdefault('password', 'abc123') post_data.setdefault('password', 'abc123')
_page = endpoint.post(post_data) try:
_page = endpoint.post(post_data)
except exc.NoContent:
# desired exception under some circumstances, e.g. labels that already exist
if _page is None and 'name' in post_data:
results = endpoint.get(all_pages=True).results
for item in results:
if item['name'] == post_data['name']:
_page = item.get()
break
else:
raise
changed = True changed = True
if asset['natural_key']['type'] == 'project': if asset['natural_key']['type'] == 'project':
# When creating a project, we need to wait for its # When creating a project, we need to wait for its
@@ -308,8 +319,6 @@ class ApiV2(base.Base):
_page = _page.put(post_data) _page = _page.put(post_data)
changed = True changed = True
except exc.NoContent: # desired exception under some circumstances, e.g. labels that already exist
pass
except (exc.Common, AssertionError) as e: except (exc.Common, AssertionError) as e:
identifier = asset.get("name", None) or asset.get("username", None) or asset.get("hostname", None) identifier = asset.get("name", None) or asset.get("username", None) or asset.get("hostname", None)
log.error(f'{endpoint} "{identifier}": {e}.') log.error(f'{endpoint} "{identifier}": {e}.')