From 82fe75e45707878d0a951223f1e84251a0e0cf01 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 6 Feb 2025 15:59:29 -0500 Subject: [PATCH] Add aliases to attrib clear Support aliases when specified in clearing. --- .../confluent/plugins/configuration/attributes.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/confluent_server/confluent/plugins/configuration/attributes.py b/confluent_server/confluent/plugins/configuration/attributes.py index 2c9a6ac9..6986227b 100644 --- a/confluent_server/confluent/plugins/configuration/attributes.py +++ b/confluent_server/confluent/plugins/configuration/attributes.py @@ -17,6 +17,7 @@ import ast import confluent.exceptions as exc import confluent.messages as msg import confluent.config.attributes as allattributes +import confluent.config.configmanager as configmod import confluent.util as util from fnmatch import fnmatch @@ -284,6 +285,9 @@ def update_nodes(nodes, element, configmanager, inputdata): clearattribs.append(attrib) else: foundattrib = False + for candattrib in configmod._attraliases: + if fnmatch(candattrib, attrib): + attrib = configmod._attraliases[candattrib] for candattrib in allattributes.node: if fnmatch(candattrib, attrib): clearattribs.append(candattrib)