From a193bbdf1faf332d051c74d1ac92127037ccd60c Mon Sep 17 00:00:00 2001
From: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
Date: Wed, 14 Feb 2024 13:38:03 -0500
Subject: [PATCH] Removes check to validate presence of
 `OPENSEARCH_INITIAL_ADMIN_PASSWORD` variable from preinst script of DEB
 distribution (#4453)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
---
 scripts/components/OpenSearch/install.sh      |  3 ---
 .../opensearch/deb/debian/preinst             | 26 -------------------
 .../opensearch/rpm/opensearch.rpm.spec        |  8 +++---
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/scripts/components/OpenSearch/install.sh b/scripts/components/OpenSearch/install.sh
index 201a9edf35..7b384c939d 100755
--- a/scripts/components/OpenSearch/install.sh
+++ b/scripts/components/OpenSearch/install.sh
@@ -84,9 +84,6 @@ if [ "$DISTRIBUTION" = "tar" ]; then
 elif [ "$DISTRIBUTION" = "deb" -o "$DISTRIBUTION" = "rpm" ]; then
     cp -va ../../../scripts/pkg/service_templates/opensearch/* "$OUTPUT/../"
     cp -va ../../../scripts/pkg/build_templates/opensearch/$DISTRIBUTION/* "$OUTPUT/../"
-    if [ "$DISTRIBUTION" = "deb" ]; then
-      sed -i "s/CHANGE_VERSION/${VERSION}/g" "$OUTPUT/../debian/preinst"
-    fi
 elif [ "$DISTRIBUTION" = "zip" ] && [ "$PLATFORM" = "windows" ]; then
     cp -v ../../../scripts/startup/zip/windows/opensearch-windows-install.bat "$OUTPUT/"
 fi
diff --git a/scripts/pkg/build_templates/opensearch/deb/debian/preinst b/scripts/pkg/build_templates/opensearch/deb/debian/preinst
index 29eae62294..1a02cc06c1 100755
--- a/scripts/pkg/build_templates/opensearch/deb/debian/preinst
+++ b/scripts/pkg/build_templates/opensearch/deb/debian/preinst
@@ -11,8 +11,6 @@
 
 set -e
 
-OPENSEARCH_VERSION=CHANGE_VERSION
-
 echo "Running OpenSearch Pre-Installation Script"
 
 # Stop existing service
@@ -25,30 +23,6 @@ if command -v systemctl >/dev/null && systemctl is-active opensearch-performance
     systemctl --no-reload stop opensearch-performance-analyzer.service
 fi
 
-# Check if OPENSEARCH_INITIAL_ADMIN_PASSWORD is defined
-# TODO:
-# 1. This check will need to be modified if there will be a min dist for deb in future (currently there is none)
-# 2. Currently, the demo config setup is defined to run, in postinst, if `opensearch-security` is present. Cannot apply the same check here since the plugins folder is not available yet.
-
-# Check if this is an upgrade by checking whether opensearch already exists
-if dpkg-query -W opensearch >/dev/null 2>&1; then
-    OPENSEARCH_ALREADY_INSTALLED=yes
-else
-    OPENSEARCH_ALREADY_INSTALLED=no
-fi
-
-OPENSEARCH_REQUIRED_VERSION="2.12.0"
-MINIMUM_OF_TWO_VERSIONS=`echo $OPENSEARCH_REQUIRED_VERSION $OPENSEARCH_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1`
-
-if [ $OPENSEARCH_ALREADY_INSTALLED = no ]; then
-  if [ $MINIMUM_OF_TWO_VERSIONS = $OPENSEARCH_REQUIRED_VERSION ] && [ -z "$OPENSEARCH_INITIAL_ADMIN_PASSWORD" ]; then
-    echo "ERROR: Opensearch 2.12 and later requires the env variable OPENSEARCH_INITIAL_ADMIN_PASSWORD to be defined to setup the opensearch-security demo configuration"
-    echo "For more details, please visit: https://opensearch.org/docs/latest/install-and-configure/install-opensearch/debian/"
-    exit 1
-  fi
-fi
-
-
 # Create user and group if they do not already exist.
 getent group opensearch > /dev/null 2>&1 || groupadd -r opensearch
 getent passwd opensearch > /dev/null 2>&1 || \
diff --git a/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec b/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec
index 90afe8e604..85b177b2a3 100644
--- a/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec
+++ b/scripts/pkg/build_templates/opensearch/rpm/opensearch.rpm.spec
@@ -97,17 +97,17 @@ fi
 
 # Check if this is an upgrade by checking whether opensearch already exists
 if rpm -q opensearch >/dev/null 2>&1 || yum list installed opensearch >/dev/null 2>&1; then
-    OPENSEARCH_ALREADY_INSTALLED=yes
+    OPENSEARCH_ALREADY_INSTALLED="yes"
 else
-    OPENSEARCH_ALREADY_INSTALLED=no
+    OPENSEARCH_ALREADY_INSTALLED="no"
 fi
 
 OPENSEARCH_REQUIRED_VERSION="2.12.0"
 OPENSEARCH_VERSION=%{_version}
 MINIMUM_OF_TWO_VERSIONS=`echo $OPENSEARCH_REQUIRED_VERSION $OPENSEARCH_VERSION | tr ' ' '\n' | sort -V | uniq | head -n 1`
 
-if [ $OPENSEARCH_ALREADY_INSTALLED = no ]; then
-  if [ $MINIMUM_OF_TWO_VERSIONS = $OPENSEARCH_REQUIRED_VERSION ] && [ -z "$OPENSEARCH_INITIAL_ADMIN_PASSWORD" ]; then
+if [ "$OPENSEARCH_ALREADY_INSTALLED" = "no" ]; then
+  if [ "$MINIMUM_OF_TWO_VERSIONS" = "$OPENSEARCH_REQUIRED_VERSION" ] && [ -z "$OPENSEARCH_INITIAL_ADMIN_PASSWORD" ]; then
     echo "ERROR: Opensearch 2.12 and later requires the env variable OPENSEARCH_INITIAL_ADMIN_PASSWORD to be defined to setup the opensearch-security demo configuration"
     echo "For more details, please visit: https://opensearch.org/docs/latest/install-and-configure/install-opensearch/rpm/"
     exit 1