From 2a660e73655c7d9cd739ac4e115f3aa9c125fa06 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 25 Jun 2021 15:50:10 +0200
Subject: [PATCH] automember: Fail on wrong in/ex/clusive parameter names
The parameters in the inclusive and exclusive dicts are not defined and
also not checked. Therefore it is possible to have parameters in the
dicts that are not used.
The dicts for the inclusive and exclusive parameters are now defined and
also added to the description.
---
plugins/modules/ipaautomember.py | 34 +++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/plugins/modules/ipaautomember.py b/plugins/modules/ipaautomember.py
index bef175fd..9f3fc9b3 100644
--- a/plugins/modules/ipaautomember.py
+++ b/plugins/modules/ipaautomember.py
@@ -66,11 +66,29 @@ options:
type: list
elements: dict
aliases: ["automemberexclusiveregex"]
+ options:
+ key:
+ description: The attribute of the regex
+ type: str
+ required: true
+ expression:
+ description: The expression of the regex
+ type: str
+ required: true
inclusive:
description: List of dictionaries containing the attribute and expression.
type: list
elements: dict
aliases: ["automemberinclusiveregex"]
+ options:
+ key:
+ description: The attribute of the regex
+ type: str
+ required: true
+ expression:
+ description: The expression of the regex
+ type: str
+ required: true
action:
description: Work on service or member level
default: service
@@ -174,10 +192,20 @@ def main():
ipaadmin_principal=dict(type="str", default="admin"),
ipaadmin_password=dict(type="str", required=False, no_log=True),
- inclusive=dict(type="list", aliases=[
- "automemberinclusiveregex"], default=None),
+ inclusive=dict(type="list",
+ aliases=["automemberinclusiveregex"], default=None,
+ options=dict(
+ key=dict(type="str", required=True),
+ expression=dict(type="str", required=True)
+ ),
+ elements="dict", required=False),
exclusive=dict(type="list", aliases=[
- "automemberexclusiveregex"], default=None),
+ "automemberexclusiveregex"], default=None,
+ options=dict(
+ key=dict(type="str", required=True),
+ expression=dict(type="str", required=True)
+ ),
+ elements="dict", required=False),
name=dict(type="list", aliases=["cn"],
default=None, required=True),
description=dict(type="str", default=None),
--
GitLab