use tool-cache

__tests__/main.test.js

@@ -11,14 +11,23 @@ const infoMock = jest.spyOn(core, 'info').mockImplementation()
 const getInputMock = jest.spyOn(core, 'getInput').mockImplementation()
 const execMock = jest.spyOn(exec, 'exec').mockImplementation()
 const downloadToolMock = jest.spyOn(tc, 'downloadTool').mockImplementation()
-jest.spyOn(fs, 'chmodSync').mockImplementation(() => {})
+jest.spyOn(tc, 'cacheFile').mockResolvedValue('/cached/path')
+jest.spyOn(tc, 'find').mockImplementation(() => null) // Simulate cache miss
 
 describe('action', () => {
   beforeEach(() => {
     jest.clearAllMocks()
+
+    // Mock platform and architecture
+    Object.defineProperty(process, 'platform', {
+      value: 'linux'
+    })
+    Object.defineProperty(process, 'arch', {
+      value: 'x64'
+    })
   })
 
-  it('installs the up CLI and logs in when token is provided', async () => {
+  it('installs the Up CLI and logs in when token is provided', async () => {
     // Mock inputs
     getInputMock.mockImplementation(name => {
       switch (name) {
@@ -36,46 +45,44 @@ describe('action', () => {
     })
 
     // Mock tool-cache and exec
-    downloadToolMock.mockResolvedValue('download')
+    downloadToolMock.mockResolvedValue('/tmp/downloaded/up')
     execMock.mockResolvedValue(0)
 
     await main.run()
 
     // Verify downloadTool is called with the correct URL
-    expect(downloadToolMock).toHaveBeenCalledWith('https://cli.upbound.io')
-
-    expect(fs.chmodSync).toHaveBeenCalledWith('download', '775')
+    expect(downloadToolMock).toHaveBeenCalledWith(
+      'https://cli.upbound.io/stable/v0.12.1/bin/linux_amd64/up'
+    )
 
-    // Verify script execution
-    expect(execMock).toHaveBeenNthCalledWith(1, 'bash', ['download'], {
-      env: expect.objectContaining({
-        CHANNEL: 'stable',
-        VERSION: 'v0.12.1'
-      })
-    })
+    // Verify caching behavior
+    expect(tc.cacheFile).toHaveBeenCalledWith(
+      '/tmp/downloaded/up',
+      'up',
+      'up',
+      'v0.12.1'
+    )
 
     // Verify version check
-    expect(execMock).toHaveBeenNthCalledWith(2, 'up', ['--version'])
+    expect(execMock).toHaveBeenNthCalledWith(1, 'up', ['version'])
 
     // Verify login command
-    expect(execMock).toHaveBeenNthCalledWith(3, 'up', [
+    expect(execMock).toHaveBeenNthCalledWith(2, 'up', [
       'login',
       '--token',
       'test-token'
     ])
 
     // Verify logs
     expect(core.info).toHaveBeenCalledWith(
-      'Downloading the Up CLI installation script...'
-    )
-    expect(core.info).toHaveBeenCalledWith(
-      'Running the Up CLI installation script...'
+      'up CLI version v0.12.1 installed at /cached/path'
     )
     expect(core.info).toHaveBeenCalledWith('Verifying installation...')
-    expect(core.info).toHaveBeenCalledWith('Up CLI installation complete!')
+    expect(core.info).toHaveBeenCalledWith('Logging in to Upbound...')
+    expect(core.info).toHaveBeenCalledWith('up CLI installation complete!')
   })
 
-  it('installs the up CLI but skips login when token is not provided', async () => {
+  it('installs the Up CLI but skips login when token is not provided', async () => {
     // Mock inputs
     getInputMock.mockImplementation(name => {
       switch (name) {
@@ -91,26 +98,26 @@ describe('action', () => {
     })
 
     // Mock tool-cache and exec
-    downloadToolMock.mockResolvedValue('download')
-    execMock.mockResolvedValue(0) // Simulate successful script and commands
+    downloadToolMock.mockResolvedValue('/tmp/downloaded/up')
+    execMock.mockResolvedValue(0)
 
     await main.run()
 
     // Verify downloadTool is called with the correct URL
-    expect(downloadToolMock).toHaveBeenCalledWith('https://cli.upbound.io')
-
-    expect(fs.chmodSync).toHaveBeenCalledWith('download', '775')
+    expect(downloadToolMock).toHaveBeenCalledWith(
+      'https://cli.upbound.io/stable/v0.12.1/bin/linux_amd64/up'
+    )
 
-    // Verify script execution
-    expect(execMock).toHaveBeenNthCalledWith(1, 'bash', ['download'], {
-      env: expect.objectContaining({
-        CHANNEL: 'stable',
-        VERSION: 'v0.12.1'
-      })
-    })
+    // Verify caching behavior
+    expect(tc.cacheFile).toHaveBeenCalledWith(
+      '/tmp/downloaded/up',
+      'up',
+      'up',
+      'v0.12.1'
+    )
 
     // Verify version check
-    expect(execMock).toHaveBeenNthCalledWith(2, 'up', ['--version'])
+    expect(execMock).toHaveBeenNthCalledWith(1, 'up', ['version'])
 
     // Verify login command is not called
     expect(execMock).not.toHaveBeenCalledWith('up', [
@@ -121,13 +128,10 @@ describe('action', () => {
 
     // Verify logs
     expect(core.info).toHaveBeenCalledWith(
-      'Downloading the Up CLI installation script...'
-    )
-    expect(core.info).toHaveBeenCalledWith(
-      'Running the Up CLI installation script...'
+      'up CLI version v0.12.1 installed at /cached/path'
     )
     expect(core.info).toHaveBeenCalledWith('Verifying installation...')
-    expect(core.info).toHaveBeenCalledWith('Up CLI installation complete!')
+    expect(core.info).toHaveBeenCalledWith('up CLI installation complete!')
   })
 
   it('adds a "v" prefix if not present', () => {

src/main.js

@@ -7,30 +7,75 @@ function formatVersion(version) {
   return /^\d/.test(version) ? `v${version}` : version
 }
 
+async function downloadUp(version, channel, url, platform, architecture) {
+  let os = 'linux'
+  let arch = 'amd64'
+  let bin = 'up'
+  let extension = ''
+
+  switch (platform) {
+    case 'darwin':
+      os = 'darwin'
+      break
+    case 'win32':
+      os = 'windows'
+      bin = 'up.exe'
+      break
+    case 'linux':
+      os = 'linux'
+      break
+    default:
+      core.warning(`Unknown platform: ${platform}; defaulting to ${os}`)
+      break
+  }
+
+  switch (architecture) {
+    case 'arm64':
+      arch = 'arm64'
+      break
+    case 'x64':
+      arch = 'amd64'
+      break
+    default:
+      core.warning(
+        `Unknown architecture: ${architecture}; defaulting to ${arch}`
+      )
+      break
+  }
+
+  const osArch = `${os}_${arch}`
+  const downloadURL = `${url}/${channel}/${version}/bin/${osArch}/${bin}`
+  core.debug(`up CLI download URL: ${downloadURL}`)
+
+  // Download binary
+  const downloadPath = await tc.downloadTool(downloadURL)
+
+  // Return binary path
+  return platform === 'win32'
+    ? downloadPath
+    : tc.cacheFile(downloadPath, bin, 'up', version)
+}
+
 async function run() {
   try {
     const version = formatVersion(core.getInput('version'))
     const channel = core.getInput('channel')
     const url = core.getInput('url')
     const token = core.getInput('token')
 
-    // Download the installation script
-    const downloadPath = await tc.downloadTool(url)
-
-    // Make the script executable
-    fs.chmodSync(downloadPath, '775')
-
-    await exec.exec('bash', [downloadPath], {
-      env: {
-        ...process.env,
-        CHANNEL: channel,
-        VERSION: version
-      }
-    })
-
-    const cachedPath = await tc.cacheDir('./up', 'up', version)
+    let installPath = tc.find('up', version)
+    if (!installPath) {
+      installPath = await downloadUp(
+        version,
+        channel,
+        url,
+        process.platform,
+        process.arch
+      )
+    }
 
-    core.addPath(cachedPath)
+    core.addPath(installPath)
+    core.info(`up CLI version ${version} installed at ${installPath}`)
 
     core.info('Verifying installation...')
     await exec.exec('up', ['version'])
@@ -40,7 +85,7 @@ async function run() {
       await exec.exec('up', ['login', '--token', token])
     }
 
-    core.info('Up CLI installation complete!')
+    core.info('up CLI installation complete!')
   } catch (error) {
     core.setFailed(error.message)
   }