From 0d49d9ac0f32d7ff3d26c3245a7b604e8d28429e Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Fri, 13 Jan 2023 12:39:55 -0500
Subject: [PATCH] Revert Windows Install Action Fix

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/plugin_install.yml | 4 ++--
 tools/install_demo_configuration.bat | 5 -----
 tools/install_demo_configuration.sh  | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml
index e47c6dda2e..77e9a256db 100644
--- a/.github/workflows/plugin_install.yml
+++ b/.github/workflows/plugin_install.yml
@@ -34,14 +34,14 @@ jobs:
         run: |
           cat > setup.sh <<'EOF'
           chmod +x  ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh 
-          /bin/bash -c "./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh -y"
+          /bin/bash -c "yes | ./opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT/plugins/${{ env.PLUGIN_NAME }}/tools/install_demo_configuration.sh"
           EOF
 
       - name: Create Setup Script
         if: ${{ runner.os == 'Windows' }}
         run: |
           New-Item .\setup.bat -type file
-          Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -y"
+          Set-Content .\setup.bat -Value "powershell.exe .\opensearch-${{ env.OPENSEARCH_VERSION }}-SNAPSHOT\plugins\${{ env.PLUGIN_NAME }}\tools\install_demo_configuration.bat -i -c -y"
 
       - name: Run Opensearch with A Single Plugin
         uses: ./.github/actions/start-opensearch-with-one-plugin
diff --git a/tools/install_demo_configuration.bat b/tools/install_demo_configuration.bat
index 522fe50fc0..410df30b08 100755
--- a/tools/install_demo_configuration.bat
+++ b/tools/install_demo_configuration.bat
@@ -62,11 +62,6 @@ if %cluster_mode% == 0 (
     )
 )
 
-if %assumeyes% == 1 (
-  set "initsecurity=1"
-  set "cluster_mode=1"
-)
-
 set BASE_DIR=%SCRIPT_DIR%\..\..\..\
 if not exist %BASE_DIR% (
     echo "basedir does not exist"
diff --git a/tools/install_demo_configuration.sh b/tools/install_demo_configuration.sh
index d3d58d77b7..bff93c3a6a 100755
--- a/tools/install_demo_configuration.sh
+++ b/tools/install_demo_configuration.sh
@@ -97,11 +97,6 @@ if [ "$cluster_mode" == 0 ] && [ "$assumeyes" == 0 ]; then
 	esac
 fi
 
-if [ "$assumeyes" == 1 ]; then
-  cluster_mode=1
-  initsecurity=1
-fi
-
 set -e
 BASE_DIR="$DIR/../../.."
 if [ -d "$BASE_DIR" ]; then