Minor: Search RBAC, handle tier tags (#18733)

This commit is contained in:
Sriharsha Chintalapani 2024-11-22 10:40:48 -08:00 committed by GitHub
parent ee7d043035
commit 532efbe5ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -235,7 +235,12 @@ public class RBACConditionEvaluator {
public void matchAnyTag(List<String> tags, ConditionCollector collector) { public void matchAnyTag(List<String> tags, ConditionCollector collector) {
List<OMQueryBuilder> tagQueries = new ArrayList<>(); List<OMQueryBuilder> tagQueries = new ArrayList<>();
for (String tag : tags) { for (String tag : tags) {
OMQueryBuilder tagQuery = queryBuilderFactory.termQuery("tags.tagFQN", tag); OMQueryBuilder tagQuery;
if (tag.startsWith("Tier")) {
tagQuery = queryBuilderFactory.termQuery("tier.tagFQN", tag);
} else {
tagQuery = queryBuilderFactory.termQuery("tags.tagFQN", tag);
}
tagQueries.add(tagQuery); tagQueries.add(tagQuery);
} }
OMQueryBuilder tagQueryCombined; OMQueryBuilder tagQueryCombined;