Corretto toolcache folder name fix

__tests__/distributors/corretto-installer.test.ts

@@ -241,3 +241,22 @@ describe('getAvailableVersions', () => {
     spyGetDownloadArchiveExtension.mockReturnValue(mockedExtension);
   };
 });
+
+describe('convertVersionToSemver', () => {
+  it.each([
+    ['12', '12'],
+    ['12.0', '12.0'],
+    ['12.0.2', '12.0.2'],
+    ['12.0.2.1', '12.0.2+1'],
+    ['12.0.2.1.0', '12.0.2+1.0']
+  ])('%s -> %s', (input: string, expected: string) => {
+    const distribution = new CorrettoDistribution({
+      version: '12',
+      architecture: 'x86',
+      packageType: 'jdk',
+      checkLatest: false
+    });
+    const actual = distribution['convertVersionToSemver'](input);
+    expect(actual).toBe(expected);
+  });
+});

dist/setup/index.js

@@ -104208,7 +104208,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
                 .filter(item => item.version == version)
                 .map(item => {
                 return {
-                    version: item.correttoVersion,
+                    version: this.convertVersionToSemver(item.correttoVersion),
                     url: item.downloadLink
                 };
             });
@@ -104297,6 +104297,15 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
         }
         return match[1];
     }
+    convertVersionToSemver(version) {
+        // corretto uses semver-like notation e.g. 17.0.6.10.1
+        const versionArray = version.split('.');
+        const mainVersion = versionArray.slice(0, 3).join('.');
+        if (versionArray.length > 3) {
+            return `${mainVersion}+${versionArray.slice(3).join('.')}`;
+        }
+        return mainVersion;
+    }
 }
 exports.CorrettoDistribution = CorrettoDistribution;
 

src/distributions/corretto/installer.ts

@@ -62,7 +62,7 @@ export class CorrettoDistribution extends JavaBase {
       .filter(item => item.version == version)
       .map(item => {
         return {
-          version: item.correttoVersion,
+          version: this.convertVersionToSemver(item.correttoVersion),
           url: item.downloadLink
         } as JavaDownloadRelease;
       });
@@ -179,4 +179,15 @@ export class CorrettoDistribution extends JavaBase {
     }
     return match[1];
   }
+
+  private convertVersionToSemver(version: string) {
+    // corretto uses semver-like notation e.g. 17.0.6.10.1
+    const versionArray = version.split('.');
+    const mainVersion = versionArray.slice(0, 3).join('.');
+    if (versionArray.length > 3) {
+      return `${mainVersion}+${versionArray.slice(3).join('.')}`;
+    }
+
+    return mainVersion;
+  }
 }