Merge pull request #350 from e-korolevskii/Add-tests-for-updated-cachetool-ver-(347)

test(cache): Add test for cachetool v 3.0

.github/workflows/e2e-versions.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica', 'microsoft' ] # internally 'adopt-hotspot' is the same as 'adopt'
+        distribution: ['temurin', 'adopt', 'adopt-openj9', 'zulu', 'liberica', 'microsoft', 'corretto' ] # internally 'adopt-hotspot' is the same as 'adopt'
         version: ['8', '11', '16']
         exclude:
         - distribution: microsoft
@@ -141,7 +141,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
         distribution: ['temurin', 'zulu', 'liberica']
         java-package: ['jre']
-        version: ['16.0']
+        version: ['17.0']
         include:
           - distribution: 'zulu'
             java-package: jre+fx
@@ -159,10 +159,10 @@ jobs:
             java-package: jre+fx
             version: '11'
             os: ubuntu-latest
-        exclude:
-          # Eclipse Temurin currently doesn't publish JREs, only JDKs
-          - distribution: 'temurin'
-            java-package: 'jre'
+          - distribution: 'corretto'
+            java-package: jre
+            version: '8'
+            os: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -187,7 +187,7 @@ jobs:
       matrix:
         # x86 is not supported on macOS
         os: [windows-latest, ubuntu-latest]
-        distribution: ['liberica', 'zulu']
+        distribution: ['liberica', 'zulu', 'corretto']
         version: ['11']
     steps:
       - name: Checkout

.licenses/npm/@actions/cache.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: "@actions/cache"
-version: 2.0.2
+version: 3.0.0
 type: npm
 summary: Actions cache lib
 homepage: https://github.com/actions/toolkit/tree/main/packages/cache
@@ -17,4 +17,4 @@ licenses:
     The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-notices: []
+notices: []

.licenses/npm/@actions/http-client-1.0.11.dep.yml

@@ -29,4 +29,4 @@ licenses:
     NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-notices: []
+notices: []

.licenses/npm/@actions/http-client-2.0.1.dep.yml

@@ -0,0 +1,32 @@
+---
+name: "@actions/http-client"
+version: 2.0.1
+type: npm
+summary: Actions Http Client
+homepage: https://github.com/actions/toolkit/tree/main/packages/http-client
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    Actions Http Client for Node.js
+
+    Copyright (c) GitHub, Inc.
+
+    All rights reserved.
+
+    MIT License
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+    associated documentation files (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+    LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+    NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+notices: []

CONTRIBUTING.md

@@ -8,7 +8,7 @@
 
 ### NCC
 
-In order to avoid uploading `node_modules` to the repository, we use [zeit/ncc](https://github.com/zeit/ncc) to create multiple `index.js` files that gets saved under `dist/`.
+In order to avoid uploading `node_modules` to the repository, we use [vercel/ncc](https://github.com/vercel/ncc) to create multiple `index.js` files that gets saved under `dist/`.
 There are two main files that get created
 - `dist/setup/index.js`
    - Core `setup-java` logic that downloads and installs an appropriate version of Java 

README.md

@@ -60,16 +60,19 @@ Currently, the following distributions are supported:
 | `adopt-openj9` | Adopt OpenJDK OpenJ9 | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html) |
 | `liberica` | Liberica JDK | [Link](https://bell-sw.com/) | [Link](https://bell-sw.com/liberica_eula/) |
 | `microsoft` | Microsoft Build of OpenJDK | [Link](https://www.microsoft.com/openjdk) | [Link](https://docs.microsoft.com/java/openjdk/faq)
+| `corretto` | Amazon Corretto Build of OpenJDK | [Link](https://aws.amazon.com/corretto/) | [Link](https://aws.amazon.com/corretto/faqs/)
 
 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
 
 **NOTE:** Adopt OpenJDK got moved to Eclipse Temurin and won't be updated anymore. It is highly recommended to migrate workflows from `adopt` to `temurin` to keep receiving software and security updates. See more details in the [Good-bye AdoptOpenJDK post](https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/).
 
+**NOTE:** For Zulu OpenJDK architectures x64 and arm64 are mapped to x86 / arm with proper hw_bitness.
+
 ### Caching packages dependencies
 The action has a built-in functionality for caching and restoring dependencies. It uses [actions/cache](https://github.com/actions/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
 - gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`
 - maven: `**/pom.xml`
-- sbt:  `**/build.sbt`
+- sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.{scala,sbt}`
 
 The workflow output `cache-hit` is set to indicate if an exact match was found for the key [as actions/cache does](https://github.com/actions/cache/tree/main#outputs).
 
@@ -157,6 +160,8 @@ jobs:
   - [Adopt](docs/advanced-usage.md#Adopt)
   - [Zulu](docs/advanced-usage.md#Zulu)
   - [Liberica](docs/advanced-usage.md#Liberica)
+  - [Microsoft](docs/advanced-usage.md#Microsoft)
+  - [Amazon Corretto](docs/advanced-usage.md#Amazon-Corretto)
 - [Installing custom Java package type](docs/advanced-usage.md#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](docs/advanced-usage.md#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](docs/advanced-usage.md#Installing-Java-from-local-file)

__tests__/cache.test.ts

@@ -153,6 +153,27 @@ describe('dependency cache', () => {
       return expect(save('ant')).rejects.toThrowError('unknown package manager specified: ant');
     });
 
+    it('save with -1 cacheId , should not fail workflow', async () => {
+      spyCacheSave.mockImplementation(() => Promise.resolve(-1));
+      createStateForMissingBuildFile();
+
+      await save('maven');
+      expect(spyCacheSave).toBeCalled();
+      expect(spyWarning).not.toBeCalled();
+      expect(spyInfo).toBeCalled();
+      expect(spyInfo).toBeCalledWith(expect.stringMatching(/^Cache saved with the key:.*/));
+    });
+
+    it('saves with error from toolkit, should fail workflow', async () => {
+      spyCacheSave.mockImplementation(() =>
+        Promise.reject(new cache.ValidationError('Validation failed'))
+      );
+      createStateForMissingBuildFile();
+
+      expect.assertions(1);
+      await expect(save('maven')).rejects.toEqual(new cache.ValidationError('Validation failed'));
+    });
+
     describe('for maven', () => {
       it('uploads cache even if no pom.xml found', async () => {
         createStateForMissingBuildFile();

__tests__/distributors/corretto-installer.test.ts

@@ -0,0 +1,152 @@
+import { HttpClient } from '@actions/http-client';
+import { JavaInstallerOptions } from '../../src/distributions/base-models';
+
+import { CorrettoDistribution } from '../../src/distributions/corretto/installer';
+import * as util from '../../src/util';
+
+const manifestData = require('../data/corretto.json') as [];
+
+describe('getAvailableVersions', () => {
+  let spyHttpClient: jest.SpyInstance;
+  let spyGetDownloadArchiveExtension: jest.SpyInstance;
+
+  beforeEach(() => {
+    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
+    spyHttpClient.mockReturnValue({
+      statusCode: 200,
+      headers: {},
+      result: manifestData
+    });
+    spyGetDownloadArchiveExtension = jest.spyOn(util, 'getDownloadArchiveExtension');
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+    jest.clearAllMocks();
+    jest.restoreAllMocks();
+  });
+
+  describe('getAvailableVersions', () => {
+    it('load available versions', async () => {
+      const distribution = new CorrettoDistribution({
+        version: '11',
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+
+      const availableVersions = await distribution['getAvailableVersions']();
+      expect(availableVersions).not.toBeNull();
+      expect(availableVersions.length).toBe(6);
+    });
+
+    it.each([
+      [{ version: '16', architecture: 'x64', packageType: 'jdk', checkLatest: false }, 'macos', 6],
+      [{ version: '16', architecture: 'x86', packageType: 'jdk', checkLatest: false }, 'macos', 0],
+      [{ version: '16', architecture: 'x64', packageType: 'jre', checkLatest: false }, 'macos', 0],
+      [{ version: '16', architecture: 'x64', packageType: 'jdk', checkLatest: false }, 'linux', 6],
+      [
+        { version: '18', architecture: 'x64', packageType: 'jdk', checkLatest: false },
+        'windows',
+        6
+      ],
+      [{ version: '18', architecture: 'x64', packageType: 'jre', checkLatest: false }, 'windows', 1]
+    ])(
+      'fetch expected amount of available versions for %s',
+      async (
+        installerOptions: JavaInstallerOptions,
+        platform: string,
+        expectedAmountOfAvailableVersions
+      ) => {
+        const distribution = new CorrettoDistribution(installerOptions);
+        mockPlatform(distribution, platform);
+
+        const availableVersions = await distribution['getAvailableVersions']();
+        expect(availableVersions).not.toBeNull();
+        expect(availableVersions.length).toBe(expectedAmountOfAvailableVersions);
+      }
+    );
+  });
+
+  describe('findPackageForDownload', () => {
+    it.each([
+      [
+        'macos',
+        'https://corretto.aws/downloads/resources/18.0.0.37.1/amazon-corretto-18.0.0.37.1-macosx-x64.tar.gz'
+      ],
+      [
+        'windows',
+        'https://corretto.aws/downloads/resources/18.0.0.37.1/amazon-corretto-18.0.0.37.1-windows-x64-jdk.zip'
+      ],
+      [
+        'linux',
+        'https://corretto.aws/downloads/resources/18.0.0.37.1/amazon-corretto-18.0.0.37.1-linux-x64.tar.gz'
+      ]
+    ])('for os: %s', async (platform: string, expectedLink: string) => {
+      const version = '18';
+      const distribution = new CorrettoDistribution({
+        version,
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, platform);
+
+      const availableVersion = await distribution['findPackageForDownload'](version);
+      expect(availableVersion).not.toBeNull();
+      expect(availableVersion.url).toBe(expectedLink);
+    });
+
+    it('with unstable version expect to throw not supported error', async () => {
+      const version = '18.0.1-ea';
+      const distribution = new CorrettoDistribution({
+        version,
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+
+      await expect(distribution['findPackageForDownload'](version)).rejects.toThrowError(
+        'Early access versions are not supported'
+      );
+    });
+
+    it('with non major version expect to throw not supported error', async () => {
+      const version = '18.0.1';
+      const distribution = new CorrettoDistribution({
+        version,
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+
+      await expect(distribution['findPackageForDownload'](version)).rejects.toThrowError(
+        'Only major versions are supported'
+      );
+    });
+
+    it('with unfound version throw could not find error', async () => {
+      const version = '4';
+      const distribution = new CorrettoDistribution({
+        version,
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+
+      await expect(distribution['findPackageForDownload'](version)).rejects.toThrowError(
+        "Could not find satisfied version for SemVer '4'"
+      );
+    });
+  });
+
+  const mockPlatform = (distributon: CorrettoDistribution, platform: string) => {
+    distributon['getPlatformOption'] = () => platform;
+    const mockedExtension = platform === 'windows' ? 'zip' : 'tar.gz';
+    spyGetDownloadArchiveExtension.mockReturnValue(mockedExtension);
+  };
+});

__tests__/distributors/microsoft-installer.test.ts

@@ -14,10 +14,15 @@ describe('findPackageForDownload', () => {
 
   it.each([
     [
-      '17.x',
+      '17.0.1',
       '17.0.1',
       'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
     ],
+    [
+      '17.x',
+      '17.0.3',
+      'https://aka.ms/download-jdk/microsoft-jdk-17.0.3-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+    ],
     [
       '16.0.x',
       '16.0.2',
@@ -27,6 +32,11 @@ describe('findPackageForDownload', () => {
       '11.0.13',
       '11.0.13',
       'https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+    ],
+    [
+      '11.0.15',
+      '11.0.15',
+      'https://aka.ms/download-jdk/microsoft-jdk-11.0.15-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
     ]
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
     const result = await distribution['findPackageForDownload'](input);

__tests__/distributors/zulu-installer.test.ts

@@ -52,6 +52,14 @@ describe('getAvailableVersions', () => {
     [
       { version: '8', architecture: 'x64', packageType: 'jre+fx', checkLatest: false },
       '?os=macos&ext=tar.gz&bundle_type=jre&javafx=true&arch=x86&hw_bitness=64&release_status=ga&features=fx'
+    ],
+    [
+      { version: '11', architecture: 'arm64', packageType: 'jdk', checkLatest: false },
+      '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=arm&hw_bitness=64&release_status=ga'
+    ],
+    [
+      { version: '11', architecture: 'arm', packageType: 'jdk', checkLatest: false },
+      '?os=macos&ext=tar.gz&bundle_type=jdk&javafx=false&arch=arm&hw_bitness=&release_status=ga'
     ]
   ])('build correct url for %s -> %s', async (input, parsedUrl) => {
     const distribution = new ZuluDistribution(input);

action.yml

@@ -54,7 +54,7 @@ inputs:
        $GPG_PASSPHRASE.'
     required: false
   cache:
-    description: 'Name of the build platform to cache dependencies. It can be "maven" or "gradle".'
+    description: 'Name of the build platform to cache dependencies. It can be "maven", "gradle" or "sbt".'
     required: false
   job-status:
     description: 'Workaround to pass job status to post job step. This variable is not intended for manual setting'

docs/advanced-usage.md

@@ -3,6 +3,9 @@
   - [Eclipse Temurin](#Eclipse-Temurin)
   - [Adopt](#Adopt)
   - [Zulu](#Zulu)
+  - [Liberica](#Liberica)
+  - [Microsoft](#Microsoft)
+  - [Amazon Corretto](#Amazon-Corretto)
 - [Installing custom Java package type](#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](#Installing-Java-from-local-file)
@@ -76,6 +79,19 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
+### Amazon Corretto
+**NOTE:** Amazon Corretto only supports the major version specification.
+
+```yaml
+steps:
+- uses: actions/checkout@v3
+- uses: actions/setup-java@v3
+  with:
+    distribution: 'corretto'
+    java-version: '11'
+- run: java -cp java HelloWorldApp
+```
+
 ## Installing custom Java package type
 ```yaml
 steps:

package-lock.json

@@ -9,7 +9,7 @@
       "version": "3.1.1",
       "license": "MIT",
       "dependencies": {
-        "@actions/cache": "^2.0.2",
+        "@actions/cache": "^3.0.0",
         "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.4",
         "@actions/glob": "^0.2.0",
@@ -23,7 +23,7 @@
         "@types/jest": "^27.0.2",
         "@types/node": "^16.11.25",
         "@types/semver": "^7.3.4",
-        "@zeit/ncc": "^0.20.5",
+        "@vercel/ncc": "^0.33.4",
         "jest": "^27.2.5",
         "jest-circus": "^27.2.5",
         "prettier": "^1.19.1",
@@ -32,14 +32,14 @@
       }
     },
     "node_modules/@actions/cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-2.0.2.tgz",
-      "integrity": "sha512-K1DCaW/OtHj5mV7hI7HEXiceX3rM4Nc0iG2hfYsrkEy6GiOeqlCC/LyICrBZIRDM6+vSrS12tg1ORl4hghomBA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.0.tgz",
+      "integrity": "sha512-GL9CT1Fnu+pqs8TTB621q8Xa8Cilw2n9MwvbgMedetH7L1q2n6jY61gzbwGbKgtVbp3gVJ12aNMi4osSGXx3KQ==",
       "dependencies": {
         "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.1",
         "@actions/glob": "^0.1.0",
-        "@actions/http-client": "^1.0.9",
+        "@actions/http-client": "^2.0.1",
         "@actions/io": "^1.0.1",
         "@azure/ms-rest-js": "^2.6.0",
         "@azure/storage-blob": "^12.8.0",
@@ -56,6 +56,14 @@
         "minimatch": "^3.0.4"
       }
     },
+    "node_modules/@actions/cache/node_modules/@actions/http-client": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
     "node_modules/@actions/cache/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -1893,11 +1901,10 @@
       "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
-    "node_modules/@zeit/ncc": {
-      "version": "0.20.5",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.20.5.tgz",
-      "integrity": "sha512-XU6uzwvv95DqxciQx+aOLhbyBx/13ky+RK1y88Age9Du3BlA4mMPCy13BGjayOrrumOzlq1XV3SD/BWiZENXlw==",
-      "deprecated": "@zeit/ncc is no longer maintained. Please use @vercel/ncc instead.",
+    "node_modules/@vercel/ncc": {
+      "version": "0.33.4",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.33.4.tgz",
+      "integrity": "sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==",
       "dev": true,
       "bin": {
         "ncc": "dist/ncc/cli.js"
@@ -6665,14 +6672,14 @@
   },
   "dependencies": {
     "@actions/cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-2.0.2.tgz",
-      "integrity": "sha512-K1DCaW/OtHj5mV7hI7HEXiceX3rM4Nc0iG2hfYsrkEy6GiOeqlCC/LyICrBZIRDM6+vSrS12tg1ORl4hghomBA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.0.tgz",
+      "integrity": "sha512-GL9CT1Fnu+pqs8TTB621q8Xa8Cilw2n9MwvbgMedetH7L1q2n6jY61gzbwGbKgtVbp3gVJ12aNMi4osSGXx3KQ==",
       "requires": {
         "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.1",
         "@actions/glob": "^0.1.0",
-        "@actions/http-client": "^1.0.9",
+        "@actions/http-client": "^2.0.1",
         "@actions/io": "^1.0.1",
         "@azure/ms-rest-js": "^2.6.0",
         "@azure/storage-blob": "^12.8.0",
@@ -6689,6 +6696,14 @@
             "minimatch": "^3.0.4"
           }
         },
+        "@actions/http-client": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
+          "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+          "requires": {
+            "tunnel": "^0.0.6"
+          }
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -8210,10 +8225,10 @@
       "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
-    "@zeit/ncc": {
-      "version": "0.20.5",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.20.5.tgz",
-      "integrity": "sha512-XU6uzwvv95DqxciQx+aOLhbyBx/13ky+RK1y88Age9Du3BlA4mMPCy13BGjayOrrumOzlq1XV3SD/BWiZENXlw==",
+    "@vercel/ncc": {
+      "version": "0.33.4",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.33.4.tgz",
+      "integrity": "sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==",
       "dev": true
     },
     "abab": {

package.json

@@ -24,7 +24,7 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^2.0.2",
+    "@actions/cache": "^3.0.0",
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
     "@actions/glob": "^0.2.0",
@@ -38,11 +38,11 @@
     "@types/jest": "^27.0.2",
     "@types/node": "^16.11.25",
     "@types/semver": "^7.3.4",
-    "@zeit/ncc": "^0.20.5",
     "jest": "^27.2.5",
     "jest-circus": "^27.2.5",
+    "@vercel/ncc": "^0.33.4",
     "prettier": "^1.19.1",
     "ts-jest": "^27.0.5",
     "typescript": "^4.2.3"
   }
-}
+}

src/cache.ts

@@ -38,7 +38,11 @@ const supportedPackageManager: PackageManager[] = [
     path: [
       join(os.homedir(), '.ivy2', 'cache'),
       join(os.homedir(), '.sbt'),
-      getCoursierCachePath()
+      getCoursierCachePath(),
+      // Some files should not be cached to avoid resolution problems.
+      // In particular the resolution of snapshots (ideological gap between maven/ivy).
+      '!' + join(os.homedir(), '.sbt', '*.lock'),
+      '!' + join(os.homedir(), '**', 'ivydata-*.properties')
     ],
     pattern: ['**/*.sbt', '**/project/build.properties', '**/project/**.{scala,sbt}']
   }

src/distributions/base-installer.ts

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import semver from 'semver';
 import path from 'path';
 import * as httpm from '@actions/http-client';
-import { getToolcachePath, getVersionFromToolcachePath, isVersionSatisfies } from '../util';
+import { getToolcachePath, isVersionSatisfies } from '../util';
 import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from './base-models';
 import { MACOS_JAVA_CONTENT_POSTFIX } from '../constants';
 

src/distributions/corretto/installer.ts

@@ -0,0 +1,155 @@
+import * as core from '@actions/core';
+import * as tc from '@actions/tool-cache';
+import fs from 'fs';
+import path from 'path';
+import { extractJdkFile, getDownloadArchiveExtension } from '../../util';
+import { JavaBase } from '../base-installer';
+import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
+import { ICorrettoAllAvailableVersions, ICorettoAvailableVersions } from './models';
+
+export class CorrettoDistribution extends JavaBase {
+  constructor(installerOptions: JavaInstallerOptions) {
+    super('Corretto', installerOptions);
+  }
+
+  protected async downloadTool(javaRelease: JavaDownloadRelease): Promise<JavaInstallerResults> {
+    core.info(
+      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
+    );
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+
+    core.info(`Extracting Java archive...`);
+
+    const extractedJavaPath = await extractJdkFile(javaArchivePath, getDownloadArchiveExtension());
+
+    const archiveName = fs.readdirSync(extractedJavaPath)[0];
+    const archivePath = path.join(extractedJavaPath, archiveName);
+    const version = this.getToolcacheVersionName(javaRelease.version);
+
+    const javaPath = await tc.cacheDir(
+      archivePath,
+      this.toolcacheFolderName,
+      version,
+      this.architecture
+    );
+
+    return { version: javaRelease.version, path: javaPath };
+  }
+
+  protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
+    if (!this.stable) {
+      throw new Error('Early access versions are not supported');
+    }
+    if (version.includes('.')) {
+      throw new Error('Only major versions are supported');
+    }
+    const availableVersions = await this.getAvailableVersions();
+    const matchingVersions = availableVersions
+      .filter(item => item.version == version)
+      .map(item => {
+        return {
+          version: item.correttoVersion,
+          url: item.downloadLink
+        } as JavaDownloadRelease;
+      });
+
+    const resolvedVersion = matchingVersions.length > 0 ? matchingVersions[0] : null;
+    if (!resolvedVersion) {
+      const availableOptions = availableVersions.map(item => item.version).join(', ');
+      const availableOptionsMessage = availableOptions
+        ? `\nAvailable versions: ${availableOptions}`
+        : '';
+      throw new Error(
+        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
+      );
+    }
+    return resolvedVersion;
+  }
+
+  private async getAvailableVersions(): Promise<ICorettoAvailableVersions[]> {
+    const platform = this.getPlatformOption();
+    const arch = this.architecture;
+    const imageType = this.packageType;
+
+    console.time('coretto-retrieve-available-versions');
+
+    const availableVersionsUrl =
+      'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json';
+    const fetchCurrentVersions = await this.http.getJson<ICorrettoAllAvailableVersions>(
+      availableVersionsUrl
+    );
+    const fetchedCurrentVersions = fetchCurrentVersions.result;
+    if (!fetchedCurrentVersions) {
+      throw Error(`Could not fetch latest corretto versions from ${availableVersionsUrl}`);
+    }
+
+    const eligbleVersions = fetchedCurrentVersions?.[platform]?.[arch]?.[imageType];
+    const availableVersions = this.getAvailableVersionsForPlatform(eligbleVersions);
+
+    if (core.isDebug()) {
+      this.printAvailableVersions(availableVersions);
+    }
+
+    return availableVersions;
+  }
+
+  private getAvailableVersionsForPlatform(
+    eligbleVersions: ICorrettoAllAvailableVersions['os']['arch']['imageType'] | undefined
+  ): ICorettoAvailableVersions[] {
+    const availableVersions: ICorettoAvailableVersions[] = [];
+
+    for (const version in eligbleVersions) {
+      const availableVersion = eligbleVersions[version];
+      for (const fileType in availableVersion) {
+        const skipNonExtractableBinaries = fileType != getDownloadArchiveExtension();
+        if (skipNonExtractableBinaries) {
+          continue;
+        }
+        const availableVersionDetails = availableVersion[fileType];
+        const correttoVersion = this.getCorettoVersion(availableVersionDetails.resource);
+
+        availableVersions.push({
+          checksum: availableVersionDetails.checksum,
+          checksum_sha256: availableVersionDetails.checksum_sha256,
+          fileType,
+          resource: availableVersionDetails.resource,
+          downloadLink: `https://corretto.aws${availableVersionDetails.resource}`,
+          version: version,
+          correttoVersion
+        });
+      }
+    }
+    return availableVersions;
+  }
+
+  private printAvailableVersions(availableVersions: ICorettoAvailableVersions[]) {
+    core.startGroup('Print information about available versions');
+    console.timeEnd('coretto-retrieve-available-versions');
+    console.log(`Available versions: [${availableVersions.length}]`);
+    console.log(
+      availableVersions.map(item => `${item.version}: ${item.correttoVersion}`).join(', ')
+    );
+    core.endGroup();
+  }
+
+  private getPlatformOption(): string {
+    // Coretto has its own platform names so we need to map them
+    switch (process.platform) {
+      case 'darwin':
+        return 'macos';
+      case 'win32':
+        return 'windows';
+      default:
+        return process.platform;
+    }
+  }
+
+  private getCorettoVersion(resource: string): string {
+    const regex = /(\d+.+)\//;
+    const match = regex.exec(resource);
+    if (match === null) {
+      throw Error(`Could not parse corretto version from ${resource}`);
+    }
+    return match[1];
+  }
+}

src/distributions/corretto/models.ts

@@ -0,0 +1,25 @@
+export interface ICorrettoAllAvailableVersions {
+  [os: string]: {
+    [arch: string]: {
+      [distributionType: string]: {
+        [version: string]: {
+          [fileType: string]: {
+            checksum: string;
+            checksum_sha256: string;
+            resource: string;
+          };
+        };
+      };
+    };
+  };
+}
+
+export interface ICorettoAvailableVersions {
+  version: string;
+  fileType: string;
+  checksum: string;
+  checksum_sha256: string;
+  resource: string;
+  downloadLink: string;
+  correttoVersion: string;
+}

src/distributions/distribution-factory.ts

@@ -6,6 +6,7 @@ import { AdoptDistribution, AdoptImplementation } from './adopt/installer';
 import { TemurinDistribution, TemurinImplementation } from './temurin/installer';
 import { LibericaDistributions } from './liberica/installer';
 import { MicrosoftDistributions } from './microsoft/installer';
+import { CorrettoDistribution } from './corretto/installer';
 
 enum JavaDistribution {
   Adopt = 'adopt',
@@ -15,7 +16,8 @@ enum JavaDistribution {
   Zulu = 'zulu',
   Liberica = 'liberica',
   JdkFile = 'jdkfile',
-  Microsoft = 'microsoft'
+  Microsoft = 'microsoft',
+  Corretto = 'corretto'
 }
 
 export function getJavaDistribution(
@@ -39,6 +41,8 @@ export function getJavaDistribution(
       return new LibericaDistributions(installerOptions);
     case JavaDistribution.Microsoft:
       return new MicrosoftDistributions(installerOptions);
+    case JavaDistribution.Corretto:
+      return new CorrettoDistribution(installerOptions);
     default:
       return null;
   }

src/distributions/microsoft/installer.ts

@@ -80,11 +80,17 @@ export class MicrosoftDistributions extends JavaBase {
     // TODO get these dynamically!
     // We will need Microsoft to add an endpoint where we can query for versions.
     const jdkVersions = [
+      {
+        version: [17, 0, 3]
+      },
       {
         version: [17, 0, 1, 12, 1]
       },
       {
         version: [16, 0, 2, 7, 1]
+      },
+      {
+        version: [11, 0, 15]
       }
     ];
 

src/distributions/zulu/installer.ts

@@ -133,6 +133,8 @@ export class ZuluDistribution extends JavaBase {
       return { arch: 'x86', hw_bitness: '64', abi: '' };
     } else if (this.architecture == 'x86') {
       return { arch: 'x86', hw_bitness: '32', abi: '' };
+    } else if (this.architecture == 'arm64') {
+      return { arch: 'arm', hw_bitness: '64', abi: '' };
     } else {
       return { arch: this.architecture, hw_bitness: '', abi: '' };
     }