From 4e32d0fd0631fcf8735a3760bbc973092e8d98c0 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 20 Dec 2023 13:53:47 -0500
Subject: [PATCH] Remote restart

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .../InitializationIntegrationTests.java       | 24 ++++---------------
 .../security/test/SingleClusterTest.java      | 12 ----------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/src/test/java/org/opensearch/security/InitializationIntegrationTests.java b/src/test/java/org/opensearch/security/InitializationIntegrationTests.java
index 3558d2f292..7545822620 100644
--- a/src/test/java/org/opensearch/security/InitializationIntegrationTests.java
+++ b/src/test/java/org/opensearch/security/InitializationIntegrationTests.java
@@ -28,7 +28,6 @@
 
 import java.io.File;
 import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
@@ -36,7 +35,6 @@
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.http.HttpStatus;
-import org.awaitility.Awaitility;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -63,8 +61,6 @@
 import org.opensearch.security.test.helper.rest.RestHelper;
 import org.opensearch.security.test.helper.rest.RestHelper.HttpResponse;
 
-import static org.hamcrest.Matchers.equalTo;
-
 public class InitializationIntegrationTests extends SingleClusterTest {
 
     @Test
@@ -285,10 +281,9 @@ public void testDefaultConfig() throws Exception {
         final Settings settings = Settings.builder().put(ConfigConstants.SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX, true).build();
         setup(Settings.EMPTY, null, settings, false);
         RestHelper rh = nonSslRestHelper();
+        Thread.sleep(10000);
 
-        Awaitility.await()
-            .alias("Load default configuration")
-            .until(() -> rh.executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode(), equalTo(HttpStatus.SC_OK));
+        Assert.assertEquals(HttpStatus.SC_OK, rh.executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode());
         HttpResponse res = rh.executeGetRequest("/_cluster/health", encodeBasicHeader("admin", "admin"));
         Assert.assertEquals(res.getBody(), HttpStatus.SC_OK, res.getStatusCode());
     }
@@ -299,25 +294,14 @@ public void testInvalidDefaultConfig() throws Exception {
             final String defaultInitDirectory = ClusterHelper.updateDefaultDirectory(
                 new File(TEST_RESOURCE_RELATIVE_PATH + "invalid_config").getAbsolutePath()
             );
-
             final Settings settings = Settings.builder().put(ConfigConstants.SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX, true).build();
             setup(Settings.EMPTY, null, settings, false);
-
+            RestHelper rh = nonSslRestHelper();
             Thread.sleep(10000);
             Assert.assertEquals(
                 HttpStatus.SC_SERVICE_UNAVAILABLE,
-                nonSslRestHelper().executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode()
+                rh.executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode()
             );
-
-            ClusterHelper.updateDefaultDirectory(defaultInitDirectory);
-            restart(Settings.EMPTY, null, settings, false);
-            Awaitility.waitAtMost(30, TimeUnit.SECONDS)
-                .await()
-                .alias("Load default configuration")
-                .until(
-                    () -> nonSslRestHelper().executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode(),
-                    equalTo(HttpStatus.SC_OK)
-                );
         } finally {
             ClusterHelper.resetSystemProperties();
         }
diff --git a/src/test/java/org/opensearch/security/test/SingleClusterTest.java b/src/test/java/org/opensearch/security/test/SingleClusterTest.java
index 2839e1e283..cdde57a5c0 100644
--- a/src/test/java/org/opensearch/security/test/SingleClusterTest.java
+++ b/src/test/java/org/opensearch/security/test/SingleClusterTest.java
@@ -83,18 +83,6 @@ protected void setup(
         setup(initTransportClientSettings, dynamicSecuritySettings, nodeOverride, initSecurityIndex, ClusterConfiguration.DEFAULT);
     }
 
-    protected void restart(
-        Settings initTransportClientSettings,
-        DynamicSecurityConfig dynamicSecuritySettings,
-        Settings nodeOverride,
-        boolean initOpendistroSecurityIndex
-    ) throws Exception {
-        clusterInfo = clusterHelper.startCluster(minimumSecuritySettings(ccs(nodeOverride)), ClusterConfiguration.DEFAULT);
-        if (initOpendistroSecurityIndex && dynamicSecuritySettings != null) {
-            initialize(clusterHelper, clusterInfo, dynamicSecuritySettings);
-        }
-    }
-
     private Settings ccs(Settings nodeOverride) throws Exception {
         if (remoteClusterHelper != null) {
             Assert.assertNull("No remote clusters", remoteClusterInfo);