From 14c9f308d869275ad67bd9ab4c5bfa6ac549ff0c Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 30 Sep 2021 21:19:33 -0300
Subject: [PATCH] sudocmdgroup: Use IPAAnsibleModule method to validate
arguments.
Use the IPAAnsibleModule.params_fail_if_used method to validate
arguments provided by user.
---
plugins/modules/ipasudocmdgroup.py | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/plugins/modules/ipasudocmdgroup.py b/plugins/modules/ipasudocmdgroup.py
index e260b699..42f29fb8 100644
--- a/plugins/modules/ipasudocmdgroup.py
+++ b/plugins/modules/ipasudocmdgroup.py
@@ -168,6 +168,7 @@ def main():
state = ansible_module.params_get("state")
# Check parameters
+ invalid = []
if state == "present":
if len(names) != 1:
@@ -175,11 +176,6 @@ def main():
msg="Only one sudocmdgroup can be added at a time.")
if action == "member":
invalid = ["description", "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))
if state == "absent":
if len(names) < 1:
@@ -188,11 +184,8 @@ def main():
invalid = ["description", "nomembers"]
if action == "sudocmdgroup":
invalid.extend(["sudocmd"])
- 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))
+
+ ansible_module.params_fail_used_invalid(invalid, state, action)
# Init
--
GitLab