Skip to content
Snippets Groups Projects
Unverified Commit 5302dda0 authored by Rafael Guterres Jeffman's avatar Rafael Guterres Jeffman Committed by GitHub
Browse files

Merge pull request #583 from t-woerner/fix_automember_invalid_in_exclusive_parameters

automember: Fail on wrong in/ex/clusive parameter names
parents c75b0292 2a660e73
No related branches found
No related tags found
No related merge requests found
...@@ -66,11 +66,29 @@ options: ...@@ -66,11 +66,29 @@ options:
type: list type: list
elements: dict elements: dict
aliases: ["automemberexclusiveregex"] 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: inclusive:
description: List of dictionaries containing the attribute and expression. description: List of dictionaries containing the attribute and expression.
type: list type: list
elements: dict elements: dict
aliases: ["automemberinclusiveregex"] 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: action:
description: Work on service or member level description: Work on service or member level
default: service default: service
...@@ -174,10 +192,20 @@ def main(): ...@@ -174,10 +192,20 @@ def main():
ipaadmin_principal=dict(type="str", default="admin"), ipaadmin_principal=dict(type="str", default="admin"),
ipaadmin_password=dict(type="str", required=False, no_log=True), ipaadmin_password=dict(type="str", required=False, no_log=True),
inclusive=dict(type="list", aliases=[ inclusive=dict(type="list",
"automemberinclusiveregex"], default=None), 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=[ 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"], name=dict(type="list", aliases=["cn"],
default=None, required=True), default=None, required=True),
description=dict(type="str", default=None), description=dict(type="str", default=None),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment