From 7753fa42192ff3b7e1ec57501644b087e6870ac0 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 08:09:21 +0200 Subject: [PATCH] 1085 updating the hcl whitelist to include all supported options (#2495) (#2528) * 1085 updating the hcl whitelist to include all supported options * Update changelogs/fragments/1085-consul-acl-hcl-whitelist-update.yml Co-authored-by: Felix Fontein Co-authored-by: Dillon Gilmore Co-authored-by: Felix Fontein (cherry picked from commit 5b7751530819ce066f8edf899ef3ecd2d7791e6d) Co-authored-by: iridian <442359+iridian-ks@users.noreply.github.com> --- .../1085-consul-acl-hcl-whitelist-update.yml | 2 ++ .../modules/clustering/consul/consul_acl.py | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/1085-consul-acl-hcl-whitelist-update.yml diff --git a/changelogs/fragments/1085-consul-acl-hcl-whitelist-update.yml b/changelogs/fragments/1085-consul-acl-hcl-whitelist-update.yml new file mode 100644 index 0000000000..78db43da7d --- /dev/null +++ b/changelogs/fragments/1085-consul-acl-hcl-whitelist-update.yml @@ -0,0 +1,2 @@ +bugfixes: + - consul_acl - update the hcl allowlist to include all supported options (https://github.com/ansible-collections/community.general/pull/2495). diff --git a/plugins/modules/clustering/consul/consul_acl.py b/plugins/modules/clustering/consul/consul_acl.py index cb5395ed31..5a37ca0eb9 100644 --- a/plugins/modules/clustering/consul/consul_acl.py +++ b/plugins/modules/clustering/consul/consul_acl.py @@ -189,7 +189,24 @@ from collections import defaultdict from ansible.module_utils.basic import to_text, AnsibleModule -RULE_SCOPES = ["agent", "event", "key", "keyring", "node", "operator", "query", "service", "session"] +RULE_SCOPES = [ + "agent", + "agent_prefix", + "event", + "event_prefix", + "key", + "key_prefix", + "keyring", + "node", + "node_prefix", + "operator", + "query", + "query_prefix", + "service", + "service_prefix", + "session", + "session_prefix", +] MANAGEMENT_PARAMETER_NAME = "mgmt_token" HOST_PARAMETER_NAME = "host"