fix: broken implementation and tests

Unfortunately it appears I didn't manually test well enough. I've now
fixed how the arguments are forwarded to the `code-server` CLI. I've
also fixed any tests that broke due to the change.

Author: DanielleMaywood

src/code-server/install.sh

@@ -23,70 +23,67 @@ if [[ -n $WORKSPACE ]]; then
     CODE_SERVER_WORKSPACE="$WORKSPACE"
 fi
 
-DISABLE_FLAGS=()
+FLAGS=()
+FLAGS+=(--auth "$AUTH")
+FLAGS+=(--bind-addr "$HOST:$PORT")
 
 if [[ "$DISABLEFILEDOWNLOADS" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-file-downloads)
+    FLAGS+=(--disable-file-downloads)
 fi
 
 if [[ "$DISABLEFILEUPLOADS" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-file-uploads)
+    FLAGS+=(--disable-file-uploads)
 fi
 
 if [[ "$DISABLEGETTINGSTARTEDOVERRIDE" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-getting-started-override)
+    FLAGS+=(--disable-getting-started-override)
 fi
 
 if [[ "$DISABLEPROXY" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-proxy)
+    FLAGS+=(--disable-proxy)
 fi
 
 if [[ "$DISABLETELEMETRY" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-telemetry)
+    FLAGS+=(--disable-telemetry)
 fi
 
 if [[ "$DISABLEUPDATECHECK" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-update-check)
+    FLAGS+=(--disable-update-check)
 fi
 
 if [[ "$DISABLEWORKSPACETRUST" == "true" ]]; then
-    DISABLE_FLAGS+=(--disable-workspace-trust)
+    FLAGS+=(--disable-workspace-trust)
 fi
 
-CERT_FLAGS=()
-
 if [[ -n "$CERT" ]]; then
-    CERT_FLAGS+=(--cert "$CERT")
+    FLAGS+=(--cert "$CERT")
 fi
 
 if [[ -n "$CERTHOST" ]]; then
-    CERT_FLAGS+=(--cert-host "$CERTHOST")
+    FLAGS+=(--cert-host "$CERTHOST")
 fi
 
 if [[ -n "$CERTKEY" ]]; then
-    CERT_FLAGS+=(--cert-key "$CERTKEY")
+    FLAGS+=(--cert-key "$CERTKEY")
 fi
 
-SOCKET_FLAGS=()
-
 if [[ -n "$SOCKET" ]]; then
-    SOCKET_FLAGS+=(--socket "$SOCKET")
+    FLAGS+=(--socket "$SOCKET")
 fi
 
 if [[ -n "$SOCKETMODE" ]]; then
-    SOCKET_FLAGS+=(--socket-mode "$SOCKETMODE")
+    FLAGS+=(--socket-mode "$SOCKETMODE")
 fi
 
-cat > /usr/local/bin/code-server-entrypoint \
-<< EOF
+cat > /usr/local/bin/code-server-entrypoint <<EOF
 #!/usr/bin/env bash
 set -e
 
-$(declare -p DISABLE_FLAGS)
-$(declare -p CERT_FLAGS)
-$(declare -p SOCKET_FLAGS)
+$(declare -p FLAGS)
+
+CMD="code-server \${FLAGS[@]} \"$CODE_SERVER_WORKSPACE\""
 
-su $_REMOTE_USER -c 'code-server --auth "$AUTH" --bind-addr "$HOST:$PORT" "\${DISABLE_FLAGS[@]}" "\${CERT_FLAGS[@]}" "\${SOCKET_FLAGS[@]}" "$CODE_SERVER_WORKSPACE"'
+su $_REMOTE_USER -c "\$CMD"
 EOF
 
 chmod +x /usr/local/bin/code-server-entrypoint

test/code-server/code-server-auth-none.sh

@@ -9,7 +9,7 @@ check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
 check "code-server listening" lsof -i "@127.0.0.1:8080"
 
-check "code-server auth" grep $'\'code-server.* --auth "none" .*\'' < /usr/local/bin/code-server-entrypoint
+check "code-server auth" grep '"--auth".*"none"' < /usr/local/bin/code-server-entrypoint
 
 # Report results
 reportResults

test/code-server/code-server-auth-password.sh

@@ -9,7 +9,7 @@ check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
 check "code-server listening" lsof -i "@127.0.0.1:8080"
 
-check "code-server auth" grep $'\'code-server.* --auth "password" .*\'' < /usr/local/bin/code-server-entrypoint
+check "code-server auth" grep '"--auth".*"password"' < /usr/local/bin/code-server-entrypoint
 
 # Report results
 reportResults

test/code-server/code-server-cert.sh

@@ -4,15 +4,13 @@ set -e
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
 
-cat /usr/local/bin/code-server-entrypoint
-
 # Feature-specific tests
 check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
 check "code-server listening" lsof -i "@127.0.0.1:8080"
 
-check "code-server cert" grep '"--cert".*"/path/to/cert.pem"' < /usr/local/bin/code-server-entrypoint
-check "code-server cert-key" grep '"--cert-key".*"/path/to/key.pem"' < /usr/local/bin/code-server-entrypoint
+check "code-server cert" grep '"--cert".*"/home/vscode/cert.pem"' < /usr/local/bin/code-server-entrypoint
+check "code-server cert-key" grep '"--cert-key".*"/home/vscode/key.pem"' < /usr/local/bin/code-server-entrypoint
 
 # Report results
 reportResults

test/code-server/code-server-cert/Dockerfile

@@ -0,0 +1,3 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu
+
+RUN su vscode -c "openssl req -x509 -newkey rsa:4096 -keyout /home/vscode/key.pem -out /home/vscode/cert.pem -sha256 -days 1 -nodes -subj \"/C=XX/ST=Texas/L=Austin/O=Coder/OU=Engineering/CN=dev.coder.com\""

test/code-server/code-server-modified-port.sh

@@ -9,5 +9,6 @@ check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
 check "code-server listening" lsof -i "@127.0.0.1:1234"
 
+
 # Report results
 reportResults

test/code-server/code-server-socket-with-mode.sh

@@ -4,15 +4,12 @@ set -e
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
 
-cat /usr/local/bin/code-server-entrypoint
-
 # Feature-specific tests
 check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
-check "code-server listening" lsof -i "@127.0.0.1:8080"
 
-check "code-server socket" grep '"--socket".*"/tmp/code-server.sock"' < /usr/local/bin/code-server-entrypoint
-check "code-server socket-mode" grep '"--socket-mode".*"777"' < /usr/local/bin/code-server-entrypoint
+check "code-server socket" test -S /tmp/code-server.sock
+check "code-server socket-mode" grep '0777' <<< $(stat /tmp/code-server.sock)
 
 # Report results
 reportResults

test/code-server/code-server-socket.sh

@@ -4,14 +4,12 @@ set -e
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
 
-cat /usr/local/bin/code-server-entrypoint
-
 # Feature-specific tests
 check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
-check "code-server listening" lsof -i "@127.0.0.1:8080"
 
-check "code-server socket" grep '"--socket".*"/tmp/code-server.sock"' < /usr/local/bin/code-server-entrypoint
+check "code-server socket" test -S /tmp/code-server.sock
+# check "code-server socket-mode" grep '0755' <<< $(stat /tmp/code-server.sock)
 
 # Report results
-reportResults
+reportResults

test/code-server/code-server-workspace.sh

@@ -9,7 +9,7 @@ check "code-server version" code-server --version
 check "code-server running" pgrep -f 'code-server/lib/node.*/code-server'
 check "code-server listening" lsof -i "@127.0.0.1:8080"
 
-check "code-server workspace" grep $'\'code-server.*"/home"\'' < /usr/local/bin/code-server-entrypoint
+check "code-server workspace" grep $'/home' < /usr/local/bin/code-server-entrypoint
 
 # Report results
 reportResults

test/code-server/scenarios.json

@@ -126,11 +126,13 @@
         }
     },
     "code-server-cert": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "build": {
+            "dockerfile": "Dockerfile"
+        },
         "features": {
             "code-server": {
-                "cert": "/path/to/cert.pem",
-                "certKey": "/path/to/key.pem"
+                "cert": "/home/vscode/cert.pem",
+                "certKey": "/home/vscode/key.pem"
             }
         }
     },