IndexPattern Tests

Signed-off-by: Nils Bandener <[email protected]>
opensearch-project · Oct 8, 2024 · d3764ed · d3764ed
1 parent 301f48e
commit d3764ed
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/src/integrationTest/java/org/opensearch/security/privileges/IndexPatternTest.java b/src/integrationTest/java/org/opensearch/security/privileges/IndexPatternTest.java
@@ -139,7 +139,7 @@ public void dateMathIndex() throws Exception {
         IndexPattern indexPattern = IndexPattern.from("<index_year_{now/y{yyyy}}>");
         assertFalse(indexPattern.hasStaticPattern());
         assertTrue(indexPattern.hasDynamicPattern());
-        assertEquals("index_a11", indexPattern.toString());
+        assertEquals("<index_year_{now/y{yyyy}}>", indexPattern.toString());
 
         assertTrue(indexPattern.matches("index_year_" + CURRENT_YEAR, ctx(), INDEX_METADATA.getIndicesLookup()));
         assertFalse(indexPattern.matches("index_year_" + NEXT_YEAR, ctx(), INDEX_METADATA.getIndicesLookup()));

diff --git a/src/main/java/org/opensearch/security/privileges/IndexPattern.java b/src/main/java/org/opensearch/security/privileges/IndexPattern.java
@@ -35,14 +35,14 @@ public class IndexPattern {
     /**
      * An IndexPattern which does not match any index.
      */
-    public static final IndexPattern EMPTY = new IndexPattern(null, ImmutableList.of(), ImmutableList.of());
+    public static final IndexPattern EMPTY = new IndexPattern(WildcardMatcher.NONE, ImmutableList.of(), ImmutableList.of());
 
     private final WildcardMatcher staticPattern;
     private final ImmutableList<String> patternTemplates;
     private final ImmutableList<String> dateMathExpressions;
     private final int hashCode;
 
-    public IndexPattern(WildcardMatcher staticPattern, ImmutableList<String> patternTemplates, ImmutableList<String> dateMathExpressions) {
+    private IndexPattern(WildcardMatcher staticPattern, ImmutableList<String> patternTemplates, ImmutableList<String> dateMathExpressions) {
         this.staticPattern = staticPattern;
         this.patternTemplates = patternTemplates;
         this.dateMathExpressions = dateMathExpressions;
@@ -52,7 +52,7 @@ public IndexPattern(WildcardMatcher staticPattern, ImmutableList<String> pattern
 
     public boolean matches(String index, PrivilegesEvaluationContext context, Map<String, IndexAbstraction> indexMetadata)
         throws PrivilegesEvaluationException {
-        if (staticPattern != null && staticPattern.test(index)) {
+        if (staticPattern != WildcardMatcher.NONE && staticPattern.test(index)) {
             return true;
         }
 
@@ -116,14 +116,32 @@ public boolean matches(String index, PrivilegesEvaluationContext context, Map<St
 
     @Override
     public String toString() {
-        if (staticPattern != null && patternTemplates != null && patternTemplates.size() != 0) {
-            return staticPattern + " " + patternTemplates;
-        } else if (staticPattern != null) {
+        if (patternTemplates.size() == 0 && dateMathExpressions.size() == 0) {
             return staticPattern.toString();
-        } else if (patternTemplates != null) {
-            return patternTemplates.toString();
         } else {
-            return "-/-";
+            StringBuilder result = new StringBuilder();
+
+            if (staticPattern != WildcardMatcher.NONE) {
+                result.append(staticPattern);
+            }
+
+            if (patternTemplates.size() != 0) {
+                if (result.length() != 0) {
+                    result.append(" ");
+                }
+
+                result.append(String.join(",", patternTemplates));
+            }
+
+            if (dateMathExpressions.size() != 0) {
+                if (result.length() != 0) {
+                    result.append(" ");
+                }
+
+                result.append(String.join(",", dateMathExpressions));
+            }
+
+            return result.toString();
         }
     }
 
@@ -135,7 +153,7 @@ public WildcardMatcher getStaticPattern() {
      * Returns true if this object contains patterns which can be matched against indices upfront.
      */
     public boolean hasStaticPattern() {
-        return staticPattern != null && staticPattern != WildcardMatcher.NONE;
+        return staticPattern != WildcardMatcher.NONE;
     }
 
     /**
@@ -154,7 +172,7 @@ public IndexPattern dynamicOnly() {
         if (patternTemplates.isEmpty() && dateMathExpressions.isEmpty()) {
             return EMPTY;
         } else {
-            return new IndexPattern(null, this.patternTemplates, this.dateMathExpressions);
+            return new IndexPattern(WildcardMatcher.NONE, this.patternTemplates, this.dateMathExpressions);
         }
     }
 
@@ -207,7 +225,7 @@ void add(List<String> source) {
 
         IndexPattern build() {
             return new IndexPattern(
-                constantPatterns.size() != 0 ? WildcardMatcher.from(constantPatterns) : null,
+                constantPatterns.size() != 0 ? WildcardMatcher.from(constantPatterns) : WildcardMatcher.NONE,
                 ImmutableList.copyOf(patternTemplates),
                 ImmutableList.copyOf(dateMathExpressions)
             );