yamanin/registry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve VSCode-web settings merge with existing configurations

Browse Source 
Enhance the settings handling in the VSCode-web module to properly merge
user-defined settings with any existing settings file using jq when available.
This ensures that settings from both the Terraform module and Coder's git
authentication system are preserved.

Related to coder/coder#19007

Co-authored-by: matifali <10648092+matifali@users.noreply.github.com>
This commit is contained in:
blink-so[bot] 2025-07-23 03:46:12 +00:00
parent 9ed5084bfb
commit 5750468a57
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
registry/coder/modules/vscode-web/run.sh
View File

@ -28,10 +28,27 @@ run_vscode_web() {
"$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH_ARG" "$DISABLE_TRUST_ARG" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 & "$VSCODE_WEB" serve-local "$EXTENSION_ARG" "$SERVER_BASE_PATH_ARG" "$DISABLE_TRUST_ARG" --port "${PORT}" --host 127.0.0.1 --accept-server-license-terms --without-connection-token --telemetry-level "${TELEMETRY_LEVEL}" > "${LOG_PATH}" 2>&1 &
} }
# Check if the settings file exists... # Merge settings with any existing settings file
if [ ! -f ~/.vscode-server/data/Machine/settings.json ]; then echo "⚙️ Configuring VS Code settings..."
echo "⚙️ Creating settings file..." mkdir -p ~/.vscode-server/data/Machine
mkdir -p ~/.vscode-server/data/Machine
SETTINGS_FILE="~/.vscode-server/data/Machine/settings.json"
if [ -f ~/.vscode-server/data/Machine/settings.json ]; then
# Merge with existing settings using jq if available
if command -v jq > /dev/null 2>&1; then
echo "📝 Merging with existing settings..."
# Create a temporary file with the new settings
echo "${SETTINGS}" > /tmp/new_settings.json
# Merge existing settings with new settings (new settings take precedence)
jq -s '.[0] * .[1]' ~/.vscode-server/data/Machine/settings.json /tmp/new_settings.json > /tmp/merged_settings.json
mv /tmp/merged_settings.json ~/.vscode-server/data/Machine/settings.json
rm -f /tmp/new_settings.json
else
echo "⚠️ jq not available, overwriting existing settings..."
echo "${SETTINGS}" > ~/.vscode-server/data/Machine/settings.json
fi
else
echo "📝 Creating new settings file..."
echo "${SETTINGS}" > ~/.vscode-server/data/Machine/settings.json echo "${SETTINGS}" > ~/.vscode-server/data/Machine/settings.json
fi fi