From 23e38fae27f9dbe79497cc8030751d0dbf194c88 Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 30 Sep 2021 21:12:03 -0300
Subject: [PATCH] automember: Use IPAAnsibleModule method to validate
arguments.
Use the IPAAnsibleModule.params_fail_if_used method to validate
arguments provided by user.
---
plugins/modules/ipaautomember.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/plugins/modules/ipaautomember.py b/plugins/modules/ipaautomember.py
index 9a93cd23..7230ea57 100644
--- a/plugins/modules/ipaautomember.py
+++ b/plugins/modules/ipaautomember.py
@@ -245,12 +245,17 @@ def main():
rebuild_users = ansible_module.params_get("users")
rebuild_hosts = ansible_module.params_get("hosts")
- if (rebuild_hosts or rebuild_users) and state != "rebuild":
- ansible_module.fail_json(
- msg="'hosts' and 'users' are only valid with state: rebuild")
- if not automember_type and state != "rebuild":
- ansible_module.fail_json(
- msg="'automember_type' is required unless state: rebuild")
+ # Check parameters
+ invalid = []
+
+ if state != "rebuild":
+ invalid = ["rebuild_hosts", "rebuild_users"]
+
+ if not automember_type and state != "rebuild":
+ ansible_module.fail_json(
+ msg="'automember_type' is required unless state: rebuild")
+
+ ansible_module.params_fail_used_invalid(invalid, state, action)
# Init
changed = False
--
GitLab