From 5abb515c92f361892994b638ecde150ffb34e82a Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Mon, 2 Dec 2024 23:26:08 -0300 Subject: [PATCH] utils/templates: Use ipalib_errors.NotFound instead of Exception Modify the plugin templates so that the code generated does not hide errors when querying IPA wih *_show command by handlig only the exeption where an object is not found. --- utils/templates/ipamodule+member.py.in | 4 ++-- utils/templates/ipamodule.py.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/templates/ipamodule+member.py.in b/utils/templates/ipamodule+member.py.in index daa7fdd49b..714c0d7eb1 100644 --- a/utils/templates/ipamodule+member.py.in +++ b/utils/templates/ipamodule+member.py.in @@ -113,7 +113,7 @@ RETURN = """ from ansible.module_utils.ansible_freeipa_module import \ IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \ - gen_intersection_list + gen_intersection_list, ipalib_errors from ansible.module_utils import six if six.PY3: @@ -124,7 +124,7 @@ def find_$name(module, name): """Find if a $name with the given name already exist.""" try: _result = module.ipa_command("$name_show", name, {"all": True}) - except Exception: # pylint: disable=broad-except + except ipalib_errors.NotFound: # An exception is raised if $name name is not found. return None return _result["result"] diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in index 0dc282dd6b..afb119a8a8 100644 --- a/utils/templates/ipamodule.py.in +++ b/utils/templates/ipamodule.py.in @@ -89,7 +89,7 @@ RETURN = """ from ansible.module_utils.ansible_freeipa_module import \ - IPAAnsibleModule, compare_args_ipa + IPAAnsibleModule, compare_args_ipa, ipalib_errors from ansible.module_utils import six if six.PY3: @@ -100,7 +100,7 @@ def find_$name(module, name): """Find if a $name with the given name already exist.""" try: _result = module.ipa_command("$name_show", name, {"all": True}) - except Exception: # pylint: disable=broad-except + except ipalib_errors.NotFound: # An exception is raised if $name name is not found. return None return _result["result"]