MINOR: otel: test: replaced argument variables with positional parameters in run...

Replaced SH_ARGS variables with 'set --' and "${@}" to ensure proper
quoting of haproxy command-line arguments.

diff --git a/addons/otel/test/run-cmp.sh b/addons/otel/test/run-cmp.sh
deleted file mode 100755 (executable)
index 9815b09bb01905ace0c10256546ecbedac2a0ad0..0000000000000000000000000000000000000000
--- a/addons/otel/test/run-cmp.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -u
-#
-# Copyright 2026 HAProxy Technologies, Miroslav Zagorac <mzagorac@haproxy.com>
-#
-SH_ARG_HAPROXY="${1:-$(realpath -L ${PWD}/../../../haproxy)}"
-SH_ARG_PIDFILE="${2:-haproxy.pid}"
-       SH_ARGS="-f haproxy-common.cfg -f cmp/haproxy.cfg -p "${SH_ARG_PIDFILE}""
-    SH_LOG_DIR="_logs"
-        SH_LOG="${SH_LOG_DIR}/_log-$(basename "${0}" .sh)-$(date +%s)"
-
-
-test -x "${SH_ARG_HAPROXY}" || exit 1
-mkdir -p "${SH_LOG_DIR}"    || exit 2
-
-echo "executing: ${SH_ARG_HAPROXY} ${SH_ARGS}" >${SH_LOG}
-"${SH_ARG_HAPROXY}" ${SH_ARGS} >>"${SH_LOG}" 2>&1

diff --git a/addons/otel/test/run-cmp.sh b/addons/otel/test/run-cmp.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0bf0176199ad53b261233711b4b21728102f5d55
--- /dev/null
+++ b/addons/otel/test/run-cmp.sh
@@ -0,0 +1 @@
+run-test-config.sh
\ No newline at end of file

diff --git a/addons/otel/test/run-ctx.sh b/addons/otel/test/run-ctx.sh
deleted file mode 100755 (executable)
index 70cb87a2d336f7c919480cb3486e6b2493d91a2c..0000000000000000000000000000000000000000
--- a/addons/otel/test/run-ctx.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -u
-#
-# Copyright 2026 HAProxy Technologies, Miroslav Zagorac <mzagorac@haproxy.com>
-#
-SH_ARG_HAPROXY="${1:-$(realpath -L ${PWD}/../../../haproxy)}"
-SH_ARG_PIDFILE="${2:-haproxy.pid}"
-       SH_ARGS="-f haproxy-common.cfg -f ctx/haproxy.cfg -p "${SH_ARG_PIDFILE}""
-    SH_LOG_DIR="_logs"
-        SH_LOG="${SH_LOG_DIR}/_log-$(basename "${0}" .sh)-$(date +%s)"
-
-
-test -x "${SH_ARG_HAPROXY}" || exit 1
-mkdir -p "${SH_LOG_DIR}"    || exit 2
-
-echo "executing: ${SH_ARG_HAPROXY} ${SH_ARGS}" >${SH_LOG}
-"${SH_ARG_HAPROXY}" ${SH_ARGS} >>"${SH_LOG}" 2>&1

diff --git a/addons/otel/test/run-ctx.sh b/addons/otel/test/run-ctx.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0bf0176199ad53b261233711b4b21728102f5d55
--- /dev/null
+++ b/addons/otel/test/run-ctx.sh
@@ -0,0 +1 @@
+run-test-config.sh
\ No newline at end of file

diff --git a/addons/otel/test/run-empty.sh b/addons/otel/test/run-empty.sh
new file mode 120000 (symlink)
index 0000000..0bf0176
--- /dev/null
+++ b/addons/otel/test/run-empty.sh
@@ -0,0 +1 @@
+run-test-config.sh
\ No newline at end of file

diff --git a/addons/otel/test/run-fe-be.sh b/addons/otel/test/run-fe-be.sh
index 1248338edd46f072c39a0fdb7cf9b475a9326e27..6146951e3364f8bc54554a35c28bec668009fe44 100755 (executable)
--- a/addons/otel/test/run-fe-be.sh
+++ b/addons/otel/test/run-fe-be.sh
@@ -4,8 +4,6 @@
 #
 SH_ARG_HAPROXY="${1:-$(realpath -L ${PWD}/../../../haproxy)}"
 SH_ARG_PIDFILE="${2:-haproxy.pid}"
-    SH_ARGS_FE="-f haproxy-common.cfg -f fe/haproxy.cfg -p "${SH_ARG_PIDFILE}""
-    SH_ARGS_BE="-f haproxy-common.cfg -f be/haproxy.cfg -p "${SH_ARG_PIDFILE}""
        SH_TIME="$(date +%s)"
     SH_LOG_DIR="_logs"
      SH_LOG_FE="${SH_LOG_DIR}/_log-$(basename "${0}" fe-be.sh)fe-${SH_TIME}"
@@ -39,11 +37,13 @@ test -x "${SH_ARG_HAPROXY}" || __exit "${SH_ARG_HAPROXY}: executable does not ex
 mkdir -p "${SH_LOG_DIR}"    || __exit "${SH_ARG_HAPROXY}: cannot create log directory" 2
 
 echo "\n------------------------------------------------------------------------"
-echo "--- executing: ${SH_ARG_HAPROXY} ${SH_ARGS_BE}" >${SH_LOG_BE}
-"${SH_ARG_HAPROXY}" ${SH_ARGS_BE} >>"${SH_LOG_BE}" 2>&1 &
+set -- -f haproxy-common.cfg -f be/haproxy.cfg -p "${SH_ARG_PIDFILE}"
+echo "--- executing: ${SH_ARG_HAPROXY} ${@}" >${SH_LOG_BE}
+"${SH_ARG_HAPROXY}" "${@}" >>"${SH_LOG_BE}" 2>&1 &
 
-echo "--- executing: ${SH_ARG_HAPROXY} ${SH_ARGS_FE}" >${SH_LOG_FE}
-"${SH_ARG_HAPROXY}" ${SH_ARGS_FE} >>"${SH_LOG_FE}" 2>&1 &
+set -- -f haproxy-common.cfg -f fe/haproxy.cfg -p "${SH_ARG_PIDFILE}"
+echo "--- executing: ${SH_ARG_HAPROXY} ${@}" >${SH_LOG_FE}
+"${SH_ARG_HAPROXY}" "${@}" >>"${SH_LOG_FE}" 2>&1 &
 echo "------------------------------------------------------------------------\n"
 
 echo "Press CTRL-C to quit..."

diff --git a/addons/otel/test/run-full.sh b/addons/otel/test/run-full.sh
deleted file mode 100755 (executable)
index bfa9b1967628c7bc301d48b5494e3100c5a4db26..0000000000000000000000000000000000000000
--- a/addons/otel/test/run-full.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -u
-#
-# Copyright 2026 HAProxy Technologies, Miroslav Zagorac <mzagorac@haproxy.com>
-#
-SH_ARG_HAPROXY="${1:-$(realpath -L ${PWD}/../../../haproxy)}"
-SH_ARG_PIDFILE="${2:-haproxy.pid}"
-       SH_ARGS="-f haproxy-common.cfg -f full/haproxy.cfg -p "${SH_ARG_PIDFILE}""
-    SH_LOG_DIR="_logs"
-        SH_LOG="${SH_LOG_DIR}/_log-$(basename "${0}" .sh)-$(date +%s)"
-
-
-test -x "${SH_ARG_HAPROXY}" || exit 1
-mkdir -p "${SH_LOG_DIR}"    || exit 2
-
-echo "executing: ${SH_ARG_HAPROXY} ${SH_ARGS}" >${SH_LOG}
-"${SH_ARG_HAPROXY}" ${SH_ARGS} >>"${SH_LOG}" 2>&1

diff --git a/addons/otel/test/run-full.sh b/addons/otel/test/run-full.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0bf0176199ad53b261233711b4b21728102f5d55
--- /dev/null
+++ b/addons/otel/test/run-full.sh
@@ -0,0 +1 @@
+run-test-config.sh
\ No newline at end of file

diff --git a/addons/otel/test/run-sa.sh b/addons/otel/test/run-sa.sh
deleted file mode 100755 (executable)
index 27849c678d4561dcf8e1b692e1ac2da16235355a..0000000000000000000000000000000000000000
--- a/addons/otel/test/run-sa.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -u
-#
-# Copyright 2026 HAProxy Technologies, Miroslav Zagorac <mzagorac@haproxy.com>
-#
-SH_ARG_HAPROXY="${1:-$(realpath -L ${PWD}/../../../haproxy)}"
-SH_ARG_PIDFILE="${2:-haproxy.pid}"
-       SH_ARGS="-f haproxy-common.cfg -f sa/haproxy.cfg -p "${SH_ARG_PIDFILE}""
-    SH_LOG_DIR="_logs"
-        SH_LOG="${SH_LOG_DIR}/_log-$(basename "${0}" .sh)-$(date +%s)"
-
-
-test -x "${SH_ARG_HAPROXY}" || exit 1
-mkdir -p "${SH_LOG_DIR}"    || exit 2
-
-echo "executing: ${SH_ARG_HAPROXY} ${SH_ARGS}" >${SH_LOG}
-"${SH_ARG_HAPROXY}" ${SH_ARGS} >>"${SH_LOG}" 2>&1

diff --git a/addons/otel/test/run-sa.sh b/addons/otel/test/run-sa.sh
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0bf0176199ad53b261233711b4b21728102f5d55
--- /dev/null
+++ b/addons/otel/test/run-sa.sh
@@ -0,0 +1 @@
+run-test-config.sh
\ No newline at end of file

diff --git a/addons/otel/test/run-test-config.sh b/addons/otel/test/run-test-config.sh
new file mode 100755 (executable)
index 0000000..9c46608
--- /dev/null
+++ b/addons/otel/test/run-test-config.sh
@@ -0,0 +1,18 @@
+#!/bin/sh -u
+#
+# Copyright 2026 HAProxy Technologies, Miroslav Zagorac <mzagorac@haproxy.com>
+#
+SH_ARG_HAPROXY="${1:-$(realpath -L ${PWD}/../../../haproxy)}"
+SH_ARG_PIDFILE="${2:-haproxy.pid}"
+       SH_NAME="$(basename "${0}" .sh)"
+    SH_CONFDIR="${SH_NAME#run-}"
+    SH_LOG_DIR="_logs"
+        SH_LOG="${SH_LOG_DIR}/_log-${SH_NAME}-$(date +%s)"
+
+
+test -x "${SH_ARG_HAPROXY}" || exit 1
+mkdir -p "${SH_LOG_DIR}"    || exit 2
+
+set -- -f haproxy-common.cfg -f "${SH_CONFDIR}/haproxy.cfg" -p "${SH_ARG_PIDFILE}"
+echo "executing: ${SH_ARG_HAPROXY} ${@}" >${SH_LOG}
+"${SH_ARG_HAPROXY}" "${@}" >>"${SH_LOG}" 2>&1