fix(plugins/modules/ipa*): adjust according to upstream ci/cd errors

Author: NavidSassan

plugins/module_utils/ipa_diff.py

@@ -28,7 +28,7 @@ def _compare_key(arg, ipa_arg):
     return arg == ipa_arg
 
 
-class IPADiffTracker:
+class IPADiffTracker(object):
     """Track before/after state for Ansible --diff output."""
 
     def __init__(self):

plugins/modules/ipagroup.py

@@ -1081,8 +1081,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipahbacrule.py

@@ -652,8 +652,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipahostgroup.py

@@ -560,8 +560,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipapwpolicy.py

@@ -419,8 +419,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipasudocmd.py

@@ -190,8 +190,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipasudocmdgroup.py

@@ -330,8 +330,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipasudorule.py

@@ -1224,8 +1224,8 @@ def main():
 
     # Done
 
-    ansible_module.exit_json(changed=changed, **diff_tracker.build_diff(),
-                             **exit_args)
+    _exit_kwargs = dict(exit_args, **diff_tracker.build_diff())
+    ansible_module.exit_json(changed=changed, **_exit_kwargs)
 
 
 if __name__ == "__main__":

plugins/modules/ipauser.py

@@ -1880,8 +1880,8 @@ def main():
             exit_args=exit_args, single_user=users is None)
 
     # Done
-    ansible_module.exit_json(changed=changed, user=exit_args,
-                             **diff_tracker.build_diff())
+    _exit_kwargs = diff_tracker.build_diff()
+    ansible_module.exit_json(changed=changed, user=exit_args, **_exit_kwargs)
 
 
 if __name__ == "__main__":