internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-25 00:44:42 +00:00
Code Issues Projects Releases Wiki Activity

utils/templates: Use ipalib_errors.NotFound instead of Exception

Browse Source 
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.
This commit is contained in:
Rafael Guterres Jeffman
2024-12-02 23:26:08 -03:00
parent 1c4b50fa51
commit 5abb515c92
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/templates/ipamodule+member.py.in
View File

@@ -113,7 +113,7 @@ 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, gen_add_list, \ 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 from ansible.module_utils import six
if six.PY3: if six.PY3:
@@ -124,7 +124,7 @@ def find_$name(module, name):
"""Find if a $name with the given name already exist.""" """Find if a $name with the given name already exist."""
try: try:
_result = module.ipa_command("$name_show", name, {"all": True}) _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. # An exception is raised if $name name is not found.
return None return None
return _result["result"] return _result["result"]

4
utils/templates/ipamodule.py.in
View File

@@ -89,7 +89,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \ from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa IPAAnsibleModule, compare_args_ipa, ipalib_errors
from ansible.module_utils import six from ansible.module_utils import six
if six.PY3: if six.PY3:
@@ -100,7 +100,7 @@ def find_$name(module, name):
"""Find if a $name with the given name already exist.""" """Find if a $name with the given name already exist."""
try: try:
_result = module.ipa_command("$name_show", name, {"all": True}) _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. # An exception is raised if $name name is not found.
return None return None
return _result["result"] return _result["result"]