From 777fb5945d39bd7a52cf48392164aac5c0aedfc9 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:10:16 -0400
Subject: [PATCH] [Backport 2.x] Undeprecate securityadmin script (#4768)

Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 tools/audit_config_migrater.bat | 5 -----
 tools/audit_config_migrater.sh  | 5 -----
 tools/hash.bat                  | 5 -----
 tools/hash.sh                   | 5 -----
 tools/securityadmin.bat         | 5 -----
 tools/securityadmin.sh          | 5 -----
 6 files changed, 30 deletions(-)

diff --git a/tools/audit_config_migrater.bat b/tools/audit_config_migrater.bat
index 52ccd84915..78f1b1abc0 100644
--- a/tools/audit_config_migrater.bat
+++ b/tools/audit_config_migrater.bat
@@ -1,11 +1,6 @@
 @echo off
 set DIR=%~dp0
 
-echo "**************************************************************************"
-echo "** This tool will be deprecated in the next major release of OpenSearch **"
-echo "** https://github.com/opensearch-project/security/issues/1755           **"
-echo "**************************************************************************"
-
 if defined OPENSEARCH_JAVA_HOME (
   set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe"
 ) else if defined JAVA_HOME (
diff --git a/tools/audit_config_migrater.sh b/tools/audit_config_migrater.sh
index d2f7afa7fc..01b77cf412 100755
--- a/tools/audit_config_migrater.sh
+++ b/tools/audit_config_migrater.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-echo "**************************************************************************"
-echo "** This tool will be deprecated in the next major release of OpenSearch **"
-echo "** https://github.com/opensearch-project/security/issues/1755           **"
-echo "**************************************************************************"
-
 SCRIPT_PATH="${BASH_SOURCE[0]}"
 if ! [ -x "$(command -v realpath)" ]; then
     if [ -L "$SCRIPT_PATH" ]; then
diff --git a/tools/hash.bat b/tools/hash.bat
index fe5f57b823..a50611465c 100644
--- a/tools/hash.bat
+++ b/tools/hash.bat
@@ -1,11 +1,6 @@
 @echo off
 set DIR=%~dp0
 
-echo "**************************************************************************"
-echo "** This tool will be deprecated in the next major release of OpenSearch **"
-echo "** https://github.com/opensearch-project/security/issues/1755           **"
-echo "**************************************************************************"
-
 if defined OPENSEARCH_JAVA_HOME (
   set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe"
 ) else if defined JAVA_HOME (
diff --git a/tools/hash.sh b/tools/hash.sh
index 2bd5bb1e0e..c391232851 100755
--- a/tools/hash.sh
+++ b/tools/hash.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-echo "**************************************************************************" >&2
-echo "** This tool will be deprecated in the next major release of OpenSearch **" >&2
-echo "** https://github.com/opensearch-project/security/issues/1755           **" >&2
-echo "**************************************************************************" >&2
-
 SCRIPT_PATH="${BASH_SOURCE[0]}"
 if ! [ -x "$(command -v realpath)" ]; then
     if [ -L "$SCRIPT_PATH" ]; then
diff --git a/tools/securityadmin.bat b/tools/securityadmin.bat
index d798f78bf0..a44562b6d9 100644
--- a/tools/securityadmin.bat
+++ b/tools/securityadmin.bat
@@ -1,11 +1,6 @@
 @echo off
 set DIR=%~dp0
 
-echo "**************************************************************************"
-echo "** This tool will be deprecated in the next major release of OpenSearch **"
-echo "** https://github.com/opensearch-project/security/issues/1755           **"
-echo "**************************************************************************"
-
 if defined OPENSEARCH_JAVA_HOME (
   set BIN_PATH="%OPENSEARCH_JAVA_HOME%\bin\java.exe"
 ) else if defined JAVA_HOME (
diff --git a/tools/securityadmin.sh b/tools/securityadmin.sh
index 1b0b904619..91fb8271c5 100755
--- a/tools/securityadmin.sh
+++ b/tools/securityadmin.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-echo "**************************************************************************"
-echo "** This tool will be deprecated in the next major release of OpenSearch **"
-echo "** https://github.com/opensearch-project/security/issues/1755           **"
-echo "**************************************************************************"
-
 SCRIPT_PATH="${BASH_SOURCE[0]}"
 if ! [ -x "$(command -v realpath)" ]; then
     if [ -L "$SCRIPT_PATH" ]; then