New tests for protected indices feature

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

@@ -12,9 +12,12 @@
 package org.opensearch.security.privileges.int_tests;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.junit.rules.ExternalResource;
+
 import org.opensearch.test.framework.cluster.LocalCluster;
 
 /**
@@ -46,8 +49,6 @@ public enum ClusterConfig {
     final boolean systemIndexPrivilegeEnabled;
     final boolean allowsEmptyResultSets;
 
-    private LocalCluster cluster;
-
     ClusterConfig(
         String name,
         Function<LocalCluster.Builder, LocalCluster.Builder> clusterConfiguration,
@@ -62,25 +63,38 @@ public enum ClusterConfig {
         this.allowsEmptyResultSets = allowsEmptyResultSets;
     }
 
-    LocalCluster cluster(Supplier<LocalCluster.Builder> clusterBuilder) {
-        if (cluster == null) {
-            cluster = this.clusterConfiguration.apply(clusterBuilder.get()).build();
-            cluster.before();
-        }
-        return cluster;
+    @Override
+    public String toString() {
+        return name;
     }
 
-    void shutdown() {
-        if (cluster != null) {
-            try {
-                cluster.close();
-            } catch (Exception e) {}
-            cluster = null;
+    public static class ClusterInstances extends ExternalResource {
+        private final Supplier<LocalCluster.Builder> clusterBuilder;
+
+        public ClusterInstances(Supplier<LocalCluster.Builder> clusterBuilder) {
+            this.clusterBuilder = clusterBuilder;
         }
-    }
 
-    @Override
-    public String toString() {
-        return name;
+        private Map<ClusterConfig, LocalCluster> configToInstanceMap = new ConcurrentHashMap<>();
+
+        public LocalCluster get(ClusterConfig config) {
+            LocalCluster cluster = configToInstanceMap.get(config);
+            if (cluster == null) {
+                cluster = config.clusterConfiguration.apply(clusterBuilder.get()).build();
+                cluster.before();
+                configToInstanceMap.put(config, cluster);
+            }
+
+            return cluster;
+        }
+
+        @Override
+        protected void after() {
+            for (Map.Entry<ClusterConfig, LocalCluster> entry : configToInstanceMap.entrySet()) {
+                entry.getValue().stopSafe();
+            }
+            configToInstanceMap.clear();
+        };
+
     }
 }

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

@@ -16,7 +16,6 @@
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import org.junit.AfterClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -189,12 +188,10 @@ static LocalCluster.Builder clusterBuilder() {
             .indices(LocalIndices.index_a1, LocalIndices.index_a2);
     }
 
-    @AfterClass
-    public static void stopClusters() {
-        for (ClusterConfig clusterConfig : ClusterConfig.values()) {
-            clusterConfig.shutdown();
-        }
-    }
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusters = new ClusterConfig.ClusterInstances(
+        CrossClusterAuthorizationIntTests::clusterBuilder
+    );
 
     final TestSecurityConfig.User user;
     final LocalCluster cluster;
@@ -479,7 +476,7 @@ public static Collection<Object[]> params() {
     public CrossClusterAuthorizationIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster(CrossClusterAuthorizationIntTests::clusterBuilder);
+        this.cluster = clusters.get(clusterConfig);
         this.clusterConfig = clusterConfig;
     }
 

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

@@ -17,7 +17,7 @@
 import java.util.UUID;
 
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.junit.AfterClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -361,12 +361,10 @@ static LocalCluster.Builder clusterBuilder() {
             );
     }
 
-    @AfterClass
-    public static void stopClusters() {
-        for (ClusterConfig clusterConfig : ClusterConfig.values()) {
-            clusterConfig.shutdown();
-        }
-    }
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusterInstances = new ClusterConfig.ClusterInstances(
+        DashboardMultiTenancyIntTests::clusterBuilder
+    );
 
     final TestSecurityConfig.User user;
     final LocalCluster cluster;
@@ -763,7 +761,7 @@ public DashboardMultiTenancyIntTests(
         @SuppressWarnings("unused") String description
     ) {
         this.user = user;
-        this.cluster = clusterConfig.cluster(DashboardMultiTenancyIntTests::clusterBuilder);
+        this.cluster = clusterInstances.get(clusterConfig);
         this.clusterConfig = clusterConfig;
     }
 

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

@@ -15,7 +15,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.AfterClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -228,12 +228,10 @@ static LocalCluster.Builder clusterBuilder() {
             .indices(index_c1);
     }
 
-    @AfterClass
-    public static void stopClusters() {
-        for (ClusterConfig clusterConfig : ClusterConfig.values()) {
-            clusterConfig.shutdown();
-        }
-    }
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusterInstances = new ClusterConfig.ClusterInstances(
+        DataStreamAuthorizationReadOnlyIntTests::clusterBuilder
+    );
 
     final TestSecurityConfig.User user;
     final LocalCluster cluster;
@@ -875,7 +873,7 @@ public static Collection<Object[]> params() {
     public DataStreamAuthorizationReadOnlyIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster(DataStreamAuthorizationReadOnlyIntTests::clusterBuilder);
+        this.cluster = clusterInstances.get(clusterConfig);
         this.clusterConfig = clusterConfig;
     }
 }

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

@@ -19,7 +19,7 @@
 
 import com.google.common.collect.ImmutableList;
 import org.junit.After;
-import org.junit.AfterClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -420,12 +420,10 @@ static LocalCluster.Builder clusterBuilder() {
             .plugin(IndexAuthorizationReadOnlyIntTests.SystemIndexTestPlugin.class);
     }
 
-    @AfterClass
-    public static void stopClusters() {
-        for (ClusterConfig clusterConfig : ClusterConfig.values()) {
-            clusterConfig.shutdown();
-        }
-    }
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusterInstances = new ClusterConfig.ClusterInstances(
+        DataStreamAuthorizationReadWriteIntTests::clusterBuilder
+    );
 
     final TestSecurityConfig.User user;
     final LocalCluster cluster;
@@ -601,7 +599,7 @@ public static Collection<Object[]> params() {
     public DataStreamAuthorizationReadWriteIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster(DataStreamAuthorizationReadWriteIntTests::clusterBuilder);
+        this.cluster = clusterInstances.get(clusterConfig);
         this.clusterConfig = clusterConfig;
     }
 

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

@@ -19,7 +19,7 @@
 import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableList;
-import org.junit.AfterClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -395,12 +395,10 @@ static LocalCluster.Builder clusterBuilder() {
             .plugin(SystemIndexTestPlugin.class, MustacheModulePlugin.class);
     }
 
-    @AfterClass
-    public static void stopClusters() {
-        for (ClusterConfig clusterConfig : ClusterConfig.values()) {
-            clusterConfig.shutdown();
-        }
-    }
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusterInstances = new ClusterConfig.ClusterInstances(
+        IndexAuthorizationReadOnlyIntTests::clusterBuilder
+    );
 
     final TestSecurityConfig.User user;
     final LocalCluster cluster;
@@ -1878,7 +1876,7 @@ public static Collection<Object[]> params() {
     public IndexAuthorizationReadOnlyIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster(IndexAuthorizationReadOnlyIntTests::clusterBuilder);
+        this.cluster = clusterInstances.get(clusterConfig);
         this.clusterConfig = clusterConfig;
     }
 

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

@@ -18,7 +18,7 @@
 
 import com.google.common.collect.ImmutableList;
 import org.junit.After;
-import org.junit.AfterClass;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -570,12 +570,10 @@ static LocalCluster.Builder clusterBuilder() {
             .plugin(IndexAuthorizationReadOnlyIntTests.SystemIndexTestPlugin.class);
     }
 
-    @AfterClass
-    public static void stopClusters() {
-        for (ClusterConfig clusterConfig : ClusterConfig.values()) {
-            clusterConfig.shutdown();
-        }
-    }
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusterInstances = new ClusterConfig.ClusterInstances(
+        IndexAuthorizationReadWriteIntTests::clusterBuilder
+    );
 
     final TestSecurityConfig.User user;
     final LocalCluster cluster;
@@ -1157,7 +1155,7 @@ public static Collection<Object[]> params() {
     public IndexAuthorizationReadWriteIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster(IndexAuthorizationReadWriteIntTests::clusterBuilder);
+        this.cluster = clusterInstances.get(clusterConfig);
         this.clusterConfig = clusterConfig;
     }
 

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

@@ -20,6 +20,7 @@
 import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -140,9 +141,13 @@ static LocalCluster.Builder clusterBuilder() {
             .plugin(MustacheModulePlugin.class);
     }
 
+    @ClassRule
+    public static final ClusterConfig.ClusterInstances clusterInstances = new ClusterConfig.ClusterInstances(
+        IndexAuthorizationWithClosedIndicesIntTests::clusterBuilder
+    );
+
     private final TestSecurityConfig.User user;
     private final LocalCluster cluster;
-    private final ClusterConfig clusterConfig;
 
     @Parameters(name = "{0}, {2}")
     public static Collection<Object[]> params() {
@@ -159,8 +164,7 @@ public static Collection<Object[]> params() {
     public IndexAuthorizationWithClosedIndicesIntTests(ClusterConfig clusterConfig, TestSecurityConfig.User user, String description)
         throws Exception {
         this.user = user;
-        this.cluster = clusterConfig.cluster(IndexAuthorizationWithClosedIndicesIntTests::clusterBuilder);
-        this.clusterConfig = clusterConfig;
+        this.cluster = clusterInstances.get(clusterConfig);
     }
 
     @Before