Skip to content

Docker: Fix regression SE_NODE_STEREOTYPE_EXTRA could not merge stereotypes #2971

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 1 commit into from
Oct 2, 2025
Merged

Docker: Fix regression SE_NODE_STEREOTYPE_EXTRA could not merge stereotypes #2971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions NodeBase/generate_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ function backup_original_env_vars() {

# Backup original value if not already backed up
if [[ -z "${!backup_var}" ]] && [[ -n "${!common_var}" ]]; then
eval "${backup_var}=\"${!common_var}\""
# Use printf -v to avoid eval and preserve quotes verbatim
printf -v "$backup_var" '%s' "${!common_var}"
echo "Backed up original ${common_var}=${!common_var} to ${backup_var}"
fi
done
Expand All @@ -43,11 +44,11 @@ function restore_original_env_vars() {

# Restore original value if backup exists
if [[ -n "${!backup_var}" ]]; then
eval "${common_var}=\"${!backup_var}\""
printf -v "$common_var" '%s' "${!backup_var}"
echo "Restored original ${backup_var}=${!backup_var} to ${common_var}"
else
# Clear the variable if no backup exists
eval "${common_var}=\"\""
printf -v "$common_var" '%s' ""
echo "Cleared ${common_var} (no original backup)"
fi
done
Expand All @@ -64,12 +65,12 @@ function assign_browser_specific_env_vars() {

# Check if the browser-specific environment variable exists
if [[ -n "${!browser_specific_var}" ]]; then
# Assign the browser-specific value to the common variable
eval "${common_var}=\"${!browser_specific_var}\""
# Assign the browser-specific value to the common variable, preserving quotes
printf -v "$common_var" '%s' "${!browser_specific_var}"
echo "Assigned ${browser_specific_var}=${!browser_specific_var} to ${common_var}"
elif [[ -n "${!backup_var}" ]]; then
# Inherit original value if browser-specific value is not set
eval "${common_var}=\"${!backup_var}\""
printf -v "$common_var" '%s' "${!backup_var}"
echo "Inherited original ${backup_var}=${!backup_var} to ${common_var}"
fi
done
Expand Down Expand Up @@ -178,6 +179,10 @@ if [ -d "/opt/selenium/browsers" ]; then
echo "[[node.driver-configuration]]" >>"$FILENAME"
echo "display-name = \"${SE_NODE_BROWSER_NAME}\"" >>"$FILENAME"
echo "stereotype = '${SE_NODE_STEREOTYPE}'" >>"$FILENAME"
# Validate SE_NODE_MAX_SESSIONS is a positive integer
if [[ "${SE_NODE_MAX_SESSIONS}" =~ ^[0-9]+$ ]] && [[ "${SE_NODE_MAX_SESSIONS}" -gt 0 ]]; then
echo "max-sessions = ${SE_NODE_MAX_SESSIONS}" >>"$FILENAME"
fi
echo "" >>"$FILENAME"
fi

Expand Down
Loading