starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-24 09:18:35 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Catch PklException errors coming from project load (#527)

Browse Source 
This fixes an issue where an error coming from loading a project file is shown as a PklBugException.

There were two problems here:

1. proxyAddress needs to be a lazy value, because it can try to load a PklProject
2. accessing proxyAddress can throw a PklException, so it needs to be within the try/catch
This commit is contained in:
Daniel Chao
2024-06-14 07:33:44 -07:00
committed by GitHub
parent 3bd9214858
commit 9c287a2e48
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliCommand.kt
View File

@@ -39,9 +39,8 @@ abstract class CliCommand(protected val cliOptions: CliBaseOptions) {
IoUtils.setTestMode() IoUtils.setTestMode()
} }
proxyAddress?.let(IoUtils::setSystemProxy)
try { try {
proxyAddress?.let(IoUtils::setSystemProxy)
doRun() doRun()
} catch (e: PklException) { } catch (e: PklException) {
throw CliException(e.message!!) throw CliException(e.message!!)
@@ -160,13 +159,15 @@ abstract class CliCommand(protected val cliOptions: CliBaseOptions) {
) )
} }
private val proxyAddress = private val proxyAddress by lazy {
cliOptions.proxyAddress cliOptions.proxyAddress
?: project?.evaluatorSettings?.http?.proxy?.address ?: settings.http?.proxy?.address ?: project?.evaluatorSettings?.http?.proxy?.address ?: settings.http?.proxy?.address
}
private val noProxy = private val noProxy by lazy {
cliOptions.noProxy cliOptions.noProxy
?: project?.evaluatorSettings?.http?.proxy?.noProxy ?: settings.http?.proxy?.noProxy ?: project?.evaluatorSettings?.http?.proxy?.noProxy ?: settings.http?.proxy?.noProxy
}
private fun HttpClient.Builder.addDefaultCliCertificates() { private fun HttpClient.Builder.addDefaultCliCertificates() {
val caCertsDir = IoUtils.getPklHomeDir().resolve("cacerts") val caCertsDir = IoUtils.getPklHomeDir().resolve("cacerts")