Fixed issues with ngrok and gcloud install and test scripts

Author: jmcombs

src/google-cloud-sdk/devcontainer-feature.json

@@ -1,13 +1,13 @@
 {
   "name": "google-cloud-sdk",
   "id": "google-cloud-sdk",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Installs the Google Cloud SDK and (optional) additional components.",
   "options": {
     "gcloudExtraPackages": {
       "type": "string",
       "default": "",
-      "description": "Comma-separated list of additional Google Cloud SDK components to install. Example: `google-cloud-cli-app-engine-java`"
+      "description": "Comma-separated list of additional Google Cloud SDK components to install. Example: `google-cloud-cli-app-engine-java,kubectl`"
     }
   },
   "installsAfter": ["ghcr.io/devcontainers/features/common-utils"]

src/google-cloud-sdk/install.sh

@@ -8,6 +8,10 @@ apt-get update && apt-get install -y --no-install-recommends apt-transport-https
 curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
 echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
 
+# Extract gcloudExtraPackages from environment variables
+GCLOUD_EXTRA_PACKAGES=${GCLOUDEXTRAPACKAGES:-}
+GCLOUD_EXTRA_PACKAGES=$(echo $GCLOUD_EXTRA_PACKAGES | tr ',' ' ')
+
 # Check if the OS is Ubuntu 24.04 and the architecture is arm64, and exit with a message if true
 if [ -f /etc/os-release ]; then
     . /etc/os-release

src/ngrok/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "ngrok",
   "id": "ngrok",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Globally distributed reverse proxy that secures, protects and accelerates your applications and network services, no matter where you run them.",
   "options": {
     "authtoken": {

src/ngrok/install.sh

@@ -41,9 +41,12 @@ install_ngrok() {
     && rm -f ngrok-v3-stable-linux-${ARCH}.tgz
 }
 
+# Extract authtoken from environment variables
+AUTH_TOKEN=${AUTHTOKEN:-}
+
 configure_ngrok() {
-    if [ -n "$NG_TOKEN" ]; then
-        ngrok config add-authtoken "$NG_TOKEN"
+    if [ -n "$AUTH_TOKEN" ]; then
+        ngrok config add-authtoken "$AUTH_TOKEN"
     fi
 }
 

test/google-cloud-sdk/gcloud-extra-packages.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+check "gcloud-cli installation" command -v gcloud
+check "gcloud-cli version" gcloud --version
+check "kubectl installation" command -v kubectl
+check "kubectl version" kubectl version --client
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults

test/google-cloud-sdk/scenarios.json

@@ -1,8 +1,10 @@
 {
-  "test": {
+  "gcloud-extra-packages": {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
-      "google-cloud-sdk": {}
+      "google-cloud-sdk": {
+        "gcloudExtraPackages": "google-cloud-cli-app-engine-java , kubectl"
+      }
     }
   }
 }

test/google-cloud-sdk/test.sh

@@ -1,31 +1,5 @@
 #!/bin/bash
 
-# This test file will be executed against an auto-generated devcontainer.json that
-# includes the 'ngrok' Feature with no options.
-#
-# For more information, see: https://github.com/devcontainers/cli/blob/main/docs/features/test.md
-#
-# Eg:
-# {
-#    "image": "<..some-base-image...>",
-#    "features": {
-#      "ngrok": {}
-#    },
-#    "remoteUser": "root"
-# }
-#
-# These scripts are run as 'root' by default. Although that can be changed
-# with the '--remote-user' flag.
-# 
-# This test can be run with the following command:
-#
-#    devcontainer features test \ 
-#                   --features ngrok   \
-#                   --remote-user root \
-#                   --skip-scenarios   \
-#                   --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
-#                   /path/to/this/repo
-
 set -e
 
 # Optional: Import test library bundled with the devcontainer CLI