Relax requirement of mandrel versions starting with mandrel-

Since we can now define the distribution there is no longer the need to
include the mandrel- prefix in Mandrel versions.

src/main.ts

@@ -58,13 +58,7 @@ async function run(): Promise<void> {
           graalVMHome = await graalvm.setUpGraalVMJDKCE(javaVersion)
           break
         case c.DISTRIBUTION_MANDREL:
-          if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-            graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
-          } else {
-            throw new Error(
-              `Mandrel requires the 'version' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
-            )
-          }
+          graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
           break
         case '':
           if (javaVersion === c.VERSION_DEV) {

src/mandrel.ts

@@ -1,4 +1,5 @@
 import * as c from './constants'
+import * as httpClient from '@actions/http-client'
 import {downloadExtractAndCacheJDK, getLatestRelease} from './utils'
 import {downloadTool} from '@actions/tool-cache'
 import {basename} from 'path'
@@ -8,22 +9,23 @@ export const MANDREL_TAG_PREFIX = c.MANDREL_NAMESPACE
 const MANDREL_DL_BASE = 'https://github.com/graalvm/mandrel/releases/download'
 const DISCO_API_BASE = 'https://api.foojay.io/disco/v3.0/packages/jdks'
 
+interface JdkData {
+  message: string
+  result: any
+}
+
 export async function setUpMandrel(
-  graalvmVersion: string,
+  mandrelVersion: string,
   javaVersion: string
 ): Promise<string> {
-  const mandrelVersion = graalvmVersion.substring(
-    c.MANDREL_NAMESPACE.length,
-    graalvmVersion.length
-  )
-
+  const version = stripMandrelNamespace(mandrelVersion)
   let mandrelHome
-  switch (mandrelVersion) {
+  switch (version) {
     case 'latest':
       mandrelHome = await setUpMandrelLatest(javaVersion)
       break
     default:
-      mandrelHome = await setUpMandrelRelease(mandrelVersion, javaVersion)
+      mandrelHome = await setUpMandrelRelease(version, javaVersion)
       break
   }
 
@@ -32,10 +34,9 @@ export async function setUpMandrel(
 
 async function setUpMandrelLatest(javaVersion: string): Promise<string> {
   const latest_release_url = await getLatestMandrelReleaseUrl(javaVersion)
-  const version_tag = getTagFromURI(latest_release_url);
-  const version = version_tag.substring(c.MANDREL_NAMESPACE.length, version_tag.length)
-  console.log(version);
-    
+  const version_tag = getTagFromURI(latest_release_url)
+  const version = stripMandrelNamespace(version_tag)
+
   const toolName = determineToolName(javaVersion)
   return downloadExtractAndCacheJDK(
     async () => downloadTool(latest_release_url),
@@ -46,39 +47,58 @@ async function setUpMandrelLatest(javaVersion: string): Promise<string> {
 
 // Download URIs are of the form https://github.com/graalvm/mandrel/releases/download/<tag>/<archive-name>
 function getTagFromURI(uri: string): string {
-  const parts = uri.split('/');
+  const parts = uri.split('/')
   try {
-    return parts[parts.length - 2];
+    return parts[parts.length - 2]
   } catch (error) {
     throw new Error(`Failed to extract tag from URI ${uri}: ${error}`)
   }
 }
 
-export async function getLatestMandrelReleaseUrl(javaVersion: string): Promise<string> {
+export async function getLatestMandrelReleaseUrl(
+  javaVersion: string
+): Promise<string> {
   const url = `${DISCO_API_BASE}?jdk_version=${javaVersion}&distribution=${c.DISTRIBUTION_MANDREL}&architecture=${c.JDK_ARCH}&operating_system=${c.JDK_PLATFORM}&latest=per_distro`
-  const response = await fetch(url)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch latest Mandrel release for Java ${javaVersion} from DISCO API: ${response.statusText}`)
+  const _http = new httpClient.HttpClient('http-client-tests')
+  const response = await _http.getJson<JdkData>(url)
+  if (response.statusCode !== 200) {
+    throw new Error(
+      `Failed to fetch latest Mandrel release for Java ${javaVersion} from DISCO API: ${response.result}`
+    )
   }
-  const data = await response.json()
+  const result = response.result?.result[0]
   try {
-    const pkg_info_uri = data.result[0].links.pkg_info_uri
-    return getLatestMandrelReleaseUrlHelper(javaVersion, pkg_info_uri)
+    const pkg_info_uri = result.links.pkg_info_uri
+    return await getLatestMandrelReleaseUrlHelper(
+      _http,
+      javaVersion,
+      pkg_info_uri
+    )
   } catch (error) {
-    throw new Error(`Failed to get latest Mandrel release for Java ${javaVersion} from DISCO API: ${error}`)
+    throw new Error(
+      `Failed to get latest Mandrel release for Java ${javaVersion} from DISCO API: ${error}`
+    )
   }
 }
 
-async function getLatestMandrelReleaseUrlHelper(java_version: string, pkg_info_uri: string): Promise<string> {
-  const response = await fetch(pkg_info_uri)
-  if (!response.ok) {
-    throw new Error(`Failed to fetch package info of latest Mandrel release for Java ${java_version} from DISCO API: ${response.statusText}`)
+async function getLatestMandrelReleaseUrlHelper(
+  _http: httpClient.HttpClient,
+  java_version: string,
+  pkg_info_uri: string
+): Promise<string> {
+  const response = await _http.getJson<JdkData>(pkg_info_uri)
+  if (response.statusCode !== 200) {
+    throw new Error(
+      `Failed to fetch package info of latest Mandrel release for Java ${java_version} from DISCO API: ${response.result}`
+    )
   }
-  const data = await response.json()
+  const result = response.result?.result[0]
   try {
-    return data.result[0].direct_download_uri
+    return result.direct_download_uri
   } catch (error) {
-    throw new Error(`Failed to get download URI of latest Mandrel release for Java ${java_version} from DISCO API: ${error}`)
+    throw new Error(
+      `Failed to get download URI of latest Mandrel release for Java ${java_version} from DISCO API: ${error}`
+    )
   }
 }
 
@@ -127,3 +147,14 @@ function determineMandrelIdentifier(
 function determineToolName(javaVersion: string): string {
   return `mandrel-java${javaVersion}-${c.GRAALVM_PLATFORM}`
 }
+
+export function stripMandrelNamespace(graalVMVersion: string) {
+  if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
+    return graalVMVersion.substring(
+      c.MANDREL_NAMESPACE.length,
+      graalVMVersion.length
+    )
+  } else {
+    return graalVMVersion
+  }
+}