Add Amazon Corretto distribution

.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

README.md

@@ -60,6 +60,7 @@ 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.
 

__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);
+  };
+});