internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-05-08 22:34:26 +00:00
Code Issues Projects Releases Wiki Activity

automember: Fix result["failed"] issues with conditions

Browse Source 
result["failed"] is used only for INCLUDE_RE, EXCLUDE_RE if entries could
not be added that are already there and it entries could not be removed
that are not there.

All other issues like invalid attributes etc. are handled as exceptions.
Therefore the error section is not here as in other modules.

Fixes RHBZ#1979626
This commit is contained in:
Thomas Woerner
2021-07-08 15:40:50 +02:00
parent 32f4e08397
commit 032c41f89e
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/modules/ipaautomember.py
View File

@@ -385,7 +385,6 @@ def main():
if ansible_module.check_mode: if ansible_module.check_mode:
ansible_module.exit_json(changed=len(commands) > 0, **exit_args) ansible_module.exit_json(changed=len(commands) > 0, **exit_args)
errors = []
for name, command, args in commands: for name, command, args in commands:
try: try:
if name is None: if name is None:
@@ -402,16 +401,13 @@ def main():
except Exception as ex: except Exception as ex:
ansible_module.fail_json(msg="%s: %s: %s" % (command, name, ansible_module.fail_json(msg="%s: %s: %s" % (command, name,
str(ex))) str(ex)))
# Get all errors
if "failed" in result and len(result["failed"]) > 0: # result["failed"] is used only for INCLUDE_RE, EXCLUDE_RE
for item in result["failed"]: # if entries could not be added that are already there and
failed_item = result["failed"][item] # it entries could not be removed that are not there.
for member_type in failed_item: # All other issues like invalid attributes etc. are handled
for member, failure in failed_item[member_type]: # as exceptions. Therefore the error section is not here as
errors.append("%s: %s %s: %s" % ( # in other modules.
command, member_type, member, failure))
if len(errors) > 0:
ansible_module.fail_json(msg=", ".join(errors))
except Exception as e: except Exception as e:
ansible_module.fail_json(msg=str(e)) ansible_module.fail_json(msg=str(e))