Added data stream tests

Author: nibix

src/integrationTest/java/org/opensearch/security/privileges/int_tests/ClusterConfig.java

@@ -0,0 +1,55 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+package org.opensearch.security.privileges.int_tests;
+
+import org.opensearch.test.framework.cluster.LocalCluster;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public enum ClusterConfig {
+    LEGACY_PRIVILEGES_EVALUATION("legacy", c -> c.doNotFailOnForbidden(true)),
+    NEXT_GEN_PRIVILEGES_EVALUATION("next_gen", c -> c.privilegesEvaluationType("next_gen"));
+
+    final String name;
+    final Function<LocalCluster.Builder, LocalCluster.Builder> clusterConfiguration;
+    private LocalCluster cluster;
+
+    ClusterConfig(String name, Function<LocalCluster.Builder, LocalCluster.Builder> clusterConfiguration) {
+        this.name = name;
+        this.clusterConfiguration = clusterConfiguration;
+    }
+
+    LocalCluster cluster(Supplier<LocalCluster.Builder> clusterBuilder) {
+        if (cluster == null) {
+            cluster = this.clusterConfiguration.apply(clusterBuilder.get()).build();
+            cluster.before();
+        }
+        return cluster;
+    }
+
+    void shutdown() {
+        if (cluster != null) {
+            try {
+                cluster.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            cluster = null;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/integrationTest/java/org/opensearch/security/privileges/int_tests/DataStreamAuthorizationReadOnlyIntTests.java

@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.security.privileges;
+package org.opensearch.security.privileges.int_tests;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -1217,46 +1217,7 @@ public static Collection<Object[]> params() {
     public IndexAuthorizationReadOnlyIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster();
+        this.cluster = clusterConfig.cluster(IndexAuthorizationReadOnlyIntTests::clusterBuilder);
         this.clusterConfig = clusterConfig;
     }
-
-    public enum ClusterConfig {
-        LEGACY_PRIVILEGES_EVALUATION("legacy", c -> c.doNotFailOnForbidden(true)),
-        NEXT_GEN_PRIVILEGES_EVALUATION("next_gen", c -> c.privilegesEvaluationType("next_gen"));
-
-        final String name;
-        final Function<LocalCluster.Builder, LocalCluster.Builder> clusterConfiguration;
-        private LocalCluster cluster;
-
-        ClusterConfig(String name, Function<LocalCluster.Builder, LocalCluster.Builder> clusterConfiguration) {
-            this.name = name;
-            this.clusterConfiguration = clusterConfiguration;
-        }
-
-        LocalCluster cluster() {
-            if (cluster == null) {
-                cluster = this.clusterConfiguration.apply(clusterBuilder()).build();
-                cluster.before();
-            }
-            return cluster;
-        }
-
-        void shutdown() {
-            if (cluster != null) {
-                try {
-                    cluster.close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                cluster = null;
-            }
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
-    }
-
 }

src/integrationTest/java/org/opensearch/security/privileges/IndexAuthorizationReadOnlyIntTests.java renamed to src/integrationTest/java/org/opensearch/security/privileges/int_tests/IndexAuthorizationReadOnlyIntTests.java

@@ -18,6 +18,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -41,6 +42,7 @@
 import static com.fasterxml.jackson.core.JsonToken.START_ARRAY;
 
 public class IndexApiMatchers {
+    private static final Pattern DS_BACKING_INDEX_PATTERN = Pattern.compile("\\.ds-(.+)-[0-9]+");
 
     public static IndexMatcher containsExactly(TestIndexLike... testIndices) {
         Map<String, TestIndexLike> indexNameMap = new HashMap<>();
@@ -255,6 +257,15 @@ protected boolean matchesByIndices(
 
                 if (containsOpenSearchIndices && (index.startsWith(".opendistro"))) {
                     seenOpenSearchIndicesBuilder.add(index);
+                } else if (index.startsWith(".ds-")) {
+                    // We do a special treatment for data stream backing indices. We convert these to the normal data streams if expected indices contains these.
+                    java.util.regex.Matcher matcher = DS_BACKING_INDEX_PATTERN.matcher(index);
+
+                    if (matcher.matches() && expectedIndices.contains(matcher.group(1))) {
+                        seenIndicesBuilder.add(matcher.group(1));
+                    } else {
+                        seenIndicesBuilder.add(index);
+                    }
                 } else {
                     seenIndicesBuilder.add(index);
                 }

src/integrationTest/java/org/opensearch/test/framework/IndexApiMatchers.java

@@ -0,0 +1,67 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+package org.opensearch.test.framework;
+
+import com.google.common.collect.ImmutableMap;
+import org.opensearch.action.admin.indices.template.put.PutComponentTemplateAction;
+import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest;
+import org.opensearch.cluster.metadata.ComponentTemplate;
+import org.opensearch.cluster.metadata.Template;
+import org.opensearch.common.compress.CompressedXContent;
+import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.common.xcontent.json.JsonXContentParser;
+import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentGenerator;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.transport.client.Client;
+
+import java.util.Map;
+
+public class TestComponentTemplate {
+    public static TestComponentTemplate DATA_STREAM_MINIMAL = new TestComponentTemplate("test_component_template_data_stream_minimal",
+            new TestMapping(new TestMapping.Property("@timestamp", "date", "date_optional_time||epoch_millis")));
+
+    private final String name;
+    private final TestMapping mapping;
+
+    public TestComponentTemplate(String name, TestMapping mapping) {
+        this.name = name;
+        this.mapping = mapping;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public TestMapping getMapping() {
+        return mapping;
+    }
+
+    public void create(Client client) throws Exception {
+        try (XContentBuilder builder = JsonXContent.contentBuilder().map(getAsMap())) {
+            try (XContentParser parser = JsonXContent.jsonXContent.createParser(
+                    NamedXContentRegistry.EMPTY,
+                    LoggingDeprecationHandler.INSTANCE,
+                    BytesReference.bytes(builder).streamInput())) {
+                client.admin().indices().execute(PutComponentTemplateAction.INSTANCE,
+                        new PutComponentTemplateAction.Request(name).componentTemplate(ComponentTemplate.parse(parser))).actionGet();
+            }
+        }
+    }
+
+    public Map<String, ?> getAsMap() {
+        return ImmutableMap.of("template", ImmutableMap.of("mappings", mapping.getAsMap()));
+    }
+}