From c2a7619aabe23fdb2c5f9569e196d995e283b316 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 16:09:09 +0000
Subject: [PATCH] Use `exec` in the CLI shell scripts to prevent new process
 creation (#3955)

Signed-off-by: Miki <miki@amazon.com>
(cherry picked from commit bd7d70731eb56372aa2a360e85207a1e6396091f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
---
 scripts/use_node                                             | 4 ++--
 src/dev/build/tasks/bin/scripts/opensearch-dashboards        | 2 +-
 src/dev/build/tasks/bin/scripts/opensearch-dashboards-plugin | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/use_node b/scripts/use_node
index f39a39434db..f32ecbcb833 100755
--- a/scripts/use_node
+++ b/scripts/use_node
@@ -91,7 +91,7 @@ fi
 
 # If a file path was provided for execution, prefix with OSD_HOME; use relative paths to avoid the need for this.
 if [ ! -z "$OSD_USE_NODE_JS_FILE_PATH" ]; then
-  NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS" "${NODE}" "${OSD_HOME}${OSD_USE_NODE_JS_FILE_PATH}" "${@}"
+  NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS" exec "${NODE}" "${OSD_HOME}${OSD_USE_NODE_JS_FILE_PATH}" "${@}"
 elif [ $# -ne 0 ]; then
-  NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS" "${NODE}" "${@}"
+  NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS" exec "${NODE}" "${@}"
 fi
diff --git a/src/dev/build/tasks/bin/scripts/opensearch-dashboards b/src/dev/build/tasks/bin/scripts/opensearch-dashboards
index 49c41011da7..c7eae94b499 100755
--- a/src/dev/build/tasks/bin/scripts/opensearch-dashboards
+++ b/src/dev/build/tasks/bin/scripts/opensearch-dashboards
@@ -28,4 +28,4 @@ done
 # Get an absolute path for OSD_HOME
 OSD_HOME="$(cd "$(dirname "${SCRIPT}")/.."; pwd)"
 
-OSD_NODE_OPTS_PREFIX="--no-warnings --max-http-header-size=65536" OSD_USE_NODE_JS_FILE_PATH=/src/cli/dist NODE_ENV=production ${OSD_HOME}/bin/use_node "${@}"
+OSD_NODE_OPTS_PREFIX="--no-warnings --max-http-header-size=65536" OSD_USE_NODE_JS_FILE_PATH=/src/cli/dist NODE_ENV=production exec ${OSD_HOME}/bin/use_node "${@}"
diff --git a/src/dev/build/tasks/bin/scripts/opensearch-dashboards-plugin b/src/dev/build/tasks/bin/scripts/opensearch-dashboards-plugin
index 6af40438d13..a8d9829cc3c 100755
--- a/src/dev/build/tasks/bin/scripts/opensearch-dashboards-plugin
+++ b/src/dev/build/tasks/bin/scripts/opensearch-dashboards-plugin
@@ -28,4 +28,4 @@ done
 # Get an absolute path for OSD_HOME
 OSD_HOME="$(cd "$(dirname "${SCRIPT}")/.."; pwd)"
 
-OSD_NODE_OPTS_PREFIX="--no-warnings" OSD_USE_NODE_JS_FILE_PATH=/src/cli_plugin/dist NODE_ENV=production ${OSD_HOME}/bin/use_node "${@}"
+OSD_NODE_OPTS_PREFIX="--no-warnings" OSD_USE_NODE_JS_FILE_PATH=/src/cli_plugin/dist NODE_ENV=production exec ${OSD_HOME}/bin/use_node "${@}"