Skip to content

Fix shellcheck warnings in selenium component scripts (backport #14860) #14869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 30, 2025
+13 −5
Merged

Fix shellcheck warnings in selenium component scripts (backport #14860) #14869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d7967
Fix selenium prodkeycloak-proxy
Zerpet Oct 30, 2025
8ab8d8c
Fix critical shellcheck issues in selenium component scripts
Zerpet Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions selenium/bin/components/devkeycloak-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_devkeycloak-proxy() {
Expand Down
2 changes: 2 additions & 0 deletions selenium/bin/components/forward-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_forward-proxy() {
Expand Down
2 changes: 1 addition & 1 deletion selenium/bin/components/other-rabbitmq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ start_local_other_rabbitmq() {

print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp/other$MOUNT_RABBITMQ_CONF"
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/other/etc/rabbitmq/
RABBITMQ_ENABLED_PLUGINS=`cat /tmp/other/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}'`
RABBITMQ_ENABLED_PLUGINS=$(cat /tmp/other/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}')
print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS"

${BIN_DIR}/gen-advanced-config "${PROFILES_FOR_OTHER}" ${RABBITMQ_CONFIG_DIR} $OTHER_ENV_FILE /tmp/other$MOUNT_ADVANCED_CONFIG
Expand Down
6 changes: 5 additions & 1 deletion selenium/bin/components/prodkeycloak-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_prodkeycloak-proxy() {
Expand All @@ -7,6 +9,7 @@ ensure_prodkeycloak-proxy() {
start_prodkeycloak-proxy
fi
}

init_prodkeycloak-proxy() {
HTTPD_CONFIG_DIR=${TEST_CONFIG_DIR}/prodkeycloak-proxy
PROXY_HOSTNAME=prodkeycloak-proxy
Expand All @@ -17,6 +20,7 @@ init_prodkeycloak-proxy() {
print "> PROXY_PORT: ${PROXY_PORT}"

print "> HTTPD_DOCKER_IMAGE: ${HTTPD_DOCKER_IMAGE}"
}

start_prodkeycloak-proxy() {
begin "Starting prodkeycloak-proxy ..."
Expand All @@ -27,7 +31,7 @@ start_prodkeycloak-proxy() {
MOUNT_HTTPD_CONFIG_DIR=$CONF_DIR/httpd

mkdir -p $MOUNT_HTTPD_CONFIG_DIR
${BIN_DIR}/gen-httpd-conf ${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
${BIN_DIR}/gen-httpd-conf" "${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
print "> EFFECTIVE HTTPD_CONFIG_FILE: $MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
cp ${HTTPD_CONFIG_DIR}/.htpasswd $MOUNT_HTTPD_CONFIG_DIR

Expand Down
2 changes: 2 additions & 0 deletions selenium/bin/components/proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}

ensure_proxy() {
Expand Down
4 changes: 1 addition & 3 deletions selenium/bin/components/rabbitmq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env bash

SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"


init_rabbitmq() {
RABBITMQ_CONFIG_DIR=${TEST_CONFIG_DIR}
Expand Down Expand Up @@ -70,7 +68,7 @@ start_local_rabbitmq() {

print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF"
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}'`
RABBITMQ_ENABLED_PLUGINS=$(cat /tmp/etc/rabbitmq/enabled_plugins | tr -d " \t\n\r" | awk -F'[][]' '{print $2}')
print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS"

${BIN_DIR}/gen-advanced-config "${PROFILES}" ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG
Expand Down
Loading