Fix Heroku CLI

src/heroku-cli/devcontainer-feature.json

@@ -1,15 +1,15 @@
 {
     "name": "Heroku CLI (via cli-assets.heroku.com)",
     "id": "heroku-cli",
-    "version": "1.0.2",
-    "description": "Heroku CLI allows you to interact with the Heroku API via the command line",
+    "version": "1.0.3",
+    "description": "Heroku CLI allows you to interact with the Heroku API via the command line (version 8 and above)",
     "documentationURL": "https://github.com/devcontainers-extra/features/tree/main/src/heroku-cli",
     "options": {
         "version": {
             "type": "string",
             "proposals": [
                 "latest",
-                "7.60.1"
+                "9.3.2"
             ],
             "default": "latest",
             "description": "Select the Heroku CLI version you would like to install"

src/heroku-cli/install.sh

@@ -22,6 +22,8 @@ if [ "$ARCH" == "x86_64" ]; then
 	ARCH=x64
 elif [[ "$ARCH" == aarch* ]]; then
 	ARCH=arm
+elif [[ "$ARCH" == "arm64" ]]; then
+	ARCH=arm64
 else
 	echo -e "unsupported arch: $ARCH"
 	exit 1
@@ -39,7 +41,7 @@ check_packages() {
 }
 
 # make sure we have curl
-check_packages ca-certificates curl
+check_packages ca-certificates curl jq
 
 # make sure /usr/local/lib exists
 mkdir -p /usr/local/lib
@@ -50,11 +52,18 @@ rm -rf ~/.local/share/heroku/client
 rm -f $(command -v heroku) || true
 rm -f /usr/local/bin/heroku
 
-# resolve download url based on version, this is not documented and prune to break if heroku change their naming convensions
+# resolve heroku download url with asset JSON: https://github.com/heroku/cli/issues/2477
+# works with version 8 and up
 if [ "${HEROKU_CLI_VERSION}" == "latest" ]; then
-	DOWNLOAD_URL=https://cli-assets.heroku.com/heroku-linux-$ARCH.tar.gz
+	DOWNLOAD_URL=https://cli-assets.heroku.com/channels/stable/heroku-linux-$ARCH.tar.gz
 else
-	DOWNLOAD_URL=https://cli-assets.heroku.com/heroku-v${HEROKU_CLI_VERSION}/heroku-v${HEROKU_CLI_VERSION}-linux-${ARCH}.tar.gz
+	ASSET_PATH_URL=https://cli-assets.heroku.com/versions/heroku-linux-${ARCH}-tar-gz.json
+	DOWNLOAD_URL=$(curl -sSL $ASSET_PATH_URL | jq -r ".[\"$HEROKU_CLI_VERSION\"] | select(.)")
+
+	if [ -z "$DOWNLOAD_URL" ]; then
+		echo "Invalid version and arch: $HEROKU_CLI_VERSION, $ARCH"
+		exit 1
+	fi
 fi
 
 # download binary, untar and ln into /usr/local/bin

test/heroku-cli/scenarios.json

@@ -4,5 +4,13 @@
         "features": {
             "heroku-cli": {}
         }
+    },
+    "test_non_latest_version": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "heroku-cli": {
+                "version": "9.3.1"
+            }
+        }
     }
 }

test/heroku-cli/test.sh

@@ -4,6 +4,6 @@ set -e
 
 source dev-container-features-test-lib
 
-check "heroku existance" heroku version
+check "heroku existence" heroku version
 
 reportResults

test/heroku-cli/test_non_latest_version.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+source dev-container-features-test-lib
+
+check "heroku existence" heroku version
+check "heroku CLI version is equal to 9.3.1" sh -c "heroku version | grep '9.3.1'"
+
+reportResults