feedback updates

Author: gauron99

.github/workflows/test-action.yml

@@ -3,7 +3,9 @@ on: [pull_request, workflow_dispatch]
 
 jobs:
   test-default:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest,windows-latest,macos-latest]
     steps:
       - uses: actions/checkout@v4
       - name: Setup func CLI
@@ -37,18 +39,31 @@ jobs:
           name: 'my-func'
       - run: my-func version
 
-  test-windows:
-    runs-on: windows-latest
+  test-custom-destination:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup func CLI
+      - name: Setup func CLI with custom destination
         uses: ./
+        with:
+          destination: '/tmp/func-bin'
       - run: func version
+      - name: Verify func using path
+        run: /tmp/func-bin/func version
 
-  test-macos:
-    runs-on: macos-latest
+  test-invalid-version:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup func CLI
+      - name: Setup func CLI with non-existing version (should fail)
+        id: invalid-version
         uses: ./
-      - run: func version
+        with:
+          version: 'v99.99.99'
+        continue-on-error: true
+      - name: Verify action failed
+        run: |
+          if [ "${{ steps.invalid-version.outcome }}" != "failure" ]; then
+            echo "Expected action to fail with invalid version"
+            exit 1
+          fi

action.yml

@@ -9,6 +9,8 @@ inputs:
     description: '(optional) Provide version to download. Any version in release pages works https://github.com/knative/func/tags'
   destination:
     description: '(optional) Provide a path where to move the desired downloaded binary, otherwise cwd is used'
+  binarySource:
+    description: '(optional) Base URL for downloading binaries. Defaults to GitHub releases. Pattern: <url-base>/<version>/<os-bin-name>'
 runs:
   using: 'node20'
   main: 'index.js'

index.js

@@ -30,27 +30,29 @@ function getOsBinName() {
 
 // Normalizes version to release tag format: knative-vX.Y.Z
 // Ex.: '1.16' or 'v1.16' will return 'knative-v1.16.0'
-function smartVersionUpdate(version){
+function smartVersionUpdate(version) {
   const versionRegex = /^(?<knprefix>knative-)?(?<prefix>v?)(?<major>\d+)\.(?<minor>\d+)(.(?<patch>\d+))?$/;
-  let match = version.match(versionRegex);
-  if (match) {
-    const knprefix = 'knative-';
-    const prefix = 'v';
-    const patch = match.groups.patch ?? 0;
-    return `${knprefix}${prefix}${match.groups.major}.${match.groups.minor}.${patch}`;
-  } 
-
-  core.setFailed(`Invalid version format (${version}). Expected format: "1.16[.X]" or "v1.16[.X]"`);
-  return undefined;
+  const match = version.match(versionRegex);
+  if (!match) {
+    throw new Error(`Invalid version format (${version}). Expected format: "1.16[.X]" or "v1.16[.X]"`);
+  }
+  const knprefix = 'knative-';
+  const prefix = 'v';
+  const patch = match.groups.patch ?? 0;
+  return `${knprefix}${prefix}${match.groups.major}.${match.groups.minor}.${patch}`;
 }
 
-// Downloads binary and makes it executable
-async function cmdConstructAndRun(url, binPath) {
-  await exec.exec('curl', ['-L', '-o', binPath, url]);
- 
+const DEFAULT_BINARY_SOURCE = 'https://github.com/knative/func/releases/download';
+
+// Downloads binary from release URL and makes it executable
+async function downloadFuncBinary(version, osBinName, binPath, binarySource) {
+  const url = `${binarySource}/${version}/${osBinName}`;
+  core.info(`Downloading from: ${url}`);
+
+  await exec.exec('curl', ['-L', '--fail', '-o', binPath, url]);
+
   if (!fs.existsSync(binPath)) {
-    core.setFailed("Download failed, couldn't find the binary on disk");
-    return;
+    throw new Error("Download failed, couldn't find the binary on disk");
   }
 
   if (process.env.RUNNER_OS !== 'Windows') {
@@ -70,35 +72,43 @@ async function addBinToPath(binPath) {
 }
 
 async function run() {
-  try {
-    const osBin = core.getInput('binary') || getOsBinName();
-    if (osBin === "unknown") {
-      core.setFailed("Invalid os binary determination, try setting it specifically using 'binary'");
-      return;
-    }
-
-    let version = core.getInput('version') || DEFAULT_FUNC_VERSION;
-    const destination = core.getInput('destination') || process.cwd();
-    let bin = core.getInput('name') || 'func';
-    if (process.env.RUNNER_OS === 'Windows' && !bin.endsWith('.exe')) {
-      bin += '.exe';
-    }
+  const osBinName = core.getInput('binary') || getOsBinName();
+  if (osBinName === "unknown") {
+    core.setFailed("Invalid os binary determination, try setting it specifically using 'binary'");
+    return;
+  }
 
-    version = smartVersionUpdate(version);
-    if (!version) return;
+  const versionInput = core.getInput('version') || DEFAULT_FUNC_VERSION;
+  const destination = core.getInput('destination') || process.cwd();
+  const binarySource = core.getInput('binarySource') || DEFAULT_BINARY_SOURCE;
+  let bin = core.getInput('name') || 'func';
+  if (process.env.RUNNER_OS === 'Windows' && !bin.endsWith('.exe')) {
+    bin += '.exe';
+  }
 
-    const url = `https://github.com/knative/func/releases/download/${version}/${osBin}`;
-    core.info(`URL: ${url}`);
+  let version;
+  try {
+    version = smartVersionUpdate(versionInput);
+  } catch (error) {
+    core.setFailed(error.message);
+    return;
+  }
 
-    const fullPathBin = path.resolve(destination, bin);
+  if (!fs.existsSync(destination)) {
+    fs.mkdirSync(destination, { recursive: true });
+  }
 
-    await cmdConstructAndRun(url, fullPathBin);
-    await addBinToPath(fullPathBin);
-    await exec.exec(fullPathBin, ['version']);
+  const fullPathBin = path.resolve(destination, bin);
 
+  try {
+    await downloadFuncBinary(version, osBinName, fullPathBin, binarySource);
   } catch (error) {
-    core.setFailed(error.message);
+    core.setFailed(`Download failed: ${error.message}`);
+    return;
   }
+
+  await addBinToPath(fullPathBin);
+  await exec.exec(fullPathBin, ['version']);
 }
 
 run();

node_modules/.package-lock.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "GitHub Action to download and setup the func CLI",
   "dependencies": {
-    "@actions/core": "^1.11.1",
-    "@actions/exec": "^1.1.1"
+    "@actions/core": "~1.11.1",
+    "@actions/exec": "~1.1.1"
   }
 }