From 75642506143232e6b2202b9a8c293a15f28d4b16 Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 30 Sep 2021 21:15:19 -0300
Subject: [PATCH] hbacrule: Use IPAAnsibleModule method to validate arguments.
Use the IPAAnsibleModule.params_fail_if_used method to validate
arguments provided by user.
---
plugins/modules/ipahbacrule.py | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/plugins/modules/ipahbacrule.py b/plugins/modules/ipahbacrule.py
index 1d6a3b2f..3547b95a 100644
--- a/plugins/modules/ipahbacrule.py
+++ b/plugins/modules/ipahbacrule.py
@@ -247,6 +247,8 @@ def main():
# Check parameters
+ invalid = []
+
if state == "present":
if len(names) != 1:
ansible_module.fail_json(
@@ -254,11 +256,6 @@ def main():
if action == "member":
invalid = ["description", "usercategory", "hostcategory",
"servicecategory", "nomembers"]
- for x in invalid:
- if vars()[x] is not None:
- ansible_module.fail_json(
- msg="Argument '%s' can not be used with action "
- "'%s'" % (x, action))
else:
if hostcategory == 'all' and any([host, hostgroup]):
ansible_module.fail_json(
@@ -278,11 +275,6 @@ def main():
if action == "hbacrule":
invalid.extend(["host", "hostgroup", "hbacsvc", "hbacsvcgroup",
"user", "group"])
- for x in invalid:
- if vars()[x] is not None:
- ansible_module.fail_json(
- msg="Argument '%s' can not be used with state '%s'" %
- (x, state))
elif state in ["enabled", "disabled"]:
if len(names) < 1:
@@ -294,14 +286,11 @@ def main():
invalid = ["description", "usercategory", "hostcategory",
"servicecategory", "nomembers", "host", "hostgroup",
"hbacsvc", "hbacsvcgroup", "user", "group"]
- for x in invalid:
- if vars()[x] is not None:
- ansible_module.fail_json(
- msg="Argument '%s' can not be used with state '%s'" %
- (x, state))
else:
ansible_module.fail_json(msg="Invalid state '%s'" % state)
+ ansible_module.params_fail_used_invalid(invalid, state, action)
+
# Init
changed = False
--
GitLab