Support exact Corretto release versions

__tests__/distributors/corretto-installer.test.ts

@@ -244,19 +244,282 @@ describe('getAvailableVersions', () => {
       ).rejects.toThrow('Early access versions are not supported');
     });
 
-    it('with non major version expect to throw not supported error', async () => {
-      const version = '18.0.1';
+    it.each(['18.0.1', '17.0.13.11', '17.0.13.11.1.1'])(
+      'rejects partial or malformed release %s',
+      async version => {
+        const distribution = new CorrettoDistribution({
+          version,
+          architecture: 'x64',
+          packageType: 'jdk',
+          checkLatest: false
+        });
+        mockPlatform(distribution, 'linux');
+
+        await expect(
+          distribution['findPackageForDownload'](version)
+        ).rejects.toThrow(
+          'Specify a major version or a full Corretto release, such as 25.0.5.0.10'
+        );
+      }
+    );
+
+    it.each([
+      [
+        '25.0.5.0.10',
+        'linux',
+        'x64',
+        'jdk',
+        '25.0.5+0.10',
+        'https://corretto.aws/downloads/resources/25.0.5.0.10/amazon-corretto-25.0.5.0.10-linux-x64.tar.gz'
+      ],
+      [
+        '25.0.5+0.10',
+        'macos',
+        'arm64',
+        'jdk',
+        '25.0.5+0.10',
+        'https://corretto.aws/downloads/resources/25.0.5.0.10/amazon-corretto-25.0.5.0.10-macosx-aarch64.tar.gz'
+      ],
+      [
+        '17.0.2.8.1',
+        'windows',
+        'x64',
+        'jdk',
+        '17.0.2+8.1',
+        'https://corretto.aws/downloads/resources/17.0.2.8.1/amazon-corretto-17.0.2.8.1-windows-x64-jdk.zip'
+      ],
+      [
+        '25.0.5.0.10',
+        'alpine',
+        'aarch64',
+        'jdk',
+        '25.0.5+0.10',
+        'https://corretto.aws/downloads/resources/25.0.5.0.10/amazon-corretto-25.0.5.0.10-alpine-linux-aarch64.tar.gz'
+      ],
+      [
+        '11.0.14.10.1',
+        'linux',
+        'armv7',
+        'jdk',
+        '11.0.14+10.1',
+        'https://corretto.aws/downloads/resources/11.0.14.10.1/amazon-corretto-11.0.14.10.1-linux-armv7.tar.gz'
+      ],
+      [
+        '8.472.8+1',
+        'linux',
+        'x64',
+        'jdk',
+        '8.472.8+1',
+        'https://corretto.aws/downloads/resources/8.472.08.1/amazon-corretto-8.472.08.1-linux-x64.tar.gz'
+      ],
+      [
+        '8.472.08.1',
+        'linux',
+        'x64',
+        'jdk',
+        '8.472.8+1',
+        'https://corretto.aws/downloads/resources/8.472.08.1/amazon-corretto-8.472.08.1-linux-x64.tar.gz'
+      ],
+      [
+        '8.472.08.1',
+        'windows',
+        'x86',
+        'jre',
+        '8.472.8+1',
+        'https://corretto.aws/downloads/resources/8.472.08.1/amazon-corretto-8.472.08.1-windows-x86-jre.zip'
+      ]
+    ])(
+      'resolves exact release %s on %s/%s (%s)',
+      async (
+        requestedVersion,
+        platform,
+        architecture,
+        packageType,
+        expectedVersion,
+        url
+      ) => {
+        const checksum = 'a'.repeat(64);
+        spyHttpClient.mockResolvedValue({
+          statusCode: 200,
+          headers: {},
+          result: {
+            body: `|JDK|[archive](${url})|\`md5\` /<br /> \`${checksum}\`|`
+          }
+        });
+        const distribution = new CorrettoDistribution({
+          version: requestedVersion,
+          architecture,
+          packageType,
+          checkLatest: false
+        });
+        mockPlatform(distribution, platform);
+
+        const release = await distribution['findPackageForDownload'](
+          distribution['version']
+        );
+        const rawVersion = new URL(url).pathname.split('/')[3];
+        const source = `https://github.com/proxy/api.github.com/repos/corretto/corretto-${rawVersion.split('.')[0]}/releases/tags/${rawVersion}`;
+        expect(release).toEqual({
+          version: expectedVersion,
+          url,
+          checksum: {algorithm: 'sha256', value: checksum, source}
+        });
+        expect(spyHttpClient).toHaveBeenCalledTimes(1);
+        expect(spyHttpClient).toHaveBeenCalledWith(
+          source,
+          expect.objectContaining({accept: 'application/vnd.github+json'})
+        );
+      }
+    );
+
+    it('rejects exact releases without an archive for the requested platform', async () => {
+      spyHttpClient.mockResolvedValueOnce({
+        statusCode: 200,
+        headers: {},
+        result: {
+          body:
+            '|[other archive](https://example.com/archive)|`' +
+            'a'.repeat(64) +
+            '`|'
+        }
+      });
       const distribution = new CorrettoDistribution({
-        version,
+        version: '25.0.5.0.10',
         architecture: 'x64',
         packageType: 'jdk',
         checkLatest: false
       });
       mockPlatform(distribution, 'linux');
+      await expect(
+        distribution['findPackageForDownload'](distribution['version'])
+      ).rejects.toThrow(
+        'No linux/x64 jdk archive is listed for Corretto 25.0.5.0.10'
+      );
+    });
 
+    it('rejects historical archives with only an MD5 checksum', async () => {
+      spyHttpClient.mockResolvedValueOnce({
+        statusCode: 200,
+        headers: {},
+        result: {
+          body:
+            '|[archive](https://corretto.aws/downloads/resources/17.0.1.12.1/amazon-corretto-17.0.1.12.1-linux-x64.tar.gz)|`' +
+            'a'.repeat(32) +
+            '`|'
+        }
+      });
+      const distribution = new CorrettoDistribution({
+        version: '17.0.1.12.1',
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
       await expect(
-        distribution['findPackageForDownload'](version)
-      ).rejects.toThrow('Only major versions are supported');
+        distribution['findPackageForDownload'](distribution['version'])
+      ).rejects.toThrow(
+        'No SHA-256 checksum is published for Corretto 17.0.1.12.1 (linux, x64, jdk)'
+      );
+    });
+
+    it('does not substitute a JDK for an exact Linux JRE request', async () => {
+      const distribution = new CorrettoDistribution({
+        version: '25.0.5.0.10',
+        architecture: 'x64',
+        packageType: 'jre',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+      await expect(
+        distribution['findPackageForDownload'](distribution['version'])
+      ).rejects.toThrow('Corretto JRE archives are only available for Windows');
+      expect(spyHttpClient).not.toHaveBeenCalled();
+    });
+
+    it('resolves catalog-only releases without a GitHub release', async () => {
+      spyHttpClient.mockResolvedValueOnce({
+        statusCode: 404,
+        headers: {},
+        result: null
+      });
+      const distribution = new CorrettoDistribution({
+        version: '15.0.2.7.1',
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+      expect(
+        await distribution['findPackageForDownload'](distribution['version'])
+      ).toEqual({
+        version: '15.0.2+7.1',
+        url: 'https://corretto.aws/downloads/resources/15.0.2.7.1/amazon-corretto-15.0.2.7.1-linux-x64.tar.gz',
+        checksum: {
+          algorithm: 'sha256',
+          value: manifestData.linux.x64.jdk['15']['tar.gz'].checksum_sha256,
+          source:
+            'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json'
+        }
+      });
+    });
+
+    it('falls back to the catalog when the GitHub lookup fails', async () => {
+      spyHttpClient.mockRejectedValueOnce(new Error('GitHub rate limit'));
+      const distribution = new CorrettoDistribution({
+        version: '15.0.2.7.1',
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+
+      expect(
+        await distribution['findPackageForDownload'](distribution['version'])
+      ).toEqual({
+        version: '15.0.2+7.1',
+        url: 'https://corretto.aws/downloads/resources/15.0.2.7.1/amazon-corretto-15.0.2.7.1-linux-x64.tar.gz',
+        checksum: {
+          algorithm: 'sha256',
+          value: manifestData.linux.x64.jdk['15']['tar.gz'].checksum_sha256,
+          source:
+            'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json'
+        }
+      });
+      expect(spyHttpClient).toHaveBeenCalledTimes(2);
+    });
+
+    it('reports missing release metadata without substituting the latest release', async () => {
+      spyHttpClient.mockResolvedValueOnce({
+        statusCode: 404,
+        headers: {},
+        result: null
+      });
+      const distribution = new CorrettoDistribution({
+        version: '17.0.0.0.999',
+        architecture: 'x64',
+        packageType: 'jdk',
+        checkLatest: false
+      });
+      mockPlatform(distribution, 'linux');
+      await expect(
+        distribution['findPackageForDownload'](distribution['version'])
+      ).rejects.toThrow(
+        "Corretto release 17.0.0.0.999 was not found in Amazon's GitHub releases or current download catalog"
+      );
+    });
+
+    it('does not normalize zero-padded major-only inputs', () => {
+      expect(
+        () =>
+          new CorrettoDistribution({
+            version: '08',
+            architecture: 'x64',
+            packageType: 'jdk',
+            checkLatest: false
+          })
+      ).toThrow(
+        "The string '08' is not valid SemVer notation for a Java version"
+      );
     });
 
     it('with unfound version throw could not find error', async () => {

__tests__/util.test.ts

@@ -278,6 +278,28 @@ describe('validatePaginationUrl', () => {
 });
 
 describe('getVersionFromFileContent', () => {
+  it.each(['25.0.5.0.10', '8.472.08.1', '25.0.5+0.10'])(
+    'preserves full Corretto release %s in .java-version',
+    version => {
+      expect(
+        getVersionFromFileContent(version, 'corretto', '.java-version')
+      ).toEqual({version, distribution: undefined});
+    }
+  );
+
+  it.each([
+    ['17.0.3.1', '.java-version', '17'],
+    ['1.8.0.472.1', '.java-version', '8'],
+    ['8.0.472.08.1', '.java-version', '8'],
+    ['8.0.282+8', '.java-version', '8'],
+    ['java corretto-17.0.13.11.1-jre', '.tool-versions', '17'],
+    ['java corretto-17.0.13.11.1+1', '.tool-versions', '17']
+  ])('keeps the existing major selection for %s', (content, file, version) => {
+    expect(getVersionFromFileContent(content, 'corretto', file)?.version).toBe(
+      version
+    );
+  });
+
   describe('.sdkmanrc', () => {
     it.each([
       ['java=26-tem', '26', 'temurin'],
@@ -290,6 +312,8 @@ describe('getVersionFromFileContent', () => {
       ['java=21.0.5-zulu', '21.0.5', 'zulu'],
       ['java=17.0.13-albba', '17.0.13', 'dragonwell'],
       ['java=17.0.13-amzn', '17', 'corretto'],
+      ['java=25.0.5.0.10-amzn', '25.0.5.0.10', 'corretto'],
+      ['java=8.472.08.1-amzn', '8.472.08.1', 'corretto'],
       ['java=21.0.5-graal', '21.0.5', 'graalvm'],
       ['java=17.0.9-graalce', '17.0.9', 'graalvm'],
       ['java=11.0.25-librca', '11.0.25', 'liberica'],
@@ -368,7 +392,8 @@ describe('getVersionFromFileContent', () => {
       ['java adoptopenjdk-11.0.16+8', '11.0.16+8', 'temurin'],
       ['java adoptopenjdk-openj9-11.0.16+8', '11.0.16+8', 'temurin'],
       ['java zulu-11.56.19', '11.56.19', 'zulu'],
-      ['java corretto-17.0.13.11.1', '17', 'corretto'], // corretto -> major only
+      ['java corretto-17.0.13.11.1', '17.0.13.11.1', 'corretto'],
+      ['java corretto-8.472.08.1', '8.472.08.1', 'corretto'],
       ['java liberica-11.0.15+10', '11.0.15+10', 'liberica'],
       ['java microsoft-11.0.13.8.1', '11.0.13', 'microsoft'],
       ['java semeru-openj9-11.0.25+9', '11.0.25+9', 'semeru'],

dist/cleanup/index.js

@@ -31220,7 +31220,7 @@ const DISTRIBUTIONS_ONLY_MAJOR_VERSION = (/* unused pure expression or super */
 /* harmony export */   Vt: () => (/* binding */ getBooleanInput),
 /* harmony export */   lN: () => (/* binding */ isJdkCacheEnabled)
 /* harmony export */ });
-/* unused harmony exports getVersionFromToolcachePath, extractJdkFile, cacheJdkDir, getJavaVersionFromReleaseFile, getDownloadArchiveExtension, isVersionSatisfies, getToolcachePath, isGhes, getVersionFromFileContent, convertVersionToSemver, normalizeJavaVersionToSemver, getArtifactFingerprint, getGitHubToken, getGitHubHttpHeaders, MAX_PAGINATION_PAGES, getNextPageUrlFromLinkHeader, validatePaginationUrl, renameWinArchive, getLatestMajorVersion */
+/* unused harmony exports getVersionFromToolcachePath, extractJdkFile, cacheJdkDir, getJavaVersionFromReleaseFile, getDownloadArchiveExtension, isVersionSatisfies, getToolcachePath, isGhes, getVersionFromFileContent, isExactCorrettoVersion, convertVersionToSemver, normalizeJavaVersionToSemver, getArtifactFingerprint, getGitHubToken, getGitHubHttpHeaders, MAX_PAGINATION_PAGES, getNextPageUrlFromLinkHeader, validatePaginationUrl, renameWinArchive, getLatestMajorVersion */
 /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(857);
 /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__nccwpck_require__.n(os__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(6928);
@@ -31527,6 +31527,15 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     }
     const tentativeVersion = avoidOldNotation(capturedVersion);
     const rawVersion = tentativeVersion.split('-')[0];
+    // Preserve Corretto's full vendor release before generic coercion drops its extra numeric fields.
+    if ((extractedDistribution || distributionName) === 'corretto' &&
+        capturedVersion === tentativeVersion &&
+        isExactCorrettoVersion(tentativeVersion)) {
+        return {
+            version: tentativeVersion,
+            distribution: extractedDistribution
+        };
+    }
     let version = semver.validRange(rawVersion)
         ? tentativeVersion
         : semver.coerce(tentativeVersion);
@@ -31610,6 +31619,10 @@ function mapAsdfDistribution(asdfDist) {
 function avoidOldNotation(content) {
     return content.startsWith('1.') ? content.substring(2) : content;
 }
+function isExactCorrettoVersion(version) {
+    // Java 8 releases have a nonzero update field; later releases use five numeric fields.
+    return /^(?:8\.(?!0+(?:\.|$))\d+(?:\.\d+){2}|(?!8\.)\d+(?:\.\d+){4})$/.test(version.replace('+', '.'));
+}
 function convertVersionToSemver(version) {
     // Some distributions may use semver-like notation (12.10.2.1, 12.10.2.1.1)
     const versionArray = Array.isArray(version) ? version : version.split('.');