Skip to content

Commit 3f49bd6

Browse files
fniephausfniephaus
committed
Address new lint errors.
1 parent b1fada4 commit 3f49bd6

10 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎__tests__/graalvm.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test('request invalid version/javaVersion', async () => {
2121
await graalvm.setUpGraalVMRelease('', combination[0], combination[1])
2222
} catch (err) {
2323
if (!(err instanceof Error)) {
24-
throw new Error(`Unexpected non-Error: ${err}`)
24+
throw new Error('Unexpected non-Error.', { cause: err })
2525
}
2626
error = err
2727
}
@@ -38,13 +38,13 @@ test('find version/javaVersion', async () => {
3838
await graalvm.findLatestGraalVMJDKCEJavaVersion(majorJavaVersion)
3939
}
4040

41-
let error = new Error('unexpected')
41+
let error
4242
try {
4343
await graalvm.findLatestGraalVMJDKCEJavaVersion('11')
4444
throw new Error('Should not find Java version for 11')
4545
} catch (err) {
4646
if (!(err instanceof Error)) {
47-
throw new Error(`Unexpected non-Error: ${err}`)
47+
throw new Error('Unexpected non-Error', { cause: err })
4848
}
4949
error = err
5050
}
@@ -62,7 +62,7 @@ test('find version/javaVersion', async () => {
6262
findGraalVMVersion(invalidRelease)
6363
} catch (err) {
6464
if (!(err instanceof Error)) {
65-
throw new Error(`Unexpected non-Error: ${err}`)
65+
throw new Error('Unexpected non-Error', { cause: err })
6666
}
6767
error = err
6868
}
@@ -72,7 +72,7 @@ test('find version/javaVersion', async () => {
7272
findHighestJavaVersion(latestRelease, 'invalid')
7373
} catch (err) {
7474
if (!(err instanceof Error)) {
75-
throw new Error(`Unexpected non-Error: ${err}`)
75+
throw new Error('Unexpected non-Error', { cause: err })
7676
}
7777
error = err
7878
}
@@ -90,7 +90,7 @@ test('find EA version/javaVersion', async () => {
9090
await findLatestEABuildDownloadUrl('8-ea')
9191
} catch (err) {
9292
if (!(err instanceof Error)) {
93-
throw new Error(`Unexpected non-Error: ${err}`)
93+
throw new Error('Unexpected non-Error', { cause: err })
9494
}
9595
error = err
9696
}

‎__tests__/liberica.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ async function expectLatestToFail(pattern: string) {
9595
throw new Error(`findLatest(${pattern}) should have failed but returned ${result}`)
9696
} catch (err) {
9797
if (!(err instanceof Error)) {
98-
throw new Error(`Unexpected non-Error: ${err}`)
98+
throw new Error('Unexpected non-Error', { cause: err })
9999
}
100100
expect(err.message).toContain(`Unable to find the latest version for JDK${pattern}`)
101101
}

‎__tests__/mandrel.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('request invalid version/javaVersion combination', async () => {
1818
await mandrel.setUpMandrel(combination[0], combination[1])
1919
} catch (err) {
2020
if (!(err instanceof Error)) {
21-
throw new Error(`Unexpected non-Error: ${err}`)
21+
throw new Error(`Unexpected non-Error.`, { cause: err })
2222
}
2323
error = err
2424
}
@@ -38,7 +38,7 @@ test('request invalid version', async () => {
3838
await mandrel.setUpMandrel(combination[0], combination[1])
3939
} catch (err) {
4040
if (!(err instanceof Error)) {
41-
throw new Error(`Unexpected non-Error: ${err}`)
41+
throw new Error('Unexpected non-Error.', { cause: err })
4242
}
4343
error = err
4444
}

‎__tests__/utils.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test('convert invalid version', async () => {
2222
toSemVer(input)
2323
} catch (err) {
2424
if (!(err instanceof Error)) {
25-
throw new Error(`Unexpected non-Error: ${err}`)
25+
throw new Error('Unexpected non-Error', { cause: err })
2626
}
2727
error = err
2828
}

‎dist/cleanup.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/main.js‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/features/sbom.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ export async function processSBOM(): Promise<void> {
119119
const snapshot = convertSBOMToSnapshot(javaVersion, sbomPath, components)
120120
await submitDependencySnapshot(snapshot)
121121
} catch (error) {
122-
throw new Error(
123-
`Failed to process and submit SBOM to the GitHub dependency submission API: ${error instanceof Error ? error.message : String(error)}`
124-
)
122+
throw new Error('Failed to process and submit SBOM to the GitHub dependency submission API.', { cause: error })
125123
}
126124
}
127125

@@ -150,7 +148,7 @@ function parseSBOM(jsonString: string): SBOM {
150148
const sbomData: SBOM = JSON.parse(jsonString)
151149
return sbomData
152150
} catch (error) {
153-
throw new Error(`Failed to parse SBOM JSON: ${error instanceof Error ? error.message : String(error)}`)
151+
throw new Error('Failed to parse SBOM JSON.', { cause: error })
154152
}
155153
}
156154

@@ -264,8 +262,6 @@ async function submitDependencySnapshot(snapshotData: DependencySnapshot): Promi
264262
})
265263
core.info('Dependency snapshot submitted successfully.')
266264
} catch (error) {
267-
throw new Error(
268-
`Failed to submit dependency snapshot for SBOM: ${error instanceof Error ? error.message : String(error)}`
269-
)
265+
throw new Error('Failed to submit dependency snapshot for SBOM', { cause: error })
270266
}
271267
}

‎src/gds.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ async function downloadArtifact(gdsToken: string, userAgent: string, artifact: G
120120
if (err instanceof HTTPError && err.httpStatusCode) {
121121
if (err.httpStatusCode === 401) {
122122
throw new Error(
123-
`The provided "gds-token" was rejected (reason: "${err.gdsError.message}", opc-request-id: ${err.headers['opc-request-id']})`
123+
`The provided "gds-token" was rejected (reason: "${err.gdsError.message}", opc-request-id: ${err.headers['opc-request-id']})`,
124+
{ cause: err }
124125
)
125126
}
126127
}

‎src/graalvm.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ export async function findLatestEABuildDownloadUrl(javaEaVersion: string): Promi
9494
response = await getContents(ORACLE_GRAALVM_REPO_EA_BUILDS, filePath)
9595
} catch (error) {
9696
throw new Error(
97-
`Unable to resolve download URL for '${javaEaVersion}' (reason: ${error}). Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
97+
`Unable to resolve download URL for '${javaEaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`,
98+
{ cause: error }
9899
)
99100
}
100101
if (Array.isArray(response) || response.type !== 'file' || !response.content) {
@@ -174,10 +175,11 @@ async function downloadGraalVMJDK(downloadUrl: string, javaVersion: string): Pro
174175
if (error instanceof Error && error.message.includes('404')) {
175176
// Not Found
176177
throw new Error(
177-
`Failed to download ${basename(downloadUrl)}. Are you sure java-version: '${javaVersion}' is correct?`
178+
`Failed to download ${basename(downloadUrl)}. Are you sure java-version: '${javaVersion}' is correct?`,
179+
{ cause: error }
178180
)
179181
}
180-
throw new Error(`Failed to download ${basename(downloadUrl)} (error: ${error}).`)
182+
throw new Error(`Failed to download ${basename(downloadUrl)}.`, { cause: error })
181183
}
182184
}
183185

@@ -286,9 +288,10 @@ async function downloadGraalVMCELegacy(version: string, javaVersion: string): Pr
286288
if (error instanceof Error && error.message.includes('404')) {
287289
// Not Found
288290
throw new Error(
289-
`Failed to download ${graalVMIdentifier}. Are you sure version: '${version}' and java-version: '${javaVersion}' are correct?`
291+
`Failed to download ${graalVMIdentifier}. Are you sure version: '${version}' and java-version: '${javaVersion}' are correct?`,
292+
{ cause: error }
290293
)
291294
}
292-
throw new Error(`Failed to download ${graalVMIdentifier} (error: ${error}).`)
295+
throw new Error(`Failed to download ${graalVMIdentifier}.`, { cause: error })
293296
}
294297
}

‎src/mandrel.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function getTagFromURI(uri: string): string {
4141
try {
4242
return parts[parts.length - 2]
4343
} catch (error) {
44-
throw new Error(`Failed to extract tag from URI ${uri}: ${error}`)
44+
throw new Error(`Failed to extract tag from URI ${uri}`, { cause: error })
4545
}
4646
}
4747

@@ -63,7 +63,8 @@ export async function getLatestMandrelReleaseUrl(javaVersion: string): Promise<s
6363
)
6464
} catch (error) {
6565
throw new Error(
66-
`Failed to find latest Mandrel release for Java ${javaVersion}. Are you sure java-version: '${javaVersion}' is correct? ${error}`
66+
`Failed to find latest Mandrel release for Java ${javaVersion}. Are you sure java-version: '${javaVersion}' is correct?`,
67+
{ cause: error }
6768
)
6869
}
6970
}
@@ -84,10 +85,11 @@ async function downloadMandrelJDK(version: string, javaVersion: string): Promise
8485
throw new Error(
8586
`Failed to download ${basename(
8687
downloadUrl
87-
)}. Are you sure version: '${version}' and java-version: '${javaVersion}' are correct?`
88+
)}. Are you sure version: '${version}' and java-version: '${javaVersion}' are correct?`,
89+
{ cause: error }
8890
)
8991
}
90-
throw new Error(`Failed to download ${basename(downloadUrl)} (error: ${error}).`)
92+
throw new Error(`Failed to download ${basename(downloadUrl)}.`, { cause: error })
9193
}
9294
}
9395

0 commit comments

Comments
 (0)