mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Replaced SH_ARGS variables with 'set --' and "${@}" to ensure proper
quoting of haproxy command-line arguments.
This commit is contained in:
Miroslav Zagorac 2026-04-15 04:37:38 +02:00 committed by Willy Tarreau
parent 00c2348ef3
commit 03df1fe3c9
7 changed files with 29 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/otel/test/run-cmp.sh
View File

@ -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

1
addons/otel/test/run-cmp.sh Symbolic link
View File

@ -0,0 +1 @@
run-test-config.sh

16
addons/otel/test/run-ctx.sh
View File

@ -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

1
addons/otel/test/run-ctx.sh Symbolic link
View File

@ -0,0 +1 @@
run-test-config.sh

1
addons/otel/test/run-empty.sh Symbolic link
View File

@ -0,0 +1 @@
run-test-config.sh

12
addons/otel/test/run-fe-be.sh
View File

@ -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..."

16
addons/otel/test/run-full.sh
View File

@ -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

1
addons/otel/test/run-full.sh Symbolic link
View File

@ -0,0 +1 @@
run-test-config.sh

16
addons/otel/test/run-sa.sh
View File

@ -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

1
addons/otel/test/run-sa.sh Symbolic link
View File

@ -0,0 +1 @@
run-test-config.sh

18
addons/otel/test/run-test-config.sh Executable file
View File

@ -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