From cb063c121c66746c359186c0f4b9ead47c1f5a40 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 21 Feb 2024 10:06:08 +0100
Subject: [PATCH] Use new Oracle GraalVM EA builds repo.

---
 .github/workflows/test.yml |   3 ++
 __tests__/graalvm.test.ts  |  24 ++++++++++++-
 dist/cleanup/index.js      | Bin 3679962 -> 3679860 bytes
 dist/main/index.js         | Bin 3750614 -> 3751556 bytes
 src/constants.ts           |  19 +++++++++++
 src/graalvm.ts             |  67 ++++++++++++++++++++++++++-----------
 src/utils.ts               |  35 +++++++++----------
 7 files changed, 108 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d491f39..246c568 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,9 @@ jobs:
         ]
         components: ['']
         include:
+          - java-version: 'latest-ea'
+            distribution: 'graalvm'
+            os: ubuntu-latest
           - java-version: '22-ea'
             distribution: 'graalvm'
             os: ubuntu-latest
diff --git a/__tests__/graalvm.test.ts b/__tests__/graalvm.test.ts
index aee238b..13e6c02 100644
--- a/__tests__/graalvm.test.ts
+++ b/__tests__/graalvm.test.ts
@@ -2,7 +2,11 @@ import * as path from 'path'
 import * as graalvm from '../src/graalvm'
 import {expect, test} from '@jest/globals'
 import {getTaggedRelease} from '../src/utils'
-import {findGraalVMVersion, findHighestJavaVersion} from '../src/graalvm'
+import {
+  findGraalVMVersion,
+  findHighestJavaVersion,
+  findLatestEABuildDownloadUrl
+} from '../src/graalvm'
 import {GRAALVM_RELEASES_REPO} from '../src/constants'
 
 process.env['RUNNER_TOOL_CACHE'] = path.join(__dirname, 'TOOL_CACHE')
@@ -79,3 +83,21 @@ test('find version/javaVersion', async () => {
   }
   expect(error.message).toContain('Could not find highest Java version.')
 })
+
+test('find version/javaVersion', async () => {
+  let url22EA = await findLatestEABuildDownloadUrl('22-ea')
+  expect(url22EA).not.toBe('')
+  let urlLatestEA = await findLatestEABuildDownloadUrl('latest-ea')
+  expect(urlLatestEA).not.toBe('')
+
+  let error = new Error('unexpected')
+  try {
+    await findLatestEABuildDownloadUrl('8-ea')
+  } catch (err) {
+    if (!(err instanceof Error)) {
+      fail(`Unexpected non-Error: ${err}`)
+    }
+    error = err
+  }
+  expect(error.message).toContain('Unable to resolve download URL for')
+})
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index 93c85610a3e3f7327e9eda34906acbf3ea1e3893..3e044eb28d8635774d9e6ae2b54112e8a789eb34 100644
GIT binary patch
delta 293
zcmYMtzb^xE9LDjS9$Kn*s;ZPa_2Y`-zV&l4Nr%Ruj?Q9eFtojJe}Kq4v2-z9zPrCc
za$&QRh>fY6#LVuyG=|ske4Z!ye7<(HpO=nyjYba<bb9HdpC~Z~7$nXR2@FhzNisr;
zQPPZ&VVnuFOfp4|X)I>QGs_(FEMQY$ktLQXvcf8B4^FjhxbA^_;+79<<)dS3*OJx1
z$%hwh$BxDSuXa^F2F`wX6F8+-bg$L)>rMYkKI<YSpLCH7zjg7ehxc*up_$#fa9Q_S
zMaz?S5v?NMOz|bHTGo*7hN$S?sedkWrYNMlbM^eJ?swB|BO#QMvaW0>o64559X1j>
Gjm#eyO=AK8

delta 447
zcmZ9I%}PQ+7>3dE<T>WQ)=AUGveGhjvOfsJRc#`q8!)M338Hdz5kz40LK`<CG@BMJ
zyMW-_K+A$wEn3+H1TI>(XpUA=A3QKHyze~Ud^~mxuTLFA0|po|gkhK<U<77}kYK?m
ztgyij2b^%h4G+8+!#HG2zz07j5kL@AAP8X^GYDfAbC^d2Q7m8)F)SgD#C<Z`)J~eo
zjL0(0<cQ|EP6jG$$3$i8u~Og7*Ogj5t17CtXQG11t{;_>lCLQdRjF3mq3(A3pdqlT
zgWj=R%OgnN*EN!6K_^YI+f%=p-B{>;mhd^OlxuZTD60L|eiccRpH#e1EFVQwlHMX}
zy!!iCbW_sP`V<Q!66zJO{H5Sw=f0SOJwFhUC0>kHf2n6o22oNhlkk}?%PwT<X5BZV
x#r{u#wOqXE(?UfuSdd%&`GLNxmXYYY;mT{HoMldmv%*>BtZ~*guWchIe*xzLm81Xw

diff --git a/dist/main/index.js b/dist/main/index.js
index de5a601038e97d66238a23fce57d7be8083b97ed..9172bc40fc45ef1f70997f2cedcf1d541a7ed334 100644
GIT binary patch
delta 1395
zcmaJ=ZAe>Z6ecmzcvH2;uV|{iNuxJTbIqH%u0v95TSq_a>=Ip9%7|C<UX6=4>Aly;
zP^m44R+MgZWj%j7wx1pBhlN4LHVge#x|V%7C=A9Ztp7Up!PuX{=-!(cYksU34%~as
zd(QKm=Q;1gzaLxR-^Z3^uz(fHzy@|GhYD~&B?#bzT~GzpPy@T67F<vV_0Rx~&;)L1
zh8FO^9%zL&Xa@pb@WEd2LkDz%2m$DV7oZz@AP5rleiqu?utlRIQGB!!s?Tk1gbr5j
ziVnR#HWV8r5h9+#{=1<QIosXPpP%EIRk{b4&(oHiZJ9o`2uu!6%q3F^UBvqrXon|0
zJUGhh;;}O)4~-0)<tf=<x)Ee@uIeIv)mq2Ygnl|{Ob0~%PweU<3j+RjiMF7&LXYC|
zsLO_t73##;yR<Er0eY_tKYrk-#(yqRf9}^6`ilj>yk~X##<NV*lWA4&^)JlGS$Rl)
zqwr%%n$gqhc)x(;2X`ArZn<1|`=+xNo8PB3j>BoyV5*^G#Tsq5_7J>s+AiXE177=e
zyHIugey9$6A6gw=jp^xBmXSnyUQMOt1R0AC6D6$?aSIObT&8Dn{XHsN8y~dcSKm}t
z<BbOu4qF#lT*PyK2@Tzn@lJ*jZ-lF$BvVY}34!c*OppwpfJu{hXS264kN#;-xbkE%
zLFT8KN(x+(>eT<U*&be$h<{;H8Zr%y7hJ@HA5b?gf8j32r#I{s=a0yS%$+$N8+lF2
z$ePXqhvpQ8X_BI)X9GoOX|kYH4-qG1o$c!ryCfqWGc?X4AkG;|a6fmie|w-5Gf2Vf
zEgznxk_rhtv&g|sBM~kNR<6<3zS4~`*I|c3r5!oxg6Y`19%{nS*YyqEC6L<(RC7j2
zNverJmP8Jati;dZ@3&k{<%I&Yd`LZ*IcKlMfhU3xF^_J6ZDFV-Za+`o(QCDyj=a9Z
zrp=s02`Nq^#q<Ih#U!IhvNk!Lmtayle&j@aFnahX>Fnf*46o!%Hftu)GC}L`=51O-
zz4^Y2izNS&Z>Y+%OwtWmGq!HilqSom>}+r*@pe$e3loAD4?Gc^{rSoA^|Q>76Q=h&
z*Z6sZnTyljH|}33ou_yu;^tn&=d{$4f58OU=Cw4AS6$_9d~21utt5hPuF_UZKW<#4
z&G^Unv^qC&g^sK_i&v2gh6BE^2Tv(wt@!g<n#{50@VqVe5effj*<C!wH#3v&AsM_{
zW;urIpU?{Y$rpZvWXw~8-|h_`vt?vs8V5VWfyQDDZ#~6~;@9OFUzo>>Jo<RN#A6?i
OmwD{Z&G=qPx&H&2vEMcT

delta 848
zcmah{OGs2v7-q(C?#$Rcn$)h^)N!2VQO@YOW)EVbO^-zndthzSu5-_|tK-aY?^T2l
zl=&qjN<{FdHW@@4iChG?g@UVsXwd_rRV}g>LC~gU)EP(9Lg>J^`8nTzzQ=)|%eHqv
zmTjY813OfJ11iA@0=U2p9;kvX-~}J}Aplz;2-~0<YM>Ujg9vp{4-K#bLa-Bd0f9yc
zLlZ<`H$))@aY(=(*bB{&gcP(qX??S3eO+ul>b54Iw|;tR-5I4mJCY)8u<S+JZnqZ3
z>6Z!|y%==h{5Y-hl5{#vVv>|(ax8)OCuj(jae5MGU%GtO`~(&3IQf7&JsmpJS(eEL
z!}~K-44#rrW|-^KL>!lH(@;<1u!pRkOg?9rgbf#1#$?KIEz8cx1B_EtZJ6*!dv#gP
z4h<yxl>TJwf3ypOYMFKw-`}MXv^}O#eDPMO3d)ATOp;egc1;q#o~8A8&nvnxIY&L=
zlwr!cX<X9GYw^wHpgbnj#8x(?a$IDJ<&@3ua~)_~5X9;4%K~QRxRU-4ZV_L7tO#KD
zLmEh&)#Xf<krO3zou^69pq5pLn%7C>dY?QbACo(oZfN=32nKG^y6I<Kew-^(zx8>F
zUb%^vLz3w2W#)RkR(D8pRys;aqZ*ceVfR$E)3e%zLDJZgklJu|xWR>wnxyj`rSQwi
ztD3&CAs+b}E2U~VC9ae75u&FGf12IUou-m_<H`b*i_U5ssc#NoL7}y{G)aY;bq>*T
z+?mb_`4JrRIcjG}rQrYPWt<A~72b&CCM6r?Z^Y&N<+D7s&V{9Kwj0r?#L>pFkE5Mq
PKgR)%gH|+ps7w3}%^@i3

diff --git a/src/constants.ts b/src/constants.ts
index 4088517..0960a19 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -40,6 +40,9 @@ export const GDS_GRAALVM_PRODUCT_ID = 'D53FAE8052773FFAE0530F15000AA6C6'
 export const ENV_GITHUB_EVENT_NAME = 'GITHUB_EVENT_NAME'
 export const EVENT_NAME_PULL_REQUEST = 'pull_request'
 
+export const ERROR_REQUEST =
+  'Please file an issue at: https://github.com/graalvm/setup-graalvm/issues.'
+
 export const ERROR_HINT =
   'If you think this is a mistake, please file an issue at: https://github.com/graalvm/setup-graalvm/issues.'
 
@@ -52,6 +55,22 @@ export type MatchingRefsResponse =
 export type ReleasesResponse =
   otypes.Endpoints['GET /repos/{owner}/{repo}/releases']['response']
 
+export type ContentsResponse =
+  otypes.Endpoints['GET /repos/{owner}/{repo}/contents/{path}']['response']
+
+export interface OracleGraalVMEAFile {
+  filename: string
+  arch: 'aarch64' | 'x64'
+  platform: 'darwin' | 'linux' | 'windows'
+}
+
+export interface OracleGraalVMEAVersion {
+  version: string
+  latest?: boolean
+  download_base_url: string
+  files: OracleGraalVMEAFile[]
+}
+
 function determineJDKArchitecture(): string {
   switch (process.arch) {
     case 'x64': {
diff --git a/src/graalvm.ts b/src/graalvm.ts
index f8c1fd8..9f5941d 100644
--- a/src/graalvm.ts
+++ b/src/graalvm.ts
@@ -3,11 +3,10 @@ import * as semver from 'semver'
 import {
   downloadAndExtractJDK,
   downloadExtractAndCacheJDK,
-  getLatestPrerelease,
+  getContents,
   getLatestRelease,
   getMatchingTags,
-  getTaggedRelease,
-  toSemVer
+  getTaggedRelease
 } from './utils'
 import {downloadGraalVMEELegacy} from './gds'
 import {downloadTool} from '@actions/tool-cache'
@@ -15,7 +14,8 @@ import {basename} from 'path'
 
 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm'
 const GRAALVM_CE_DL_BASE = `https://github.com/graalvm/${c.GRAALVM_RELEASES_REPO}/releases/download`
-const ORACLE_GRAALVM_REPO_EA_BUILDS = 'oracle-graalvm-dev-builds'
+const ORACLE_GRAALVM_REPO_EA_BUILDS = 'oracle-graalvm-ea-builds'
+const ORACLE_GRAALVM_REPO_EA_BUILDS_LATEST_SYMBOL = 'latest-ea'
 const GRAALVM_REPO_DEV_BUILDS = 'graalvm-ce-dev-builds'
 const GRAALVM_JDK_TAG_PREFIX = 'jdk-'
 const GRAALVM_TAG_PREFIX = 'vm-'
@@ -32,7 +32,9 @@ export async function setUpGraalVMJDK(
   const toolName = determineToolName(javaVersion, false)
   let downloadName = toolName
   let downloadUrl: string
-  if (javaVersion.includes('.')) {
+  if (javaVersion.endsWith('-ea')) {
+    downloadUrl = await findLatestEABuildDownloadUrl(javaVersion)
+  } else if (javaVersion.includes('.')) {
     if (semver.valid(javaVersion)) {
       const majorJavaVersion = semver.major(javaVersion)
       const minorJavaVersion = semver.minor(javaVersion)
@@ -48,8 +50,6 @@ export async function setUpGraalVMJDK(
         `java-version set to '${javaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
       )
     }
-  } else if (javaVersion === '22-ea') {
-    downloadUrl = await findLatestEABuildDownloadUrl(javaVersion)
   } else {
     downloadUrl = `${GRAALVM_DL_BASE}/${javaVersion}/latest/${downloadName}${c.GRAALVM_FILE_EXTENSION}`
   }
@@ -57,25 +57,52 @@ export async function setUpGraalVMJDK(
   return downloadExtractAndCacheJDK(downloader, toolName, javaVersion)
 }
 
-async function findLatestEABuildDownloadUrl(
+export async function findLatestEABuildDownloadUrl(
   javaEaVersion: string
 ): Promise<string> {
-  const latestPrerelease = await getLatestPrerelease(
-    ORACLE_GRAALVM_REPO_EA_BUILDS
+  const filePath = `versions/${javaEaVersion}.json`
+  let response
+  try {
+    response = await getContents(ORACLE_GRAALVM_REPO_EA_BUILDS, filePath)
+  } catch (error) {
+    throw new Error(
+      `Unable to resolve download URL for '${javaEaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
+    )
+  }
+  if (
+    Array.isArray(response) ||
+    response.type !== 'file' ||
+    !response.content
+  ) {
+    throw new Error(
+      `Unexpected response when resolving download URL for '${javaEaVersion}'. ${c.ERROR_REQUEST}`
+    )
+  }
+  const versionData = JSON.parse(
+    Buffer.from(response.content, 'base64').toString('utf-8')
   )
-  const expectedFileNamePrefix = 'graalvm-jdk-'
-  const expectedFileNameSuffix = `_${c.JDK_PLATFORM}-${c.JDK_ARCH}_bin${c.GRAALVM_FILE_EXTENSION}`
-  for (const asset of latestPrerelease.assets) {
-    if (
-      asset.name.startsWith(expectedFileNamePrefix) &&
-      asset.name.endsWith(expectedFileNameSuffix)
-    ) {
-      return asset.browser_download_url
+  let latestVersion
+  if (javaEaVersion === ORACLE_GRAALVM_REPO_EA_BUILDS_LATEST_SYMBOL) {
+    latestVersion = versionData as c.OracleGraalVMEAVersion
+  } else {
+    latestVersion = (versionData as c.OracleGraalVMEAVersion[]).find(
+      v => v.latest
+    )
+    if (!latestVersion) {
+      throw new Error(
+        `Unable to find latest version for '${javaEaVersion}'. ${c.ERROR_REQUEST}`
+      )
     }
   }
-  throw new Error(
-    `Could not find Oracle GraalVM build for ${javaEaVersion}. ${c.ERROR_HINT}`
+  const file = latestVersion.files.find(
+    f => f.arch === c.JDK_ARCH && f.platform === c.GRAALVM_PLATFORM
   )
+  if (!file || !file.filename.startsWith('graalvm-jdk-')) {
+    throw new Error(
+      `Unable to find file metadata for '${javaEaVersion}'. ${c.ERROR_REQUEST}`
+    )
+  }
+  return `${latestVersion.download_base_url}${file.filename}`
 }
 
 export async function setUpGraalVMJDKCE(
diff --git a/src/utils.ts b/src/utils.ts
index cf92b7f..f4b5f5b 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -34,25 +34,6 @@ export async function exec(
   }
 }
 
-export async function getLatestPrerelease(
-  repo: string
-): Promise<c.ReleasesResponse['data'][number]> {
-  const githubToken = getGitHubToken()
-  const options = githubToken.length > 0 ? {auth: githubToken} : {}
-  const octokit = new GitHubDotCom(options)
-  const releases: c.ReleasesResponse['data'] = (
-    await octokit.request('GET /repos/{owner}/{repo}/releases', {
-      owner: c.GRAALVM_GH_USER,
-      repo
-    })
-  ).data
-  const firstPrerelease = releases.find(r => r.prerelease)
-  if (!firstPrerelease) {
-    throw new Error(`Unable to find latest prerelease in ${repo}`)
-  }
-  return firstPrerelease
-}
-
 export async function getLatestRelease(
   repo: string
 ): Promise<c.LatestReleaseResponse['data']> {
@@ -67,6 +48,22 @@ export async function getLatestRelease(
   ).data
 }
 
+export async function getContents(
+  repo: string,
+  path: string
+): Promise<c.ContentsResponse['data']> {
+  const githubToken = getGitHubToken()
+  const options = githubToken.length > 0 ? {auth: githubToken} : {}
+  const octokit = new GitHubDotCom(options)
+  return (
+    await octokit.request('GET /repos/{owner}/{repo}/contents/{path}', {
+      owner: c.GRAALVM_GH_USER,
+      repo,
+      path
+    })
+  ).data
+}
+
 export async function getTaggedRelease(
   repo: string,
   tag: string