From 988bbe6a30c5e40c1ea05d625e5a66cd9eb5869b Mon Sep 17 00:00:00 2001
From: Theo Truong <theotr@amazon.com>
Date: Mon, 29 Jan 2024 14:55:13 -0700
Subject: [PATCH] # Secure integration tests should fail

Signed-off-by: Theo Truong <theotr@amazon.com>
---
 .ci/opensearch/Dockerfile.opensearch |  6 ------
 .ci/opensearch/docker-compose.yml    | 12 ++----------
 .github/workflows/integration.yml    |  1 +
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.ci/opensearch/Dockerfile.opensearch b/.ci/opensearch/Dockerfile.opensearch
index e248a6206..67a1a3b13 100644
--- a/.ci/opensearch/Dockerfile.opensearch
+++ b/.ci/opensearch/Dockerfile.opensearch
@@ -5,10 +5,4 @@ ARG opensearch_path=/usr/share/opensearch
 ARG opensearch_yml=$opensearch_path/config/opensearch.yml
 
 ARG SECURE_INTEGRATION
-
-HEALTHCHECK --start-period=20s --interval=5s --retries=2 --timeout=1s \
-  CMD if [ "$SECURE_INTEGRATION" != "true" ]; \
-  then curl --fail localhost:9200/_cat/health; \
-  else curl --fail -k https:/localhost:9200/_cat/health -u admin:admin; fi
-
 RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then $opensearch_path/bin/opensearch-plugin remove opensearch-security; fi
diff --git a/.ci/opensearch/docker-compose.yml b/.ci/opensearch/docker-compose.yml
index 977dbb3b1..757e86e48 100644
--- a/.ci/opensearch/docker-compose.yml
+++ b/.ci/opensearch/docker-compose.yml
@@ -13,16 +13,8 @@ services:
       - discovery.type=single-node
       - bootstrap.memory_lock=true
       - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!
+      - initialAdminPassword=myStrongPassword123!
     ports:
       - '9200:9200'
     user: opensearch
-  autoheal:
-    restart: always
-    image: willfarrell/autoheal
-    environment:
-      - AUTOHEAL_CONTAINER_LABEL=all
-      - AUTOHEAL_START_PERIOD=30
-      - AUTOHEAL_INTERVAL=5
-      - AUTOHEAL_DEFAULT_STOP_TIMEOUT=30
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index a99674a15..e93fc6a87 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -78,6 +78,7 @@ jobs:
       - name: Runs OpenSearch secure cluster
         run: |
           export SECURE_INTEGRATION=true
+          export OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!
           make cluster.clean cluster.opensearch.build cluster.opensearch.start
 
       - name: Use Node.js ${{ matrix.node-version }}