use LabelSelectorMatcher for label filtering

cryostatio · Mar 20, 2024 · ffc897b · ffc897b
1 parent a93f063
commit ffc897b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/io/cryostat/graphql/EnvironmentNodes.java b/src/main/java/io/cryostat/graphql/EnvironmentNodes.java
@@ -20,6 +20,7 @@
 import java.util.Objects;
 
 import io.cryostat.discovery.DiscoveryNode;
+import io.cryostat.graphql.matchers.LabelSelectorMatcher;
 
 import io.smallrye.graphql.api.Nullable;
 import org.eclipse.microprofile.graphql.Description;
@@ -67,7 +68,11 @@ private static boolean matchesFilter(DiscoveryNode node, EnvironmentNodeFilterIn
         boolean matchesNames = filter.names == null || filter.names.contains(node.name);
         boolean matchesLabels =
                 filter.labels == null
-                        || filter.labels.stream().allMatch(label -> node.labels.containsKey(label));
+                        || filter.labels.stream()
+                                .allMatch(
+                                        label ->
+                                                LabelSelectorMatcher.parse(label)
+                                                        .test(node.labels));
         boolean matchesNodeType = filter.nodeType == null || filter.nodeType.equals(node.nodeType);
 
         return matchesId && matchesName && matchesNames && matchesLabels && matchesNodeType;