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

bugfix collection role module target_teams and instance_groups options (#14119)

Browse Source
This commit is contained in:
Sean Sullivan
2023-06-14 13:53:24 -04:00
committed by GitHub
parent 4b4b73c02a
commit a47bbb5479
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx_collection/plugins/modules/role.py
View File

@@ -245,12 +245,11 @@ def main():
resources.setdefault(resource_group, []).append(module.params.get(old_name)) resources.setdefault(resource_group, []).append(module.params.get(old_name))
if module.params.get('lookup_organization') is not None: if module.params.get('lookup_organization') is not None:
resources['lookup_organization'] = module.params.get('lookup_organization') resources['lookup_organization'] = module.params.get('lookup_organization')
if module.params.get('instance_groups') is not None:
# Change workflows and target_teams key to its endpoint name. resources['instance_groups'] = module.params.get('instance_groups')
# Change workflows to its endpoint name.
if 'workflows' in resources: if 'workflows' in resources:
resources['workflow_job_templates'] = resources.pop('workflows') resources['workflow_job_templates'] = resources.pop('workflows')
if 'target_teams' in resources:
resources['teams'] = resources.pop('target_teams')
# Set lookup data to use # Set lookup data to use
lookup_data = {} lookup_data = {}
@@ -267,17 +266,21 @@ def main():
for key, value in resources.items(): for key, value in resources.items():
for resource in value: for resource in value:
# Attempt to look up project based on the provided name or ID and lookup data # Attempt to look up project based on the provided name or ID and lookup data
if key in resources: lookup_key = key
if key == 'organizations' or key == 'users': if key == 'organizations' or key == 'users':
lookup_data_populated = {} lookup_data_populated = {}
else: else:
lookup_data_populated = lookup_data lookup_data_populated = lookup_data
data = module.get_one(key, name_or_id=resource, data=lookup_data_populated) if key == 'target_teams':
lookup_key = 'teams'
data = module.get_one(lookup_key, name_or_id=resource, data=lookup_data_populated)
if data is None: if data is None:
missing_items.append(resource) missing_items.append(resource)
else: else:
if key == 'users' or key == 'teams': if key == 'users' or key == 'teams':
actor_data.setdefault(key, []).append(data) actor_data.setdefault(key, []).append(data)
elif key == 'target_teams':
resource_data.setdefault('teams', []).append(data)
else: else:
resource_data.setdefault(key, []).append(data) resource_data.setdefault(key, []).append(data)
if len(missing_items) > 0: if len(missing_items) > 0:

1
awx_collection/tests/integration/targets/role/tasks/main.yml
View File

@@ -198,7 +198,6 @@
- name: Add Joe to workflow approve role - name: Add Joe to workflow approve role
role: role:
user: "{{ username }}"
users: users:
- "{{ username }}2" - "{{ username }}2"
role: approval role: approval