__tests__/distributors/graalvm-installer.test.ts

@@ -356,16 +356,14 @@ describe('GraalVMDistribution', () => {
         // Verify the error is thrown with the expected message
         await expect(
           (distribution as any).findPackageForDownload('17.0.99')
-        ).rejects.toThrow("No matching version found for SemVer '17.0.99'");
-        // Verify distribution info is included
-        await expect(
-          (distribution as any).findPackageForDownload('17.0.99')
-        ).rejects.toThrow('GraalVM');
+        ).rejects.toThrow(
+          "No matching GraalVM version found for SemVer '17.0.99'. Available versions can be found at https://download.oracle.com/graalvm/. Pick a version from the list."
+        );
 
         // Verify the hint about checking the base URL is included
         await expect(
           (distribution as any).findPackageForDownload('17.0.99')
-        ).rejects.toThrow('https://www.graalvm.org/downloads/');
+        ).rejects.toThrow('https://download.oracle.com/graalvm');
       });
 
       it('should throw error for unauthorized access (401)', async () => {
@@ -507,20 +505,12 @@ describe('GraalVMDistribution', () => {
           .spyOn(distribution as any, 'distributionArchitecture')
           .mockReturnValue('x64');
 
-        await expect(
-          (distribution as any).findPackageForDownload('23')
-        ).rejects.toThrow("No matching version found for SemVer '23-ea'");
-
         await expect(
           (distribution as any).findPackageForDownload('23')
         ).rejects.toThrow(
-          'Note: No EA build is marked as latest for this version.'
+          "No EA build is marked as latest for version '23-ea'. Available EA versions: ['23-ea-20240716']."
         );
 
-        await expect(
-          (distribution as any).findPackageForDownload('23')
-        ).rejects.toThrow('23-ea-20240716');
-
         // Verify error logging - removed as we now use the helper method which doesn't call core.error
       });
 
@@ -726,20 +716,12 @@ describe('GraalVMDistribution', () => {
       const noLatestVersions = mockEAVersions.map(v => ({...v, latest: false}));
       fetchEASpy.mockResolvedValue(noLatestVersions);
 
-      await expect(
-        (distribution as any).findEABuildDownloadUrl('23-ea')
-      ).rejects.toThrow("No matching version found for SemVer '23-ea'");
-
       await expect(
         (distribution as any).findEABuildDownloadUrl('23-ea')
       ).rejects.toThrow(
-        'Note: No EA build is marked as latest for this version.'
+        "No EA build is marked as latest for version '23-ea'. Available EA versions: ['23-ea-20240716', '23-ea-20240709']."
       );
 
-      await expect(
-        (distribution as any).findEABuildDownloadUrl('23-ea')
-      ).rejects.toThrow('23-ea-20240716');
-
       // Verify error logging - removed as we now use the helper method which doesn't call core.error
     });
 

dist/setup/index.js

@@ -113139,7 +113139,6 @@ const base_installer_1 = __nccwpck_require__(59741);
 const http_client_1 = __nccwpck_require__(96255);
 const util_1 = __nccwpck_require__(92629);
 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
-const GRAALVM_DOWNLOAD_URL = 'https://www.graalvm.org/downloads/';
 const IS_WINDOWS = process.platform === 'win32';
 const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
 const GRAALVM_MIN_VERSION = 17;
@@ -113218,10 +113217,9 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
     handleHttpResponse(response, range) {
         const statusCode = response.message.statusCode;
         if (statusCode === http_client_1.HttpCodes.NotFound) {
-            // Create the standard error with additional hint about checking the download URL
-            const error = this.createVersionNotFoundError(range);
-            error.message += `\nPlease check if this version is available at ${GRAALVM_DOWNLOAD_URL} . Pick a version from the list.`;
-            throw error;
+            throw new Error(`No matching GraalVM version found for SemVer '${range}'.` +
+                ` Available versions can be found at ${GRAALVM_DL_BASE}/.` +
+                ` Pick a version from the list.`);
         }
         if (statusCode === http_client_1.HttpCodes.Unauthorized ||
             statusCode === http_client_1.HttpCodes.Forbidden) {
@@ -113239,7 +113237,11 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
             const latestVersion = versions.find(v => v.latest);
             if (!latestVersion) {
                 const availableVersions = versions.map(v => v.version);
-                throw this.createVersionNotFoundError(javaEaVersion, availableVersions, 'Note: No EA build is marked as latest for this version.');
+                let message = `No EA build is marked as latest for version '${javaEaVersion}'.`;
+                if (availableVersions.length > 0) {
+                    message += ` Available EA versions: [${availableVersions.map(v => `'${v}'`).join(', ')}].`;
+                }
+                throw new Error(message);
             }
             core.debug(`Latest version found: ${latestVersion.version}`);
             const arch = this.distributionArchitecture();

src/distributions/graalvm/installer.ts

@@ -18,7 +18,6 @@ import {
 } from '../../util';
 
 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
-const GRAALVM_DOWNLOAD_URL = 'https://www.graalvm.org/downloads/';
 const IS_WINDOWS = process.platform === 'win32';
 const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
 const GRAALVM_MIN_VERSION = 17;
@@ -150,10 +149,11 @@ export class GraalVMDistribution extends JavaBase {
     const statusCode = response.message.statusCode;
 
     if (statusCode === HttpCodes.NotFound) {
-      // Create the standard error with additional hint about checking the download URL
-      const error = this.createVersionNotFoundError(range);
-      error.message += `\nPlease check if this version is available at ${GRAALVM_DOWNLOAD_URL} . Pick a version from the list.`;
-      throw error;
+      throw new Error(
+        `No matching GraalVM version found for SemVer '${range}'.` +
+          ` Available versions can be found at ${GRAALVM_DL_BASE}/.` +
+          ` Pick a version from the list.`
+      );
     }
 
     if (
@@ -183,11 +183,11 @@ export class GraalVMDistribution extends JavaBase {
     const latestVersion = versions.find(v => v.latest);
     if (!latestVersion) {
       const availableVersions = versions.map(v => v.version);
-      throw this.createVersionNotFoundError(
-        javaEaVersion,
-        availableVersions,
-        'Note: No EA build is marked as latest for this version.'
-      );
+      let message = `No EA build is marked as latest for version '${javaEaVersion}'.`;
+      if (availableVersions.length > 0) {
+        message += ` Available EA versions: [${availableVersions.map(v => `'${v}'`).join(', ')}].`;
+      }
+      throw new Error(message);
     }
 
     core.debug(`Latest version found: ${latestVersion.version}`);