From dcee918299ddfed3e1ff0ee99ce33036800214f0 Mon Sep 17 00:00:00 2001
From: Derek Ho <dxho@amazon.com>
Date: Wed, 27 Dec 2023 11:03:38 -0500
Subject: [PATCH] Add changelog line and change PR to be merged in after 2.12
 release

Signed-off-by: Derek Ho <dxho@amazon.com>
---
 .github/actions/opensearch/run.sh   | 40 ++++++++++++++++++++---------
 .github/workflows/compatibility.yml |  2 +-
 CHANGELOG.md                        |  1 +
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/actions/opensearch/run.sh b/.github/actions/opensearch/run.sh
index 5f5ef5389..6c005ab87 100755
--- a/.github/actions/opensearch/run.sh
+++ b/.github/actions/opensearch/run.sh
@@ -56,18 +56,34 @@ if [[ $DISABLE_SECURITY = true ]]; then
     --silent \
     http://os1:$PORT
 else
-  docker run \
-    --network cluster \
-    --rm \
-    appropriate/curl \
-    --max-time 120 \
-    --retry 120 \
-    --retry-delay 1 \
-    --retry-connrefused \
-    --show-error \
-    --silent \
-    --insecure \
-    https://admin:myStrongPassword123!@os1:$PORT
+  if [[ $CLUSTER_VERSION = 'latest' ]]; then
+    # Since 2.12.0, security demo configuration requires an initial admin password, which is set to 
+    # myStrongPassword123!
+    docker run \
+      --network cluster \
+      --rm \
+      appropriate/curl \
+      --max-time 120 \
+      --retry 120 \
+      --retry-delay 1 \
+      --retry-connrefused \
+      --show-error \
+      --silent \
+      --insecure \
+      https://admin:myStrongPassword123!@os1:$PORT
+  else
+    docker run \
+      --network cluster \
+      --rm \
+      appropriate/curl \
+      --max-time 120 \
+      --retry 120 \
+      --retry-delay 1 \
+      --retry-connrefused \
+      --show-error \
+      --silent \
+      --insecure \
+      https://admin:admin!@os1:$PORT
 fi
 
 sleep 10
diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
index 0616844a4..a8a25b3e7 100644
--- a/.github/workflows/compatibility.yml
+++ b/.github/workflows/compatibility.yml
@@ -47,7 +47,7 @@ jobs:
 
   test-opensearch-security:
     env:
-      TEST_OPENSEARCH_SERVER: https://admin:myStrongPassword123!@localhost:9200
+      TEST_OPENSEARCH_SERVER: https://admin:admin@localhost:9200
       PORT: 9200
     strategy:
       fail-fast: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a622c4a00..31c6b9189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### Added
+- Pass in an initial admin password, required by security after 2.12.0 release ([#217](https://github.com/opensearch-project/opensearch-ruby/issues/217))
 ### Changed
 ### Deprecated
 ### Removed