Merge pull request #10258 from rabbitmq/mergify/bp/v3.12.x/pr-10257

Add -noinput via `rabbitmq-env` (backport #10257)
rabbitmq · Jan 1, 2024 · 5552f45 · 5552f45
2 parents 91b2964 + c07af9a
commit 5552f45
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 11 deletions.
diff --git a/deps/rabbit/scripts/rabbitmq-diagnostics b/deps/rabbit/scripts/rabbitmq-diagnostics
@@ -20,4 +20,11 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-diagnostics "$@"
+maybe_noinput='noinput'
+
+if [ "$1" = 'observer' ]
+then
+    maybe_noinput='input'
+fi
+
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-diagnostics "$maybe_noinput" "$@"
diff --git a/deps/rabbit/scripts/rabbitmq-diagnostics.bat b/deps/rabbit/scripts/rabbitmq-diagnostics.bat
@@ -42,9 +42,10 @@ if "%1"=="remote_shell" (
     set ERL_CMD=erl.exe
 )
 
+REM Note: do NOT add -noinput because "observer" depends on it
 "!ERLANG_HOME!\bin\!ERL_CMD!" +B ^
 -boot !CLEAN_BOOT_FILE! ^
--noinput -noshell -hidden -smp enable ^
+-noshell -hidden -smp enable ^
 !RABBITMQ_CTL_ERL_ARGS! ^
 -kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
 -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^

diff --git a/deps/rabbit/scripts/rabbitmq-env b/deps/rabbit/scripts/rabbitmq-env
@@ -181,10 +181,21 @@ run_escript()
     escript="${1:?escript must be defined}"
     shift
 
+    maybe_noinput="${1:?maybe_noinput must be defined}"
+    shift
+
     _rmq_env_set_erl_libs
 
-    # shellcheck disable=SC2086
-    ERL_FLAGS="-boot $CLEAN_BOOT_FILE $RABBITMQ_CTL_ERL_ARGS -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX" "$escript" "$@"
+    tmp_erl_flags="-boot $CLEAN_BOOT_FILE $RABBITMQ_CTL_ERL_ARGS -kernel inet_dist_listen_min $RABBITMQ_CTL_DIST_PORT_MIN -kernel inet_dist_listen_max $RABBITMQ_CTL_DIST_PORT_MAX"
+
+    if [ "$maybe_noinput" = 'noinput' ]
+    then
+        tmp_erl_flags="-noinput $tmp_erl_flags"
+    fi
+
+    ERL_FLAGS="$tmp_erl_flags" "$escript" "$@"
+
+    unset tmp_erl_flags
 }
 
 RABBITMQ_ENV_LOADED=1

diff --git a/deps/rabbit/scripts/rabbitmq-plugins b/deps/rabbit/scripts/rabbitmq-plugins
@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-plugins "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-plugins 'noinput' "$@"
diff --git a/deps/rabbit/scripts/rabbitmq-queues b/deps/rabbit/scripts/rabbitmq-queues
@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-queues "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-queues 'noinput' "$@"
diff --git a/deps/rabbit/scripts/rabbitmq-streams b/deps/rabbit/scripts/rabbitmq-streams
@@ -21,4 +21,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-streams "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-streams 'noinput' "$@"
diff --git a/deps/rabbit/scripts/rabbitmq-upgrade b/deps/rabbit/scripts/rabbitmq-upgrade
@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-upgrade "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-upgrade 'noinput' "$@"
diff --git a/deps/rabbit/scripts/rabbitmqctl b/deps/rabbit/scripts/rabbitmqctl
@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmqctl "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmqctl 'noinput' "$@"
diff --git a/deps/rabbit/scripts/vmware-rabbitmq b/deps/rabbit/scripts/vmware-rabbitmq
@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript "${ESCRIPT_DIR:?must be defined}"/vmware-rabbitmq "$@"
+run_escript "${ESCRIPT_DIR:?must be defined}"/vmware-rabbitmq 'noinput' "$@"
diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs
@@ -16,7 +16,7 @@ defmodule RabbitMQCtl.MixfileBase do
       start_permanent: Mix.env() == :prod,
       escript: [
         main_module: RabbitMQCtl,
-        emu_args: "-noinput -hidden",
+        emu_args: "-hidden",
         path: "escript/rabbitmqctl"
       ],
       prune_code_paths: false,