Quality sweep: build integrity, script robustness and stale defaults (#1134)

Author: frenck

.github/renovate.json

@@ -94,9 +94,9 @@
     {
       "customType": "regex",
       "managerFilePatterns": ["/vscode/vscode.extensions$/"],
-      "matchStrings": ["netcorext\\.uuid-generator#(?<currentValue>.+)\\s"],
+      "matchStrings": ["redhat\\.vscode-yaml#(?<currentValue>.+)\\s"],
       "datasourceTemplate": "github-releases",
-      "depNameTemplate": "arenchen/vscode-uuid-generator"
+      "depNameTemplate": "redhat-developer/vscode-yaml"
     },
     {
       "customType": "regex",

vscode/.README.j2

@@ -1,4 +1,4 @@
-# Home Assistant Community App: Visual Studio Code
+# Home Assistant Community App: Studio Code Server
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 

vscode/DOCS.md

@@ -72,7 +72,7 @@ When not configured, the app will automatically use the default: `/config`
 
 ### Option: `packages`
 
-Allows you to specify additional [Ubuntu packages][ubuntu-packages] to be
+Allows you to specify additional [Debian packages][debian-packages] to be
 installed in your shell environment (e.g., Python, PHP, Go).
 
 **Note**: _Adding many packages will result in a longer start-up
@@ -234,6 +234,7 @@ SOFTWARE.
 [addon]: https://my.home-assistant.io/redirect/supervisor_addon/?addon=a0d7b954_vscode&repository_url=https%3A%2F%2Fgithub.com%2Fhassio-addons%2Frepository
 [code-server]: https://github.com/coder/code-server
 [contributors]: https://github.com/hassio-addons/app-vscode/graphs/contributors
+[debian-packages]: https://packages.debian.org
 [discord-ha]: https://discord.gg/c5DvZ4e
 [discord]: https://discord.me/hassioaddons
 [forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck
@@ -243,4 +244,3 @@ SOFTWARE.
 [reddit]: https://reddit.com/r/homeassistant
 [releases]: https://github.com/hassio-addons/app-vscode/releases
 [semver]: https://semver.org/spec/v2.0.0
-[ubuntu-packages]: https://packages.ubuntu.com

vscode/Dockerfile

@@ -2,7 +2,7 @@ ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:9.4.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
-# Confiure locale
+# Configure locale
 ENV \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
@@ -22,7 +22,6 @@ COPY vscode.extensions /root/vscode.extensions
 ARG BUILD_ARCH=amd64
 ARG CODE_SERVER_VERSION="v4.135.0"
 ARG HA_CLI_VERSION="5.4.0"
-# hadolint ignore=SC2181, DL3008
 RUN \
     apt-get update \
     \
@@ -53,11 +52,11 @@ RUN \
     && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
     && locale-gen \
     \
-    && curl https://bootstrap.pypa.io/get-pip.py | python3 \
+    && curl -fsSL https://bootstrap.pypa.io/get-pip.py | python3 \
     \
     && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \
     && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="amd64"; fi \
-    && curl -J -L -o /tmp/code.tar.gz \
+    && curl -f -J -L -o /tmp/code.tar.gz \
         "https://github.com/coder/code-server/releases/download/${CODE_SERVER_VERSION}/code-server-${CODE_SERVER_VERSION#v}-linux-${ARCH}.tar.gz" \
     && mkdir -p /usr/local/lib/code-server \
     && tar zxvf \
@@ -69,27 +68,27 @@ RUN \
     && mkdir -p /root/.code-server/extensions \
     && uuid=$(uuidgen) \
     && while read -r ext; do \
-        extention="${ext%%#*}" \
-        vendor="${extention%%.*}"; \
-        slug="${extention#*.}"; \
+        extension="${ext%%#*}"; \
+        vendor="${extension%%.*}"; \
+        slug="${extension#*.}"; \
         version="${ext##*#}"; \
         \
         echo "Installing vscode extension: ${slug} by ${vendor} @ ${version} "; \
         \
         echo "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \
-        curl -JL --retry 5 -o "/tmp/${extention}-${version}.vsix" \
+        curl -fJL --retry 5 -o "/tmp/${extension}-${version}.vsix" \
             -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \
             -H "x-market-user-id: ${uuid}" \
             "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \
-        mkdir -p "/usr/local/lib/code-server/lib/vscode/extensions/${extention}-${version}"; \
-        bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \
-                    -C "/usr/local/lib/code-server/lib/vscode/extensions/${extention}-${version}" extension; \
-        [ $? -ne 0 ] && exit 1; \
+        mkdir -p "/usr/local/lib/code-server/lib/vscode/extensions/${extension}-${version}"; \
+        bsdtar --strip-components=1 -xf "/tmp/${extension}-${version}.vsix" \
+                    -C "/usr/local/lib/code-server/lib/vscode/extensions/${extension}-${version}" extension \
+            || exit 1; \
         sleep 1; \
     done < /root/vscode.extensions \
     && ls -la /usr/local/lib/code-server/lib/vscode/extensions/ \
     \
-    && curl -L -s -o /usr/bin/ha \
+    && curl -fsSL -o /usr/bin/ha \
         "https://github.com/home-assistant/cli/releases/download/${HA_CLI_VERSION}/ha_${BUILD_ARCH}" \
     && chmod a+x /usr/bin/ha \
     \
@@ -117,8 +116,10 @@ RUN \
         uuid-runtime \
     \
     && find /usr/local \
-        \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \
-        -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
+        \( \
+            \( -type d -a \( -name test -o -name tests -o -name '__pycache__' \) \) \
+            -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
+        \) \
         -exec rm -rf '{}' + \
     \
     && rm -fr \

vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run

@@ -21,6 +21,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     b28a299111ac74cc9498f76ce2cb437b2cf5e8e7bb9388d9929347e2948bd56591bd499d5de04638553f6e12fa77c53320a046e96cffce9fa4f8c924d5c91581
     dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
+    4af003224345302a7f04cf40703554da5a1d8baba512dcb16cf50147f33cf06199f9ef1ddde5a2ecbc5e923ca02d1316ae62588aa9fc439a6cd994576a2b019d
 )
 
 if bashio::config.has_value 'config_path'; then

vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run

@@ -23,6 +23,8 @@ if bashio::services.available "mqtt"; then
     echo "--username ${username}"
   } > /root/.config/mosquitto_sub
 
-  ln -s /root/.config/mosquitto_sub /root/.config/mosquitto_pub
-  ln -s /root/.config/mosquitto_sub /root/.config/mosquitto_rr
+  ln -sf /root/.config/mosquitto_sub /root/.config/mosquitto_pub \
+    || bashio::log.warning 'Failed linking the mosquitto_pub configuration'
+  ln -sf /root/.config/mosquitto_sub /root/.config/mosquitto_rr \
+    || bashio::log.warning 'Failed linking the mosquitto_rr configuration'
 fi

vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run

@@ -15,7 +15,7 @@ if bashio::services.available "mysql"; then
   port=$(bashio::services "mysql" "port")
   username=$(bashio::services "mysql" "username")
 
-  mkdir -p /root/.config
+  mkdir -p /etc/mysql/conf.d
   {
     echo "[client]"
     echo "host=${host}"

vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run

@@ -97,8 +97,8 @@ fi
 
 # Install user configured/requested packages
 if bashio::config.has_value 'packages'; then
-    apt update \
-        || bashio::exit.nok 'Failed updating Ubuntu packages repository indexes'
+    apt-get update \
+        || bashio::exit.nok 'Failed updating Debian package repository indexes'
 
     for package in $(bashio::config 'packages'); do
         apt-get install -y "$package" \

vscode/rootfs/root/.code-server/settings.json

@@ -86,12 +86,15 @@
   },
   "editor.renderWhitespace": "boundary",
   "esphome.validator": "local",
-  "telemetry.enableTelemetry": false,
+  "telemetry.telemetryLevel": "off",
   "terminal.integrated.copyOnSelection": true,
-  "terminal.integrated.shell.linux": "/usr/bin/zsh",
+  "terminal.integrated.defaultProfile.linux": "zsh",
+  "terminal.integrated.profiles.linux": {
+    "zsh": {
+      "path": "/usr/bin/zsh"
+    }
+  },
   "update.mode": "none",
-  "vsicons.dontShowNewVersionMessage": true,
-  "vsicons.projectDetection.disableDetect": true,
   "workbench.iconTheme": "vs-seti",
   "yaml.format.enable": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",