build

Release v4.2.0 (#134 )
* Update CHANGELOG.md * Update package.json * Update README.md
2024-04-15 19:42:43 +00:00 · 2024-04-15 15:41:59 -04:00 · 2024-04-12 16:23:04 -04:00 · 2024-04-12 15:46:47 -04:00 · 2024-03-08 13:33:11 -05:00
9 changed files with 31069 additions and 148 deletions
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@ -13,6 +13,6 @@ jobs:
      permissions:
         actions: read
         contents: write
-      uses: Azure/action-release-workflows/.github/workflows/release_js_project.yaml@a705b2ab6a3ee889f2b0d925ad0bd2f9eb733ce6
+      uses: Azure/action-release-workflows/.github/workflows/release_js_project.yaml@v1
      with:
         changelogPath: ./CHANGELOG.md
--- a/.gitignore
+++ b/.gitignore
@ -11,8 +11,6 @@ pids
 *.seed
 *.pid.lock

-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov

 # Coverage directory used by tools like istanbul
 coverage
@ -64,4 +62,3 @@ node_modules
 coverage

 # Transpiled JS
-lib/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,9 @@
 # Change Log

+## [4.2.0] - 2024-04-15
+
+-  #124 Fix OS detection and download OS-native archive extension
+
 ## [4.1.0] - 2024-03-01

 -  #130 switches to use Helm published file to read latest version instead of using GitHub releases
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@ Install a specific version of helm binary on the runner.
 Acceptable values are latest or any semantic version string like v3.5.0 Use this action in workflow to define which version of helm will be used. v2+ of this action only support Helm3.

 ```yaml
- uses: azure/setup-helm@v4.1.0
+- uses: azure/setup-helm@v4.2.0
  with:
     version: '<version>' # default is latest (stable)
  id: install
--- a/lib/index.js
+++ b/lib/index.js
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
   "name": "setuphelm",
-   "version": "0.0.0",
+   "version": "4.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
      "": {
         "name": "setuphelm",
-         "version": "0.0.0",
+         "version": "4.2.0",
         "license": "MIT",
         "dependencies": {
            "@actions/core": "^1.10.0",
@ -14,6 +14,7 @@
            "@actions/io": "^1.1.2",
            "@actions/tool-cache": "2.0.1",
            "@octokit/action": "^6.0.7",
+            "ncc": "^0.3.6",
            "semver": "^7.5.4"
         },
         "devDependencies": {
@ -1116,12 +1117,9 @@
         }
      },
      "node_modules/@octokit/action/node_modules/undici": {
-         "version": "6.5.0",
-         "resolved": "https://registry.npmjs.org/undici/-/undici-6.5.0.tgz",
-         "integrity": "sha512-/MUmPb2ptTvp1j7lPvdMSofMdqPxcOhAaKZi4k55sqm6XMeKI3n1dZJ5cnD4gLjpt2l7CIlthR1IXM59xKhpxw==",
-         "dependencies": {
-            "@fastify/busboy": "^2.0.0"
-         },
+         "version": "6.11.1",
+         "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz",
+         "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==",
         "engines": {
            "node": ">=18.0"
         }
@ -1583,8 +1581,7 @@
      "node_modules/balanced-match": {
         "version": "1.0.2",
         "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-         "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-         "dev": true
+         "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
      },
      "node_modules/before-after-hook": {
         "version": "2.2.3",
@ -1595,7 +1592,6 @@
         "version": "1.1.11",
         "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
         "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-         "dev": true,
         "dependencies": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -1804,11 +1800,18 @@
         "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
         "dev": true
      },
+      "node_modules/colors": {
+         "version": "1.2.3",
+         "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.3.tgz",
+         "integrity": "sha512-qTfM2pNFeMZcLvf/RbrVAzDEVttZjFhaApfx9dplNjvHSX88Ui66zBRb/4YGob/xUWxDceirgoC1lT676asfCQ==",
+         "engines": {
+            "node": ">=0.1.90"
+         }
+      },
      "node_modules/concat-map": {
         "version": "0.0.1",
         "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-         "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-         "dev": true
+         "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
      },
      "node_modules/convert-source-map": {
         "version": "2.0.0",
@ -1851,6 +1854,14 @@
            "node": ">= 8"
         }
      },
+      "node_modules/dateformat": {
+         "version": "3.0.3",
+         "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+         "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+         "engines": {
+            "node": "*"
+         }
+      },
      "node_modules/debug": {
         "version": "4.3.4",
         "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -2069,8 +2080,7 @@
      "node_modules/fs.realpath": {
         "version": "1.0.0",
         "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-         "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-         "dev": true
+         "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
      },
      "node_modules/function-bind": {
         "version": "1.1.2",
@ -2124,7 +2134,6 @@
         "version": "7.2.3",
         "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
         "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-         "dev": true,
         "dependencies": {
            "fs.realpath": "^1.0.0",
            "inflight": "^1.0.4",
@ -2223,7 +2232,6 @@
         "version": "1.0.6",
         "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
         "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-         "dev": true,
         "dependencies": {
            "once": "^1.3.0",
            "wrappy": "1"
@ -2232,8 +2240,7 @@
      "node_modules/inherits": {
         "version": "2.0.4",
         "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-         "dev": true
+         "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
      },
      "node_modules/is-arrayish": {
         "version": "0.2.1",
@ -3081,7 +3088,6 @@
         "version": "3.1.2",
         "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
         "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-         "dev": true,
         "dependencies": {
            "brace-expansion": "^1.1.7"
         },
@ -3089,6 +3095,25 @@
            "node": "*"
         }
      },
+      "node_modules/minimist": {
+         "version": "1.2.8",
+         "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+         "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+         "funding": {
+            "url": "https://github.com/sponsors/ljharb"
+         }
+      },
+      "node_modules/mkdirp": {
+         "version": "0.5.6",
+         "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+         "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+         "dependencies": {
+            "minimist": "^1.2.6"
+         },
+         "bin": {
+            "mkdirp": "bin/cmd.js"
+         }
+      },
      "node_modules/ms": {
         "version": "2.1.2",
         "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@ -3101,6 +3126,17 @@
         "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
         "dev": true
      },
+      "node_modules/ncc": {
+         "version": "0.3.6",
+         "resolved": "https://registry.npmjs.org/ncc/-/ncc-0.3.6.tgz",
+         "integrity": "sha512-OXudTB2Ebt/FnOuDoPQbaa17+tdVqSOWA+gLfPxccWwsNED1uA2zEhpoB1hwdFC9yYbio/mdV5cvOtQI3Zrx1w==",
+         "dependencies": {
+            "mkdirp": "^0.5.1",
+            "rimraf": "^2.6.1",
+            "tracer": "^0.8.7",
+            "ws": "^2.3.1"
+         }
+      },
      "node_modules/node-int64": {
         "version": "0.4.0",
         "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@ -3239,7 +3275,6 @@
         "version": "1.0.1",
         "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
         "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-         "dev": true,
         "engines": {
            "node": ">=0.10.0"
         }
@ -3430,6 +3465,22 @@
            "node": ">=10"
         }
      },
+      "node_modules/rimraf": {
+         "version": "2.7.1",
+         "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+         "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+         "dependencies": {
+            "glob": "^7.1.3"
+         },
+         "bin": {
+            "rimraf": "bin.js"
+         }
+      },
+      "node_modules/safe-buffer": {
+         "version": "5.0.1",
+         "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+         "integrity": "sha512-cr7dZWLwOeaFBLTIuZeYdkfO7UzGIKhjYENJFAxUOMKWGaWDm2nJM2rzxNRm5Owu0DH3ApwNo6kx5idXZfb/Iw=="
+      },
      "node_modules/semver": {
         "version": "7.5.4",
         "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@ -3646,6 +3697,14 @@
            "node": ">=8"
         }
      },
+      "node_modules/tinytim": {
+         "version": "0.1.1",
+         "resolved": "https://registry.npmjs.org/tinytim/-/tinytim-0.1.1.tgz",
+         "integrity": "sha512-NIpsp9lBIxPNzB++HnMmUd4byzJSVbbO4F+As1Gb1IG/YQT5QvmBDjpx8SpDS8fhGC+t+Qw8ldQgbcAIaU+2cA==",
+         "engines": {
+            "node": ">= 0.2.0"
+         }
+      },
      "node_modules/tmpl": {
         "version": "1.0.5",
         "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@ -3673,6 +3732,20 @@
            "node": ">=8.0"
         }
      },
+      "node_modules/tracer": {
+         "version": "0.8.15",
+         "resolved": "https://registry.npmjs.org/tracer/-/tracer-0.8.15.tgz",
+         "integrity": "sha512-ZQzlhd6zZFIpAhACiZkxLjl65XqVwi8t8UEBVGRIHAQN6nj55ftJWiFell+WSqWCP/vEycrIbUSuiyMwul+TFw==",
+         "dependencies": {
+            "colors": "1.2.3",
+            "dateformat": "3.0.3",
+            "mkdirp": "^0.5.1",
+            "tinytim": "0.1.1"
+         },
+         "engines": {
+            "node": ">= 0.10.0"
+         }
+      },
      "node_modules/ts-jest": {
         "version": "29.1.2",
         "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
@ -3758,10 +3831,15 @@
            "node": ">=14.17"
         }
      },
+      "node_modules/ultron": {
+         "version": "1.1.1",
+         "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+         "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
+      },
      "node_modules/undici": {
-         "version": "5.28.2",
-         "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz",
-         "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==",
+         "version": "5.28.4",
+         "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+         "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
         "dependencies": {
            "@fastify/busboy": "^2.0.0"
         },
@ -3891,6 +3969,15 @@
            "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
         }
      },
+      "node_modules/ws": {
+         "version": "2.3.1",
+         "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz",
+         "integrity": "sha512-61a+9LgtYZxTq1hAonhX8Xwpo2riK4IOR/BIVxioFbCfc3QFKmpE4x9dLExfLHKtUfVZigYa36tThVhO57erEw==",
+         "dependencies": {
+            "safe-buffer": "~5.0.1",
+            "ultron": "~1.1.0"
+         }
+      },
      "node_modules/y18n": {
         "version": "5.0.8",
         "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
   "name": "setuphelm",
-   "version": "4.1.0",
+   "version": "4.2.0",
   "private": true,
   "description": "Setup helm",
   "author": "Anumita Shenoy",
@ -11,6 +11,7 @@
      "@actions/io": "^1.1.2",
      "@actions/tool-cache": "2.0.1",
      "@octokit/action": "^6.0.7",
+      "ncc": "^0.3.6",
      "semver": "^7.5.4"
   },
   "main": "lib/index.js",
--- a/src/run.test.ts
+++ b/src/run.test.ts
@ -6,84 +6,74 @@ import * as path from 'path'
 import * as core from '@actions/core'

 describe('run.ts', () => {
+   const downloadBaseURL = 'https://test.tld'
+
+   // Cleanup mocks after each test to ensure that subsequent tests are not affected by the mocks.
+   afterEach(() => {
+      jest.restoreAllMocks()
+   })
+
   test('getExecutableExtension() - return .exe when os is Windows', () => {
-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')

      expect(run.getExecutableExtension()).toBe('.exe')
-      expect(os.type).toHaveBeenCalled()
+      expect(os.platform).toHaveBeenCalled()
   })

   test('getExecutableExtension() - return empty string for non-windows OS', () => {
-      jest.spyOn(os, 'type').mockReturnValue('Darwin')
+      jest.spyOn(os, 'platform').mockReturnValue('darwin')

      expect(run.getExecutableExtension()).toBe('')
-      expect(os.type).toHaveBeenCalled()
+      expect(os.platform).toHaveBeenCalled()
   })

-   test('getHelmDownloadURL() - return the URL to download helm for Linux', () => {
-      const downloadBaseURL = 'https://test.tld'
+   test('getHelmDownloadURL() - return the URL to download helm for Linux amd64', () => {
+      jest.spyOn(os, 'platform').mockReturnValue('linux')
+      jest.spyOn(os, 'arch').mockReturnValue('x64')
+      const expected = 'https://test.tld/helm-v3.8.0-linux-amd64.tar.gz'

-      jest.spyOn(os, 'type').mockReturnValue('Linux')
-      jest.spyOn(os, 'arch').mockReturnValueOnce('unknown')
-      const helmLinuxUrl = 'https://test.tld/helm-v3.8.0-linux-amd64.zip'
-
-      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(
-         helmLinuxUrl
-      )
-      expect(os.type).toHaveBeenCalled()
-      expect(os.arch).toHaveBeenCalled()
-
-      // arm64
-      jest.spyOn(os, 'type').mockReturnValue('Linux')
-      jest.spyOn(os, 'arch').mockReturnValueOnce('arm64')
-      const helmLinuxArm64Url = 'https://test.tld/helm-v3.8.0-linux-arm64.zip'
-
-      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(
-         helmLinuxArm64Url
-      )
-      expect(os.type).toHaveBeenCalled()
+      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(expected)
+      expect(os.platform).toHaveBeenCalled()
      expect(os.arch).toHaveBeenCalled()
   })

-   test('getHelmDownloadURL() - return the URL to download helm for Darwin', () => {
-      const downloadBaseURL = 'https://test.tld'
+   test('getHelmDownloadURL() - return the URL to download helm for Linux arm64', () => {
+      jest.spyOn(os, 'platform').mockReturnValue('linux')
+      jest.spyOn(os, 'arch').mockReturnValue('arm64')
+      const expected = 'https://test.tld/helm-v3.8.0-linux-arm64.tar.gz'

-      jest.spyOn(os, 'type').mockReturnValue('Darwin')
-      jest.spyOn(os, 'arch').mockReturnValueOnce('unknown')
-      const helmDarwinUrl = 'https://test.tld/helm-v3.8.0-darwin-amd64.zip'
-
-      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(
-         helmDarwinUrl
-      )
-      expect(os.type).toHaveBeenCalled()
-      expect(os.arch).toHaveBeenCalled()
-
-      // arm64
-      jest.spyOn(os, 'type').mockReturnValue('Darwin')
-      jest.spyOn(os, 'arch').mockReturnValueOnce('arm64')
-      const helmDarwinArm64Url = 'https://test.tld/helm-v3.8.0-darwin-arm64.zip'
-
-      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(
-         helmDarwinArm64Url
-      )
-      expect(os.type).toHaveBeenCalled()
+      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(expected)
+      expect(os.platform).toHaveBeenCalled()
      expect(os.arch).toHaveBeenCalled()
   })

-   test('getValidVersion() - return version with v prepended', () => {
-      expect(run.getValidVersion('3.8.0')).toBe('v3.8.0')
+   test('getHelmDownloadURL() - return the URL to download helm for Darwin x64', () => {
+      jest.spyOn(os, 'platform').mockReturnValue('darwin')
+      jest.spyOn(os, 'arch').mockReturnValue('x64')
+      const expected = 'https://test.tld/helm-v3.8.0-darwin-amd64.tar.gz'
+
+      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(expected)
+      expect(os.platform).toHaveBeenCalled()
+      expect(os.arch).toHaveBeenCalled()
+   })
+
+   test('getHelmDownloadURL() - return the URL to download helm for Darwin arm64', () => {
+      jest.spyOn(os, 'platform').mockReturnValue('darwin')
+      jest.spyOn(os, 'arch').mockReturnValue('arm64')
+      const expected = 'https://test.tld/helm-v3.8.0-darwin-arm64.tar.gz'
+
+      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(expected)
+      expect(os.platform).toHaveBeenCalled()
+      expect(os.arch).toHaveBeenCalled()
   })

   test('getHelmDownloadURL() - return the URL to download helm for Windows', () => {
-      const downloadBaseURL = 'https://test.tld'
+      jest.spyOn(os, 'platform').mockReturnValue('win32')
+      jest.spyOn(os, 'arch').mockReturnValue('x64')

-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
-
-      const helmWindowsUrl = 'https://test.tld/helm-v3.8.0-windows-amd64.zip'
-      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(
-         helmWindowsUrl
-      )
-      expect(os.type).toHaveBeenCalled()
+      const expected = 'https://test.tld/helm-v3.8.0-windows-amd64.zip'
+      expect(run.getHelmDownloadURL(downloadBaseURL, 'v3.8.0')).toBe(expected)
+      expect(os.platform).toHaveBeenCalled()
   })

   test('getLatestHelmVersion() - return the latest version of HELM', async () => {
@ -101,6 +91,10 @@ describe('run.ts', () => {
      expect(await run.getLatestHelmVersion()).toBe('v3.13.3')
   })

+   test('getValidVersion() - return version with v prepended', () => {
+      expect(run.getValidVersion('3.8.0')).toBe('v3.8.0')
+   })
+
   test('walkSync() - return path to the all files matching fileToFind in dir', () => {
      jest.spyOn(fs, 'readdirSync').mockImplementation((file, _) => {
         if (file == 'mainFolder')
@ -120,6 +114,7 @@ describe('run.ts', () => {
               'file21' as unknown as fs.Dirent,
               'file22' as unknown as fs.Dirent
            ]
+         return []
      })
      jest.spyOn(core, 'debug').mockImplementation()
      jest.spyOn(fs, 'statSync').mockImplementation((file) => {
@ -154,6 +149,7 @@ describe('run.ts', () => {
               'file21' as unknown as fs.Dirent,
               'file22' as unknown as fs.Dirent
            ]
+         return []
      })
      jest.spyOn(core, 'debug').mockImplementation()
      jest.spyOn(fs, 'statSync').mockImplementation((file) => {
@ -171,13 +167,14 @@ describe('run.ts', () => {
      jest.spyOn(fs, 'chmodSync').mockImplementation(() => {})
      jest.spyOn(fs, 'readdirSync').mockImplementation((file, _) => {
         if (file == 'mainFolder') return ['helm.exe' as unknown as fs.Dirent]
+         return []
      })
      jest.spyOn(fs, 'statSync').mockImplementation((file) => {
         const isDirectory =
            (file as string).indexOf('folder') == -1 ? false : true
         return {isDirectory: () => isDirectory} as fs.Stats
      })
-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')

      expect(run.findHelm('mainFolder')).toBe(
         path.join('mainFolder', 'helm.exe')
@ -188,11 +185,13 @@ describe('run.ts', () => {
      jest.spyOn(fs, 'chmodSync').mockImplementation(() => {})
      jest.spyOn(fs, 'readdirSync').mockImplementation((file, _) => {
         if (file == 'mainFolder') return []
+         return []
      })
      jest.spyOn(fs, 'statSync').mockImplementation((file) => {
         return {isDirectory: () => true} as fs.Stats
      })
-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')
+
      expect(() => run.findHelm('mainFolder')).toThrow(
         'Helm executable not found in path mainFolder'
      )
@ -203,11 +202,9 @@ describe('run.ts', () => {
      jest.spyOn(toolCache, 'downloadTool').mockResolvedValue('pathToTool')
      const response = JSON.stringify([{tag_name: 'v4.0.0'}])
      jest.spyOn(fs, 'readFileSync').mockReturnValue(response)
-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')
      jest.spyOn(fs, 'chmodSync').mockImplementation(() => {})
-      jest
-         .spyOn(toolCache, 'extractZip')
-         .mockResolvedValue('pathToUnzippedHelm')
+      jest.spyOn(toolCache, 'extractZip').mockResolvedValue('extractedPath')
      jest.spyOn(toolCache, 'cacheDir').mockResolvedValue('pathToCachedDir')
      jest
         .spyOn(fs, 'readdirSync')
@ -218,9 +215,7 @@ describe('run.ts', () => {
         return {isDirectory: () => isDirectory} as fs.Stats
      })

-      const baseURL = 'https://test.tld'
-
-      expect(await run.downloadHelm(baseURL, 'v4.0.0')).toBe(
+      expect(await run.downloadHelm(downloadBaseURL, 'v4.0.0')).toBe(
         path.join('pathToCachedDir', 'helm.exe')
      )
      expect(toolCache.find).toHaveBeenCalledWith('helm', 'v4.0.0')
@ -240,26 +235,33 @@ describe('run.ts', () => {
      jest.spyOn(toolCache, 'downloadTool').mockImplementation(async () => {
         throw 'Unable to download'
      })
-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')

-      const baseURL = 'https://test.tld'
-
-      await expect(run.downloadHelm(baseURL, 'v3.2.1')).rejects.toThrow(
-         'Failed to download Helm from location https://test.tld/helm-v3.2.1-windows-amd64.zip'
+      const downloadUrl = 'https://test.tld/helm-v3.2.1-windows-amd64.zip'
+      await expect(run.downloadHelm(downloadBaseURL, 'v3.2.1')).rejects.toThrow(
+         `Failed to download Helm from location ${downloadUrl}`
      )
      expect(toolCache.find).toHaveBeenCalledWith('helm', 'v3.2.1')
-      expect(toolCache.downloadTool).toHaveBeenCalledWith(
-         'https://test.tld/helm-v3.2.1-windows-amd64.zip'
-      )
+      expect(toolCache.downloadTool).toHaveBeenCalledWith(`${downloadUrl}`)
   })

   test('downloadHelm() - return path to helm tool with same version from toolCache', async () => {
      jest.spyOn(toolCache, 'find').mockReturnValue('pathToCachedDir')
+      jest.spyOn(toolCache, 'cacheDir').mockResolvedValue('pathToCachedDir')
+      jest.spyOn(toolCache, 'downloadTool').mockResolvedValue('pathToTool')
+      jest.spyOn(toolCache, 'extractZip').mockResolvedValue('extractedPath')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')
      jest.spyOn(fs, 'chmodSync').mockImplementation(() => {})
+      jest
+         .spyOn(fs, 'readdirSync')
+         .mockReturnValue(['helm.exe' as unknown as fs.Dirent])
+      jest.spyOn(fs, 'statSync').mockImplementation((file) => {
+         const isDirectory =
+            (file as string).indexOf('folder') == -1 ? false : true
+         return {isDirectory: () => isDirectory} as fs.Stats
+      })

-      const baseURL = 'https://test.tld'
-
-      expect(await run.downloadHelm(baseURL, 'v3.2.1')).toBe(
+      expect(await run.downloadHelm(downloadBaseURL, 'v3.2.1')).toBe(
         path.join('pathToCachedDir', 'helm.exe')
      )
      expect(toolCache.find).toHaveBeenCalledWith('helm', 'v3.2.1')
@ -272,12 +274,11 @@ describe('run.ts', () => {
   test('downloadHelm() - throw error is helm is not found in path', async () => {
      jest.spyOn(toolCache, 'find').mockReturnValue('')
      jest.spyOn(toolCache, 'downloadTool').mockResolvedValue('pathToTool')
-      jest.spyOn(os, 'type').mockReturnValue('Windows_NT')
-      jest.spyOn(fs, 'chmodSync').mockImplementation()
-      jest
-         .spyOn(toolCache, 'extractZip')
-         .mockResolvedValue('pathToUnzippedHelm')
      jest.spyOn(toolCache, 'cacheDir').mockResolvedValue('pathToCachedDir')
+      jest.spyOn(toolCache, 'downloadTool').mockResolvedValue('pathToTool')
+      jest.spyOn(toolCache, 'extractZip').mockResolvedValue('extractedPath')
+      jest.spyOn(os, 'platform').mockReturnValue('win32')
+      jest.spyOn(fs, 'chmodSync').mockImplementation()
      jest.spyOn(fs, 'readdirSync').mockImplementation((file, _) => [])
      jest.spyOn(fs, 'statSync').mockImplementation((file) => {
         const isDirectory =
@ -285,9 +286,7 @@ describe('run.ts', () => {
         return {isDirectory: () => isDirectory} as fs.Stats
      })

-      const baseURL = 'https://test.tld'
-
-      await expect(run.downloadHelm(baseURL, 'v3.2.1')).rejects.toThrow(
+      await expect(run.downloadHelm(downloadBaseURL, 'v3.2.1')).rejects.toThrow(
         'Helm executable not found in path pathToCachedDir'
      )
      expect(toolCache.find).toHaveBeenCalledWith('helm', 'v3.2.1')
--- a/src/run.ts
+++ b/src/run.ts
@ -61,41 +61,24 @@ export async function getLatestHelmVersion(): Promise<string> {
   }
 }

-export function getExecutableExtension(): string {
-   if (os.type().match(/^Win/)) {
-      return '.exe'
-   }
-   return ''
+export function getArch(): string {
+   return os.arch() === 'x64' ? 'amd64' : os.arch()
+}
+
+export function getPlatform(): string {
+   return os.platform() === 'win32' ? 'windows' : os.platform()
+}
+
+export function getArchiveExtension(): string {
+   return os.platform() === 'win32' ? 'zip' : 'tar.gz'
+}
+
+export function getExecutableExtension(): string {
+   return os.platform() === 'win32' ? '.exe' : ''
 }

-const LINUX = 'Linux'
-const MAC_OS = 'Darwin'
-const WINDOWS = 'Windows_NT'
-const ARM64 = 'arm64'
 export function getHelmDownloadURL(baseURL: string, version: string): string {
-   const arch = os.arch()
-   const operatingSystem = os.type()
-
-   let urlPath = ''
-
-   switch (true) {
-      case operatingSystem == LINUX && arch == ARM64:
-         urlPath = util.format(`/helm-%s-linux-arm64.zip`, version)
-         break
-      case operatingSystem == LINUX:
-         urlPath = util.format(`/helm-%s-linux-amd64.zip`, version)
-         break
-      case operatingSystem == MAC_OS && arch == ARM64:
-         urlPath = util.format(`/helm-%s-darwin-arm64.zip`, version)
-         break
-      case operatingSystem == MAC_OS:
-         urlPath = util.format(`/helm-%s-darwin-amd64.zip`, version)
-         break
-      case operatingSystem == WINDOWS:
-      default:
-         urlPath = util.format(`/helm-%s-windows-amd64.zip`, version)
-   }
-
+   const urlPath = `helm-${version}-${getPlatform()}-${getArch()}.${getArchiveExtension()}`
   const url = new URL(urlPath, baseURL)
   return url.toString()
 }
@ -121,9 +104,13 @@ export async function downloadHelm(
      }

      fs.chmodSync(helmDownloadPath, '777')
-      const unzipedHelmPath = await toolCache.extractZip(helmDownloadPath)
+      const extractedPath =
+         getPlatform() === 'windows'
+            ? await toolCache.extractZip(helmDownloadPath)
+            : await toolCache.extractTar(helmDownloadPath)
+
      cachedToolpath = await toolCache.cacheDir(
-         unzipedHelmPath,
+         extractedPath,
         helmToolName,
         version
      )
Author	SHA1	Message	Date
GitHub Action	fe7b79cd5e	build	2024-04-15 19:42:43 +00:00
David Gamero	df50d879fa	Release v4.2.0 (#134 ) * Update CHANGELOG.md * Update package.json * Update README.md	2024-04-15 15:41:59 -04:00
dependabot[bot]	08d7123a4a	Bump undici from 5.28.2 to 5.28.4 (#133 ) Bumps [undici](https://github.com/nodejs/undici) from 5.28.2 to 5.28.4. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](https://github.com/nodejs/undici/compare/v5.28.2...v5.28.4) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-04-12 16:23:04 -04:00
Dmytro Bondar	0a0c55a4c3	Fix os detection and archive extension (#124 )	2024-04-12 15:46:47 -04:00
David Gamero	d00ce1cb5e	update to release workflow major version tag (#132 )	2024-03-08 13:33:11 -05:00