internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 11:54:47 +00:00
Code Issues Projects Releases Wiki Activity

sudocmdgroup: Reduce addition and deletion of members to changed only

Browse Source 
Use gen_add_list and gen_intersection_list for sudocmd member handling,
to reduce the add lists to only the new and del lists only to existing
entries.

This enables to remove the ignores for "already a member" and
"not a member" errors.
This commit is contained in:
Rafael Guterres Jeffman
2021-09-14 10:39:47 -03:00
parent ae2f452c60
commit 8723aafd4f
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/modules/ipasudocmdgroup.py
View File

@@ -100,7 +100,8 @@ RETURN = """
""" """
from ansible.module_utils.ansible_freeipa_module import \ from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, ipalib_errors IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \
gen_add_list, gen_intersection_list, ipalib_errors
def find_sudocmdgroup(module, name): def find_sudocmdgroup(module, name):
@@ -255,10 +256,12 @@ def main():
ansible_module.fail_json( ansible_module.fail_json(
msg="No sudocmdgroup '%s'" % name) msg="No sudocmdgroup '%s'" % name)
# Ensure members are present sudocmd = gen_add_list(
commands.append([name, "sudocmdgroup_add_member", sudocmd, res_find.get("member_sudocmd") or [])
{"sudocmd": sudocmd} if sudocmd:
]) commands.append([name, "sudocmdgroup_add_member",
{"sudocmd": sudocmd}
])
elif state == "absent": elif state == "absent":
if action == "sudocmdgroup": if action == "sudocmdgroup":
if res_find is not None: if res_find is not None:
@@ -270,9 +273,12 @@ def main():
msg="No sudocmdgroup '%s'" % name) msg="No sudocmdgroup '%s'" % name)
# Ensure members are absent # Ensure members are absent
commands.append([name, "sudocmdgroup_remove_member", sudocmd = gen_intersection_list(
{"sudocmd": sudocmd} sudocmd, res_find.get("member_sudocmd") or [])
]) if sudocmd:
commands.append([name, "sudocmdgroup_remove_member",
{"sudocmd": sudocmd}
])
else: else:
ansible_module.fail_json(msg="Unkown state '%s'" % state) ansible_module.fail_json(msg="Unkown state '%s'" % state)
@@ -303,10 +309,8 @@ def main():
failed = result["failed"]["member"] failed = result["failed"]["member"]
for member_type in failed: for member_type in failed:
for member, failure in failed[member_type]: for member, failure in failed[member_type]:
if "already a member" not in failure \ errors.append("%s: %s %s: %s" % (
and "not a member" not in failure: command, member_type, member, failure))
errors.append("%s: %s %s: %s" % (
command, member_type, member, failure))
if len(errors) > 0: if len(errors) > 0:
ansible_module.fail_json(msg=", ".join(errors)) ansible_module.fail_json(msg=", ".join(errors))