From c9b9275bb162a9dd920c12c70aa12e299ab747f3 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 11 Aug 2025 11:46:35 -0400 Subject: [PATCH] Support clear of custom attributes middle name attributes and custom attributes should be checked for explicitly during a clear. --- .../confluent/plugins/configuration/attributes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/confluent_server/confluent/plugins/configuration/attributes.py b/confluent_server/confluent/plugins/configuration/attributes.py index 434d6c50..6ee68537 100644 --- a/confluent_server/confluent/plugins/configuration/attributes.py +++ b/confluent_server/confluent/plugins/configuration/attributes.py @@ -319,6 +319,12 @@ def update_nodes(nodes, element, configmanager, inputdata): if fnmatch(candattrib, attrib): clearattribs.append(candattrib) foundattrib = True + currnodeattrs = configmanager.get_node_attributes(node, attrib) + for matchattrib in currnodeattrs.get(node, {}): + if matchattrib != attrib: + continue + clearattribs.append(matchattrib) + foundattrib = True if not foundattrib: raise exc.InvalidArgumentException("No attribute matches '" + attrib + "' (try wildcard if trying to clear a group)") elif '*' in attrib: