From dfe85b786eafde0af4a7cd5a47fcf56241c1c73c Mon Sep 17 00:00:00 2001 From: translatenix <119817707+translatenix@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:47:28 -0700 Subject: [PATCH] Replace magic test port 12110 with 0 (#345) Also introduce constants for some test package SHAs to make them easier to update. --- .../test/files/projects/project1/PklProject | 2 +- .../kotlin/org/pkl/cli/CliEvaluatorTest.kt | 4 +- .../org/pkl/cli/CliPackageDownloaderTest.kt | 64 ++++++------ .../org/pkl/cli/CliProjectPackagerTest.kt | 60 ++++++------ .../org/pkl/cli/CliProjectResolverTest.kt | 98 +++++++++---------- .../org/pkl/commons/cli/CliBaseOptions.kt | 4 +- .../badChecksum@1.0.0/badChecksum@1.0.0.json | 4 +- .../badImportsWithinPackage@1.0.0.json | 4 +- .../badPackageZipUrl@1.0.0.json | 2 +- .../packages/birds@0.5.0/birds@0.5.0.json | 8 +- .../packages/fruit@1.0.5/fruit@1.0.5.json | 4 +- .../packages/fruit@1.1.0/fruit@1.1.0.json | 4 +- ...ageContainingWildcardCharacters@1.0.0.json | 4 +- .../org/pkl/commons/test/PackageServer.kt | 8 +- .../java/org/pkl/core/http/HttpClient.java | 4 +- .../pkl/core/http/RequestRewritingClient.java | 4 +- .../input/basic/importGlob.pkl | 10 +- .../input/basic/readGlob.pkl | 2 +- .../input/packages/badImport1.error.pkl | 2 +- .../input/packages/badImport10.error.pkl | 2 +- .../input/packages/badImport11.error.pkl | 2 +- .../input/packages/badImport2.error.pkl | 2 +- .../input/packages/badImport3.error.pkl | 2 +- .../input/packages/badImport4.error.pkl | 2 +- .../input/packages/badImport6.error.pkl | 2 +- .../input/packages/badImport7.error.pkl | 2 +- .../input/packages/badImport8.error.pkl | 2 +- .../input/packages/badImport9.error.pkl | 2 +- .../input/packages/badRead1.error.pkl | 2 +- .../input/packages/badRead2.error.pkl | 2 +- .../input/packages/badRead3.error.pkl | 2 +- .../input/packages/badRead4.error.pkl | 2 +- .../input/packages/badRead8.error.pkl | 2 +- .../input/packages/badRead9.error.pkl | 2 +- .../input/packages/packages1.pkl | 16 +-- .../input/packages/packages2.pkl | 14 +-- .../input/projects/badProjectDeps1/PklProject | 2 +- .../input/projects/badProjectDeps2/PklProject | 2 +- .../input/projects/badProjectDeps3/PklProject | 2 +- .../input/projects/badProjectDeps5/PklProject | 2 +- .../badProjectDeps5/PklProject.deps.json | 8 +- .../input/projects/badProjectDeps6/PklProject | 2 +- .../badProjectDeps6/PklProject.deps.json | 8 +- .../projects/missingProjectDeps/PklProject | 2 +- .../input/projects/project1/PklProject | 6 +- .../projects/project1/PklProject.deps.json | 16 +-- .../input/projects/project1/basic.pkl | 8 +- .../input/projects/project1/globbing.pkl | 4 +- .../input/projects/project2/PklProject | 6 +- .../projects/project2/PklProject.deps.json | 8 +- .../projects/project3/PklProject.deps.json | 16 +-- .../input/projects/project4/PklProject | 2 +- .../projects/project4/PklProject.deps.json | 6 +- .../input/projects/project5/PklProject | 2 +- .../projects/project5/PklProject.deps.json | 8 +- .../output/basic/importGlob.pcf | 24 ++--- .../output/basic/readGlob.pcf | 24 ++--- .../output/packages/badImport1.err | 6 +- .../output/packages/badImport10.err | 6 +- .../output/packages/badImport11.err | 6 +- .../output/packages/badImport2.err | 6 +- .../output/packages/badImport3.err | 6 +- .../output/packages/badImport4.err | 6 +- .../output/packages/badImport6.err | 6 +- .../output/packages/badImport7.err | 6 +- .../output/packages/badImport8.err | 4 +- .../output/packages/badImport9.err | 4 +- .../output/packages/badRead1.err | 6 +- .../output/packages/badRead2.err | 6 +- .../output/packages/badRead3.err | 6 +- .../output/packages/badRead4.err | 6 +- .../output/packages/badRead8.err | 6 +- .../output/packages/badRead9.err | 6 +- .../output/packages/packages1.pcf | 6 +- .../output/packages/packages2.pcf | 22 ++--- .../output/projects/badProjectDeps3/bug.err | 2 +- .../output/projects/badProjectDeps5/bug.err | 8 +- .../output/projects/badProjectDeps6/bug.err | 4 +- .../output/projects/project1/badImport3.err | 4 +- .../output/projects/project1/basic.pcf | 4 +- .../projects/project1/directPackageImport.err | 2 +- .../output/projects/project1/globbing.pcf | 38 +++---- .../pkl/core/StackFrameTransformersTest.kt | 2 +- .../core/http/RequestRewritingClientTest.kt | 10 +- .../org/pkl/core/module/ModuleKeysTest.kt | 4 +- .../pkl/core/packages/PackageResolversTest.kt | 26 ++--- .../ProjectDependenciesResolverTest.kt | 20 ++-- .../org/pkl/core/project/ProjectDepsTest.kt | 16 +-- .../org/pkl/core/project/ProjectTest.kt | 6 +- .../project/badProjectChecksum/PklProject | 2 +- .../project/badProjectChecksum2/PklProject | 2 +- .../badProjectChecksum2/PklProject.deps.json | 4 +- .../org/pkl/core/project/project2/PklProject | 2 +- .../org/pkl/core/project/project3/PklProject | 4 +- .../org/pkl/core/project/project4/PklProject | 2 +- .../birds/0.5.0/Bird/index.js | 0 .../birds/0.5.0/allFruit/index.js | 0 .../birds/0.5.0/catalog/index.js | 0 .../birds/0.5.0/index.js | 0 .../fruit/1.1.0/Fruit/index.js | 0 .../fruit/1.1.0/index.js | 0 .../files/DocGeneratorTest/output/index.html | 12 +-- .../birds/0.5.0/Bird/index.html | 10 +- .../birds/0.5.0/allFruit/index.html | 10 +- .../birds/0.5.0/catalog/index.html | 10 +- .../birds/0.5.0/index.html | 14 +-- .../localhost:0/birds/0.5.0/package-data.json | 1 + .../birds/0.5.0/search-index.js | 0 .../birds/current | 0 .../fruit/1.1.0/Fruit/index.html | 10 +- .../fruit/1.1.0/index.html | 14 +-- .../localhost:0/fruit/1.1.0/package-data.json | 1 + .../fruit/1.1.0/search-index.js | 0 .../fruit/current | 0 .../birds/0.5.0/package-data.json | 1 - .../fruit/1.1.0/package-data.json | 1 - .../DocGeneratorTest/output/search-index.js | 2 +- .../kotlin/org/pkl/doc/CliDocGeneratorTest.kt | 4 +- .../org/pkl/executor/EmbeddedExecutorTest.kt | 12 +-- .../kotlin/org/pkl/gradle/EvaluatorsTest.kt | 14 +-- .../org/pkl/gradle/ProjectPackageTest.kt | 4 +- .../org/pkl/server/MessagePackCodecTest.kt | 6 +- .../test/kotlin/org/pkl/server/ServerTest.kt | 20 ++-- 123 files changed, 469 insertions(+), 469 deletions(-) rename pkl-doc/src/test/files/DocGeneratorTest/output/data/{localhost:12110 => localhost:0}/birds/0.5.0/Bird/index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/data/{localhost:12110 => localhost:0}/birds/0.5.0/allFruit/index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/data/{localhost:12110 => localhost:0}/birds/0.5.0/catalog/index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/data/{localhost:12110 => localhost:0}/birds/0.5.0/index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/data/{localhost:12110 => localhost:0}/fruit/1.1.0/Fruit/index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/data/{localhost:12110 => localhost:0}/fruit/1.1.0/index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/birds/0.5.0/Bird/index.html (97%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/birds/0.5.0/allFruit/index.html (96%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/birds/0.5.0/catalog/index.html (96%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/birds/0.5.0/index.html (86%) create mode 100644 pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/package-data.json rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/birds/0.5.0/search-index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/birds/current (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/fruit/1.1.0/Fruit/index.html (96%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/fruit/1.1.0/index.html (81%) create mode 100644 pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/fruit/1.1.0/package-data.json rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/fruit/1.1.0/search-index.js (100%) rename pkl-doc/src/test/files/DocGeneratorTest/output/{localhost:12110 => localhost:0}/fruit/current (100%) delete mode 100644 pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/package-data.json delete mode 100644 pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/fruit/1.1.0/package-data.json diff --git a/pkl-cli/src/test/files/projects/project1/PklProject b/pkl-cli/src/test/files/projects/project1/PklProject index 94e31e70..86610c69 100644 --- a/pkl-cli/src/test/files/projects/project1/PklProject +++ b/pkl-cli/src/test/files/projects/project1/PklProject @@ -2,6 +2,6 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt b/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt index ddaa2fe8..58890bfc 100644 --- a/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt +++ b/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt @@ -1132,7 +1132,7 @@ result = someLib.x writePklFile( "test.pkl", """ - import "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + import "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" res = Swallow """ @@ -1212,7 +1212,7 @@ result = someLib.x writePklFile( "test.pkl", """ - import "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + import "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" res = Swallow """ diff --git a/pkl-cli/src/test/kotlin/org/pkl/cli/CliPackageDownloaderTest.kt b/pkl-cli/src/test/kotlin/org/pkl/cli/CliPackageDownloaderTest.kt index 2d1c5813..08ebcf13 100644 --- a/pkl-cli/src/test/kotlin/org/pkl/cli/CliPackageDownloaderTest.kt +++ b/pkl-cli/src/test/kotlin/org/pkl/cli/CliPackageDownloaderTest.kt @@ -49,19 +49,19 @@ class CliPackageDownloaderTest { ), packageUris = listOf( - PackageUri("package://localhost:12110/birds@0.5.0"), - PackageUri("package://localhost:12110/fruit@1.0.5"), - PackageUri("package://localhost:12110/fruit@1.1.0") + PackageUri("package://localhost:0/birds@0.5.0"), + PackageUri("package://localhost:0/fruit@1.0.5"), + PackageUri("package://localhost:0/fruit@1.1.0") ), noTransitive = true ) cmd.run() - assertThat(tempDir.resolve("package-1/localhost:12110/birds@0.5.0/birds@0.5.0.zip")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/birds@0.5.0/birds@0.5.0.json")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/fruit@1.0.5/fruit@1.0.5.zip")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/fruit@1.0.5/fruit@1.0.5.json")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/fruit@1.1.0/fruit@1.1.0.zip")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/fruit@1.1.0/fruit@1.1.0.json")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/birds@0.5.0/birds@0.5.0.zip")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/birds@0.5.0/birds@0.5.0.json")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/fruit@1.0.5/fruit@1.0.5.zip")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/fruit@1.0.5/fruit@1.0.5.json")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/fruit@1.1.0/fruit@1.1.0.zip")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/fruit@1.1.0/fruit@1.1.0.json")).exists() } @Test @@ -86,13 +86,13 @@ class CliPackageDownloaderTest { caCertificates = listOf(FileTestUtils.selfSignedCertificate), testPort = server.port ), - packageUris = listOf(PackageUri("package://localhost:12110/birds@0.5.0")), + packageUris = listOf(PackageUri("package://localhost:0/birds@0.5.0")), noTransitive = true ) cmd.run() - assertThat(tempDir.resolve(".my-cache/package-1/localhost:12110/birds@0.5.0/birds@0.5.0.zip")) + assertThat(tempDir.resolve(".my-cache/package-1/localhost:0/birds@0.5.0/birds@0.5.0.zip")) .exists() - assertThat(tempDir.resolve(".my-cache/package-1/localhost:12110/birds@0.5.0/birds@0.5.0.json")) + assertThat(tempDir.resolve(".my-cache/package-1/localhost:0/birds@0.5.0/birds@0.5.0.json")) .exists() } @@ -108,15 +108,13 @@ class CliPackageDownloaderTest { ), packageUris = listOf( - PackageUri( - "package://localhost:12110/birds@0.5.0::sha256:0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" - ), + PackageUri("package://localhost:0/birds@0.5.0::sha256:${PackageServer.BIRDS_SHA}"), ), noTransitive = true ) cmd.run() - assertThat(tempDir.resolve("package-1/localhost:12110/birds@0.5.0/birds@0.5.0.zip")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/birds@0.5.0/birds@0.5.0.json")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/birds@0.5.0/birds@0.5.0.zip")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/birds@0.5.0/birds@0.5.0.json")).exists() } @Test @@ -131,18 +129,18 @@ class CliPackageDownloaderTest { ), packageUris = listOf( - PackageUri("package://localhost:12110/birds@0.5.0::sha256:intentionallyBogusChecksum"), + PackageUri("package://localhost:0/birds@0.5.0::sha256:intentionallyBogusChecksum"), ), noTransitive = true ) assertThatCode { cmd.run() } .hasMessage( """ - Cannot download package `package://localhost:12110/birds@0.5.0` because the computed checksum for package metadata does not match the expected checksum. + Cannot download package `package://localhost:0/birds@0.5.0` because the computed checksum for package metadata does not match the expected checksum. - Computed checksum: "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + Computed checksum: "${PackageServer.BIRDS_SHA}" Expected checksum: "intentionallyBogusChecksum" - Asset URL: "https://localhost:12110/birds@0.5.0" + Asset URL: "https://localhost:0/birds@0.5.0" """ .trimIndent() ) @@ -153,7 +151,7 @@ class CliPackageDownloaderTest { val cmd = CliPackageDownloader( baseOptions = CliBaseOptions(workingDir = tempDir, noCache = true), - packageUris = listOf(PackageUri("package://localhost:12110/birds@0.5.0")), + packageUris = listOf(PackageUri("package://localhost:0/birds@0.5.0")), noTransitive = true ) assertThatCode { cmd.run() } @@ -170,12 +168,12 @@ class CliPackageDownloaderTest { caCertificates = listOf(FileTestUtils.selfSignedCertificate), testPort = server.port ), - packageUris = listOf(PackageUri("package://localhost:12110/badChecksum@1.0.0")), + packageUris = listOf(PackageUri("package://localhost:0/badChecksum@1.0.0")), noTransitive = true ) assertThatCode { cmd.run() } .hasMessageStartingWith( - "Cannot download package `package://localhost:12110/badChecksum@1.0.0` because the computed checksum does not match the expected checksum." + "Cannot download package `package://localhost:0/badChecksum@1.0.0` because the computed checksum does not match the expected checksum." ) } @@ -191,7 +189,7 @@ class CliPackageDownloaderTest { ), packageUris = listOf( - PackageUri("package://localhost:12110/badChecksum@1.0.0"), + PackageUri("package://localhost:0/badChecksum@1.0.0"), PackageUri("package://bogus.domain/notAPackage@1.0.0") ), noTransitive = true @@ -201,12 +199,12 @@ class CliPackageDownloaderTest { """ Failed to download some packages. - Failed to download package://localhost:12110/badChecksum@1.0.0 because: - Cannot download package `package://localhost:12110/badChecksum@1.0.0` because the computed checksum does not match the expected checksum. + Failed to download package://localhost:0/badChecksum@1.0.0 because: + Cannot download package `package://localhost:0/badChecksum@1.0.0` because the computed checksum does not match the expected checksum. Computed checksum: "a6bf858cdd1c09da475c2abe50525902580910ee5cc1ff624999170591bf8f69" Expected checksum: "intentionally bogus checksum" - Asset URL: "https://localhost:12110/badChecksum@1.0.0/badChecksum@1.0.0.zip" + Asset URL: "https://localhost:0/badChecksum@1.0.0/badChecksum@1.0.0.zip" Failed to download package://bogus.domain/notAPackage@1.0.0 because: Exception when making request `GET https://bogus.domain/notAPackage@1.0.0`: @@ -226,13 +224,13 @@ class CliPackageDownloaderTest { caCertificates = listOf(FileTestUtils.selfSignedCertificate), testPort = server.port ), - packageUris = listOf(PackageUri("package://localhost:12110/birds@0.5.0")), + packageUris = listOf(PackageUri("package://localhost:0/birds@0.5.0")), noTransitive = false ) .run() - assertThat(tempDir.resolve("package-1/localhost:12110/birds@0.5.0/birds@0.5.0.zip")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/birds@0.5.0/birds@0.5.0.json")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/fruit@1.0.5/fruit@1.0.5.zip")).exists() - assertThat(tempDir.resolve("package-1/localhost:12110/fruit@1.0.5/fruit@1.0.5.json")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/birds@0.5.0/birds@0.5.0.zip")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/birds@0.5.0/birds@0.5.0.json")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/fruit@1.0.5/fruit@1.0.5.zip")).exists() + assertThat(tempDir.resolve("package-1/localhost:0/fruit@1.0.5/fruit@1.0.5.json")).exists() } } diff --git a/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt b/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt index 38631c7b..1e7cee4b 100644 --- a/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt +++ b/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt @@ -224,7 +224,7 @@ class CliProjectPackagerTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } """ @@ -237,18 +237,18 @@ class CliProjectPackagerTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "04eec465b217fb9779489525d26e9b587e5e47ff4d584c7673a450109715bc31" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "${PackageServer.FRUIT_SHA}" } } } @@ -433,7 +433,7 @@ class CliProjectPackagerTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } ["project2"] = import("../project2/PklProject") } @@ -446,16 +446,16 @@ class CliProjectPackagerTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/project2@5": { + "package://localhost:0/project2@5": { "type": "local", - "uri": "projectpackage://localhost:12110/project2@5.0.0", + "uri": "projectpackage://localhost:0/project2@5.0.0", "path": "../project2" } } @@ -471,7 +471,7 @@ class CliProjectPackagerTest { package { name = "project2" - baseUri = "package://localhost:12110/project2" + baseUri = "package://localhost:0/project2" version = "5.0.0" packageZipUrl = "https://foo.com/project2.zip" } @@ -513,15 +513,15 @@ class CliProjectPackagerTest { }, "dependencies": { "birds": { - "uri": "package://localhost:12110/birds@0.5.0", + "uri": "package://localhost:0/birds@0.5.0", "checksums": { - "sha256": "3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118" + "sha256": "${PackageServer.BIRDS_SHA}" } }, "project2": { - "uri": "package://localhost:12110/project2@5.0.0", + "uri": "package://localhost:0/project2@5.0.0", "checksums": { - "sha256": "6f469b28f8b62a8a1191e2749bcf9c27dedbbb1e0ea754ac34af57b534e0ddda" + "sha256": "981787869571330b2f609a94a5912466990ce00e3fa94e7f290c2f99a6d5e5ed" } } }, @@ -537,7 +537,7 @@ class CliProjectPackagerTest { """ { "name": "project2", - "packageUri": "package://localhost:12110/project2@5.0.0", + "packageUri": "package://localhost:0/project2@5.0.0", "version": "5.0.0", "packageZipUrl": "https://foo.com/project2.zip", "packageZipChecksums": { @@ -571,7 +571,7 @@ class CliProjectPackagerTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } ["project2"] = import("../project2/PklProject") } @@ -584,16 +584,16 @@ class CliProjectPackagerTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118" } }, - "package://localhost:12110/project2@5": { + "package://localhost:0/project2@5": { "type": "local", - "uri": "projectpackage://localhost:12110/project2@5.0.0", + "uri": "projectpackage://localhost:0/project2@5.0.0", "path": "../project2" } } @@ -609,7 +609,7 @@ class CliProjectPackagerTest { package { name = "project2" - baseUri = "package://localhost:12110/project2" + baseUri = "package://localhost:0/project2" version = "5.0.0" packageZipUrl = "https://foo.com/project2.zip" } @@ -884,14 +884,14 @@ class CliProjectPackagerTest { tempDir.writeFile("project/main.pkl", "res = 1") tempDir.writeFile( "project/PklProject", - // intentionally conflict with localhost:12110/birds@0.5.0 from our test fixtures + // intentionally conflict with localhost:0/birds@0.5.0 from our test fixtures """ amends "pkl:Project" package { name = "birds" version = "0.5.0" - baseUri = "package://localhost:12110/birds" + baseUri = "package://localhost:0/birds" packageZipUrl = "https://foo.com" } """ @@ -916,10 +916,10 @@ class CliProjectPackagerTest { assertThat(e) .hasMessageStartingWith( """ - Package `package://localhost:12110/birds@0.5.0` was already published with different contents. + Package `package://localhost:0/birds@0.5.0` was already published with different contents. - Computed checksum: 04eec465b217fb9779489525d26e9b587e5e47ff4d584c7673a450109715bc31 - Published checksum: 0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453 + Computed checksum: aa8c883841db22e92794f4708b01dc905b5da77645b7dfb5b22a73da8c347db1 + Published checksum: ${PackageServer.BIRDS_SHA} """ .trimIndent() ) @@ -936,7 +936,7 @@ class CliProjectPackagerTest { package { name = "mangos" version = "1.0.0" - baseUri = "package://localhost:12110/mangos" + baseUri = "package://localhost:0/mangos" packageZipUrl = "https://foo.com" } """ diff --git a/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt b/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt index 3c1e97e3..e5e45b3d 100644 --- a/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt +++ b/pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt @@ -73,7 +73,7 @@ class CliProjectResolverTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } """ @@ -98,18 +98,18 @@ class CliProjectResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "${PackageServer.FRUIT_SHA}" } } } @@ -128,7 +128,7 @@ class CliProjectResolverTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } """ @@ -153,18 +153,18 @@ class CliProjectResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "${PackageServer.FRUIT_SHA}" } } } @@ -184,7 +184,7 @@ class CliProjectResolverTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } ["project2"] = import("../project2/PklProject") } @@ -198,14 +198,14 @@ class CliProjectResolverTest { package { name = "project2" - baseUri = "package://localhost:12110/package2" + baseUri = "package://localhost:0/package2" version = "5.0.0" packageZipUrl = "https://foo.com/package2.zip" } dependencies { ["fruit"] { - uri = "package://localhost:12110/fruit@1.0.5" + uri = "package://localhost:0/fruit@1.0.5" } ["project3"] = import("../project3/PklProject") } @@ -220,14 +220,14 @@ class CliProjectResolverTest { package { name = "project3" - baseUri = "package://localhost:12110/package3" + baseUri = "package://localhost:0/package3" version = "5.0.0" packageZipUrl = "https://foo.com/package3.zip" } dependencies { ["fruit"] { - uri = "package://localhost:12110/fruit@1.1.0" + uri = "package://localhost:0/fruit@1.1.0" } } """ @@ -251,28 +251,28 @@ class CliProjectResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { - "sha256": "a82e92e0c259591111d09d18a14f5ad66e2b6e13d827ee3e6f7ce06f5d0fbe0c" + "sha256": "${PackageServer.FRUIT_1_1_SHA}" } }, - "package://localhost:12110/package2@5": { + "package://localhost:0/package2@5": { "type": "local", - "uri": "projectpackage://localhost:12110/package2@5.0.0", + "uri": "projectpackage://localhost:0/package2@5.0.0", "path": "../project2" }, - "package://localhost:12110/package3@5": { + "package://localhost:0/package3@5": { "type": "local", - "uri": "projectpackage://localhost:12110/package3@5.0.0", + "uri": "projectpackage://localhost:0/package3@5.0.0", "path": "../project3" } } @@ -292,7 +292,7 @@ class CliProjectResolverTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } ["fruit"] = import("../fruit/PklProject") } @@ -306,7 +306,7 @@ class CliProjectResolverTest { package { name = "fruit" - baseUri = "package://localhost:12110/fruit" + baseUri = "package://localhost:0/fruit" version = "1.0.0" packageZipUrl = "https://foo.com/fruit.zip" } @@ -333,18 +333,18 @@ class CliProjectResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "${PackageServer.FRUIT_SHA}" } } } @@ -354,7 +354,7 @@ class CliProjectResolverTest { ) assertThat(errOut.toString()) .isEqualTo( - "WARN: local dependency `package://localhost:12110/fruit@1.0.0` was overridden to remote dependency `package://localhost:12110/fruit@1.0.5`.\n" + "WARN: local dependency `package://localhost:0/fruit@1.0.0` was overridden to remote dependency `package://localhost:0/fruit@1.0.5`.\n" ) } @@ -367,7 +367,7 @@ class CliProjectResolverTest { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } """ @@ -381,7 +381,7 @@ class CliProjectResolverTest { dependencies { ["fruit"] { - uri = "package://localhost:12110/fruit@1.1.0" + uri = "package://localhost:0/fruit@1.1.0" } } """ @@ -416,18 +416,18 @@ class CliProjectResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "${PackageServer.FRUIT_SHA}" } } } @@ -441,11 +441,11 @@ class CliProjectResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { - "sha256": "a82e92e0c259591111d09d18a14f5ad66e2b6e13d827ee3e6f7ce06f5d0fbe0c" + "sha256": "${PackageServer.FRUIT_1_1_SHA}" } } } diff --git a/pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliBaseOptions.kt b/pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliBaseOptions.kt index 19af1abe..b4a330bd 100644 --- a/pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliBaseOptions.kt +++ b/pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliBaseOptions.kt @@ -114,8 +114,8 @@ data class CliBaseOptions( val testMode: Boolean = false, /** - * Unless -1, rewrites HTTP requests that specify port 12110 to the given port. This is an - * internal test option. + * Unless -1, rewrites HTTP requests that specify port 0 to the given port. This is an internal + * test option. */ val testPort: Int = -1, diff --git a/pkl-commons-test/src/main/files/packages/badChecksum@1.0.0/badChecksum@1.0.0.json b/pkl-commons-test/src/main/files/packages/badChecksum@1.0.0/badChecksum@1.0.0.json index a6da5330..fd3074bf 100644 --- a/pkl-commons-test/src/main/files/packages/badChecksum@1.0.0/badChecksum@1.0.0.json +++ b/pkl-commons-test/src/main/files/packages/badChecksum@1.0.0/badChecksum@1.0.0.json @@ -1,8 +1,8 @@ { "schemaVersion": 1, - "packageUri": "package://localhost:12110/badChecksum@1.0.0", + "packageUri": "package://localhost:0/badChecksum@1.0.0", "name": "bugs", - "packageZipUrl": "https://localhost:12110/badChecksum@1.0.0/badChecksum@1.0.0.zip", + "packageZipUrl": "https://localhost:0/badChecksum@1.0.0/badChecksum@1.0.0.zip", "dependencies": {}, "version": "1.0.0", "packageZipChecksums": { diff --git a/pkl-commons-test/src/main/files/packages/badImportsWithinPackage@1.0.0/badImportsWithinPackage@1.0.0.json b/pkl-commons-test/src/main/files/packages/badImportsWithinPackage@1.0.0/badImportsWithinPackage@1.0.0.json index ad1f393e..fcad6555 100644 --- a/pkl-commons-test/src/main/files/packages/badImportsWithinPackage@1.0.0/badImportsWithinPackage@1.0.0.json +++ b/pkl-commons-test/src/main/files/packages/badImportsWithinPackage@1.0.0/badImportsWithinPackage@1.0.0.json @@ -1,8 +1,8 @@ { "schemaVersion": 1, - "packageUri": "package://localhost:12110/badImportsWithinPackage@1.1.0", + "packageUri": "package://localhost:0/badImportsWithinPackage@1.1.0", "name": "badImportsWithinPackage", - "packageZipUrl": "https://localhost:12110/badImportsWithinPackage@1.0.0/badImportsWithinPackage@1.0.0.zip", + "packageZipUrl": "https://localhost:0/badImportsWithinPackage@1.0.0/badImportsWithinPackage@1.0.0.zip", "dependencies": {}, "version": "1.0.0", "packageZipChecksums": { diff --git a/pkl-commons-test/src/main/files/packages/badPackageZipUrl@1.0.0/badPackageZipUrl@1.0.0.json b/pkl-commons-test/src/main/files/packages/badPackageZipUrl@1.0.0/badPackageZipUrl@1.0.0.json index a481cd15..f47d0cf8 100644 --- a/pkl-commons-test/src/main/files/packages/badPackageZipUrl@1.0.0/badPackageZipUrl@1.0.0.json +++ b/pkl-commons-test/src/main/files/packages/badPackageZipUrl@1.0.0/badPackageZipUrl@1.0.0.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "packageUri": "package://localhost:12110/badPackagezipUrl@1.1.0", + "packageUri": "package://localhost:0/badPackagezipUrl@1.1.0", "name": "bugs", "packageZipUrl": "ftp://wait/a/minute", "dependencies": {}, diff --git a/pkl-commons-test/src/main/files/packages/birds@0.5.0/birds@0.5.0.json b/pkl-commons-test/src/main/files/packages/birds@0.5.0/birds@0.5.0.json index 2c8e52b5..fe28814d 100644 --- a/pkl-commons-test/src/main/files/packages/birds@0.5.0/birds@0.5.0.json +++ b/pkl-commons-test/src/main/files/packages/birds@0.5.0/birds@0.5.0.json @@ -1,13 +1,13 @@ { "schemaVersion": 1, "name": "birds", - "packageUri": "package://localhost:12110/birds@0.5.0", - "packageZipUrl": "https://localhost:12110/birds@0.5.0/birds@0.5.0.zip", + "packageUri": "package://localhost:0/birds@0.5.0", + "packageZipUrl": "https://localhost:0/birds@0.5.0/birds@0.5.0.zip", "dependencies": { "fruities": { - "uri": "package://localhost:12110/fruit@1.0.5", + "uri": "package://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "34a15b02346e6acb85da5bd71d8b0738a79008b38a7fc805e5869d9129ad27d2" } } }, diff --git a/pkl-commons-test/src/main/files/packages/fruit@1.0.5/fruit@1.0.5.json b/pkl-commons-test/src/main/files/packages/fruit@1.0.5/fruit@1.0.5.json index 48925abc..3eaa93b7 100644 --- a/pkl-commons-test/src/main/files/packages/fruit@1.0.5/fruit@1.0.5.json +++ b/pkl-commons-test/src/main/files/packages/fruit@1.0.5/fruit@1.0.5.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, - "packageUri": "package://localhost:12110/fruit@1.0.5", + "packageUri": "package://localhost:0/fruit@1.0.5", "name": "fruit", "version": "1.0.5", - "packageZipUrl": "https://localhost:12110/fruit@1.0.5/fruit@1.0.5.zip", + "packageZipUrl": "https://localhost:0/fruit@1.0.5/fruit@1.0.5.zip", "dependencies": {}, "packageZipChecksums": { "sha256": "$computedChecksum" diff --git a/pkl-commons-test/src/main/files/packages/fruit@1.1.0/fruit@1.1.0.json b/pkl-commons-test/src/main/files/packages/fruit@1.1.0/fruit@1.1.0.json index 65e2e008..d27fc890 100644 --- a/pkl-commons-test/src/main/files/packages/fruit@1.1.0/fruit@1.1.0.json +++ b/pkl-commons-test/src/main/files/packages/fruit@1.1.0/fruit@1.1.0.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, - "packageUri": "package://localhost:12110/fruit@1.1.0", + "packageUri": "package://localhost:0/fruit@1.1.0", "name": "fruit", "version": "1.1.0", - "packageZipUrl": "https://localhost:12110/fruit@1.1.0/fruit@1.1.0.zip", + "packageZipUrl": "https://localhost:0/fruit@1.1.0/fruit@1.1.0.zip", "dependencies": {}, "packageZipChecksums": { "sha256": "$computedChecksum" diff --git a/pkl-commons-test/src/main/files/packages/packageContainingWildcardCharacters@1.0.0/packageContainingWildcardCharacters@1.0.0.json b/pkl-commons-test/src/main/files/packages/packageContainingWildcardCharacters@1.0.0/packageContainingWildcardCharacters@1.0.0.json index de72ecba..73ab9431 100644 --- a/pkl-commons-test/src/main/files/packages/packageContainingWildcardCharacters@1.0.0/packageContainingWildcardCharacters@1.0.0.json +++ b/pkl-commons-test/src/main/files/packages/packageContainingWildcardCharacters@1.0.0/packageContainingWildcardCharacters@1.0.0.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, - "packageUri": "package://localhost:12110/packageContainingWildcardCharacters@1.0.0", + "packageUri": "package://localhost:0/packageContainingWildcardCharacters@1.0.0", "name": "packageContainingWildcardCharacters", "version": "1.0.0", - "packageZipUrl": "https://localhost:12110/packageContainingWildcardCharacters@1.0.0/packageContainingWildcardCharacters@1.0.0.zip", + "packageZipUrl": "https://localhost:0/packageContainingWildcardCharacters@1.0.0/packageContainingWildcardCharacters@1.0.0.zip", "dependencies": {}, "packageZipChecksums": { "sha256": "$computedChecksum" diff --git a/pkl-commons-test/src/main/kotlin/org/pkl/commons/test/PackageServer.kt b/pkl-commons-test/src/main/kotlin/org/pkl/commons/test/PackageServer.kt index e3cc5690..5aacb611 100644 --- a/pkl-commons-test/src/main/kotlin/org/pkl/commons/test/PackageServer.kt +++ b/pkl-commons-test/src/main/kotlin/org/pkl/commons/test/PackageServer.kt @@ -41,11 +41,15 @@ import org.pkl.commons.deleteRecursively * * `testPort` Gradle property * * If the server isn't already running, it is automatically started. - * 4. Use port `12110` in your test. `HttpClient` will replace this port with the server port. + * 4. Use port `0` in your test. `HttpClient` will replace this port with the server port. * 4. [Close][close] the server, for example in [AfterAll][org.junit.jupiter.api.AfterAll]. */ class PackageServer : AutoCloseable { companion object { + const val BIRDS_SHA = "bfaf5281613d170a740505cc87561041f4e0cad1f0e6938bf94f7609f9a4673d" + const val FRUIT_SHA = "34a15b02346e6acb85da5bd71d8b0738a79008b38a7fc805e5869d9129ad27d2" + const val FRUIT_1_1_SHA = "8d982761d182f2185e4180c82190791d9a60c721cb3393bb2e946fab90131e8c" + fun populateCacheDir(cacheDir: Path) { val basePath = cacheDir.resolve("package-1/localhost:$PORT") basePath.deleteRecursively() @@ -65,7 +69,7 @@ class PackageServer : AutoCloseable { // Port declared in tests. // Modified by RequestRewritingClient if testPort is set. - private const val PORT = 12110 + private const val PORT = 0 private val packagesDir: Path = FileTestUtils.rootProjectDir.resolve("pkl-commons-test/build/test-packages") diff --git a/pkl-core/src/main/java/org/pkl/core/http/HttpClient.java b/pkl-core/src/main/java/org/pkl/core/http/HttpClient.java index 734db8e1..2863d0e3 100644 --- a/pkl-core/src/main/java/org/pkl/core/http/HttpClient.java +++ b/pkl-core/src/main/java/org/pkl/core/http/HttpClient.java @@ -111,8 +111,8 @@ public interface HttpClient extends AutoCloseable { /** * Sets a test server's listening port. * - *

If set, requests that specify port 12110 will be modified to use the given port. This is - * an internal test option. + *

If set, requests that specify port 0 will be modified to use the given port. This is an + * internal test option. */ Builder setTestPort(int port); diff --git a/pkl-core/src/main/java/org/pkl/core/http/RequestRewritingClient.java b/pkl-core/src/main/java/org/pkl/core/http/RequestRewritingClient.java index d98d5ec3..c7d30931 100644 --- a/pkl-core/src/main/java/org/pkl/core/http/RequestRewritingClient.java +++ b/pkl-core/src/main/java/org/pkl/core/http/RequestRewritingClient.java @@ -105,9 +105,7 @@ final class RequestRewritingClient implements HttpClient { } private URI rewriteUri(URI uri) { - // Would be nice to use port 0 instead of 12110, - // but this is best done in a separate commit. - if (testPort != -1 && uri.getPort() == 12110) { + if (testPort != -1 && uri.getPort() == 0) { return HttpUtils.setPort(uri, testPort); } return uri; diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/basic/importGlob.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/basic/importGlob.pkl index 16e25643..521284f5 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/basic/importGlob.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/basic/importGlob.pkl @@ -52,16 +52,16 @@ examples { } ["package"] { - import*("package://localhost:12110/birds@0.5.0#/catalog/*.pkl") - import*("package://localhost:12110/birds@0.5.0#/**.pkl").keys.toListing() + import*("package://localhost:0/birds@0.5.0#/catalog/*.pkl") + import*("package://localhost:0/birds@0.5.0#/**.pkl").keys.toListing() } ["globbing with absolute URIs and percent encoding"] { - import*("package://localhost:12110/packageContainingWildcardCharacters@1.0.0#/name%20*") - import*("package://localhost:12110/packageContainingWildcardCharacters@1.0.0#/name%20with%20%5C%5Bwildcard%5D!%20characters~~.pkl") + import*("package://localhost:0/packageContainingWildcardCharacters@1.0.0#/name%20*") + import*("package://localhost:0/packageContainingWildcardCharacters@1.0.0#/name%20with%20%5C%5Bwildcard%5D!%20characters~~.pkl") } ["package glob and up one level"] { - import*("package://localhost:12110/birds@0.5.0#/catalog/../catalog/*.pkl") + import*("package://localhost:0/birds@0.5.0#/catalog/../catalog/*.pkl") } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/basic/readGlob.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/basic/readGlob.pkl index 278c5c80..a7b2b18e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/basic/readGlob.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/basic/readGlob.pkl @@ -28,6 +28,6 @@ examples { } ["package:"] { - read*("package://localhost:12110/birds@0.5.0#/**.pkl") + read*("package://localhost:0/birds@0.5.0#/**.pkl") } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport1.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport1.error.pkl index b2130a9d..30659c16 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport1.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport1.error.pkl @@ -1,2 +1,2 @@ // no semver -res = import("package://localhost:12110/foo#/bar.pkl") +res = import("package://localhost:0/foo#/bar.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport10.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport10.error.pkl index 8bfd0ad0..425b269c 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport10.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport10.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/birds@0.5.0::invalidalgo:abc123#/catalog/Bird.pkl") +res = import("package://localhost:0/birds@0.5.0::invalidalgo:abc123#/catalog/Bird.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport11.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport11.error.pkl index 8e70a24b..006aa4a3 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport11.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport11.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/birds@0.5.0::boguschecksumpart#/catalog/Bird.pkl") +res = import("package://localhost:0/birds@0.5.0::boguschecksumpart#/catalog/Bird.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport2.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport2.error.pkl index 7e96214e..4ca281b2 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport2.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport2.error.pkl @@ -1,2 +1,2 @@ // invalid semver -res = import("package://localhost:12110/foo@notAVersion#/bar.pkl") +res = import("package://localhost:0/foo@notAVersion#/bar.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport3.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport3.error.pkl index 8bbc5f03..0db2ab6d 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport3.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport3.error.pkl @@ -1,2 +1,2 @@ // no fragment -res = import("package://localhost:12110/bar/baz@1.0.0") +res = import("package://localhost:0/bar/baz@1.0.0") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport4.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport4.error.pkl index d1d986a9..3cc62b91 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport4.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport4.error.pkl @@ -1,2 +1,2 @@ // fragment path must be absolute -res = import("package://localhost:12110/birds@0.5.0#catalog/Swallow.pkl") +res = import("package://localhost:0/birds@0.5.0#catalog/Swallow.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport6.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport6.error.pkl index e4da9e3b..b81f7819 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport6.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport6.error.pkl @@ -1,3 +1,3 @@ -import "package://localhost:12110/badPackageZipUrl@1.0.0#/Bug.pkl" +import "package://localhost:0/badPackageZipUrl@1.0.0#/Bug.pkl" res: Bug diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport7.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport7.error.pkl index 61bb0633..792731f5 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport7.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport7.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/badMetadataJson@1.0.0#/Bug.pkl") +res = import("package://localhost:0/badMetadataJson@1.0.0#/Bug.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport8.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport8.error.pkl index 0ecb2bd8..a1a2f7ed 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport8.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport8.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/badImportsWithinPackage@1.0.0#/unknownDependency.pkl") +res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependency.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport9.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport9.error.pkl index 1b20d1ce..8280942b 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport9.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badImport9.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/badImportsWithinPackage@1.0.0#/invalidPath.pkl") +res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPath.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead1.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead1.error.pkl index 4cf3f69e..a2b9101f 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead1.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead1.error.pkl @@ -1,2 +1,2 @@ // no semver -res = read("package://localhost:12110/foo#/bar.pkl") +res = read("package://localhost:0/foo#/bar.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead2.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead2.error.pkl index 16c8ec3c..d6d32207 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead2.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead2.error.pkl @@ -1,2 +1,2 @@ // invalid semver -res = read("package://localhost:12110/foo@notAVersion#/bar.pkl") +res = read("package://localhost:0/foo@notAVersion#/bar.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead3.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead3.error.pkl index 2d943a37..30a1b5ea 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead3.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead3.error.pkl @@ -1,2 +1,2 @@ // no fragment -res = read("package://localhost:12110/bar/baz@1.0.0") +res = read("package://localhost:0/bar/baz@1.0.0") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead4.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead4.error.pkl index d32d1521..61966d93 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead4.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead4.error.pkl @@ -1,2 +1,2 @@ // fragment path must be absolute -res = read("package://localhost:12110/birds@0.5.0#catalog/Swallow.pkl") +res = read("package://localhost:0/birds@0.5.0#catalog/Swallow.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead8.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead8.error.pkl index 4583c08b..8c054e45 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead8.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead8.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl") +res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead9.error.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead9.error.pkl index 60e29bb0..93f855a7 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead9.error.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/badRead9.error.pkl @@ -1 +1 @@ -res = import("package://localhost:12110/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl") +res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages1.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages1.pkl index 9be57f5d..8aa5589e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages1.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages1.pkl @@ -1,7 +1,7 @@ amends ".../snippetTest.pkl" -import "package://localhost:12110/birds@0.5.0#/Bird.pkl" -import "package://localhost:12110/fruit@1.0.5#/Fruit.pkl" +import "package://localhost:0/birds@0.5.0#/Bird.pkl" +import "package://localhost:0/fruit@1.0.5#/Fruit.pkl" examples { ["basic imports"] { @@ -12,15 +12,15 @@ examples { name = "Banana" } } - import("package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl") - import("package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl") + import("package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl") + import("package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl") } ["importing while specifying checksum"] { - import("package://localhost:12110/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/Swallow.pkl") + import("package://localhost:0/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/Swallow.pkl") } ["reads"] { - read("package://localhost:12110/birds@0.5.0#/Bird.pkl") - read("package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl") - read("package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl") + read("package://localhost:0/birds@0.5.0#/Bird.pkl") + read("package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl") + read("package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl") } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages2.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages2.pkl index 5cad81d8..d0326016 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages2.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/packages/packages2.pkl @@ -2,24 +2,24 @@ amends ".../snippetTest.pkl" examples { ["glob import"] { - import*("package://localhost:12110/birds@0.5.0#/catalog/*.pkl") + import*("package://localhost:0/birds@0.5.0#/catalog/*.pkl") } ["glob import within package"] { - import("package://localhost:12110/birds@0.5.0#/catalog.pkl").catalog + import("package://localhost:0/birds@0.5.0#/catalog.pkl").catalog } ["glob import transitive dep within package"] { - import("package://localhost:12110/birds@0.5.0#/allFruit.pkl").fruit + import("package://localhost:0/birds@0.5.0#/allFruit.pkl").fruit } ["glob read"] { - read*("package://localhost:12110/birds@0.5.0#/catalog/*.pkl") + read*("package://localhost:0/birds@0.5.0#/catalog/*.pkl") } ["glob read within package"] { - import("package://localhost:12110/birds@0.5.0#/catalog.pkl").catalogFiles + import("package://localhost:0/birds@0.5.0#/catalog.pkl").catalogFiles } ["glob read transitive dep within package"] { - import("package://localhost:12110/birds@0.5.0#/allFruit.pkl").fruitFiles + import("package://localhost:0/birds@0.5.0#/allFruit.pkl").fruitFiles } ["glob import while specifying checksum"] { - import*("package://localhost:12110/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/*.pkl") + import*("package://localhost:0/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/*.pkl") } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps1/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps1/PklProject index 94e31e70..86610c69 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps1/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps1/PklProject @@ -2,6 +2,6 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps2/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps2/PklProject index 94e31e70..86610c69 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps2/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps2/PklProject @@ -2,6 +2,6 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps3/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps3/PklProject index 94e31e70..86610c69 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps3/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps3/PklProject @@ -2,6 +2,6 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject index 68def6a2..dd25386a 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject @@ -3,6 +3,6 @@ amends "pkl:Project" dependencies { ["birds"] { // Should fail because dependency is out of date (PklProject.deps.json version is older) - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject.deps.json index 950b0fb4..1706131b 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps5/PklProject.deps.json @@ -1,16 +1,16 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.0", + "uri": "projectpackage://localhost:0/fruit@1.0.0", "checksums": { "sha256": "$skipChecksumVerification" } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject index 2283e767..80b529c4 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject @@ -3,6 +3,6 @@ amends "pkl:Project" dependencies { ["birds"] { // out of date because PklProject declares version 0.5.0 - uri = "package://localhost:12110/birds@0.8.0" + uri = "package://localhost:0/birds@0.8.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject.deps.json index 0f3046b0..749b595e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/badProjectDeps6/PklProject.deps.json @@ -1,16 +1,16 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { "sha256": "$skipChecksumVerification" } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/missingProjectDeps/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/missingProjectDeps/PklProject index 94e31e70..86610c69 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/missingProjectDeps/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/missingProjectDeps/PklProject @@ -2,6 +2,6 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject index 9ebef352..693c5fa5 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject @@ -2,13 +2,13 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } ["fruits"] { - uri = "package://localhost:12110/fruit@1.1.0" + uri = "package://localhost:0/fruit@1.1.0" } ["badImportsWithinPackage"] { - uri = "package://localhost:12110/badImportsWithinPackage@1.0.0" + uri = "package://localhost:0/badImportsWithinPackage@1.0.0" } ["project2"] = import("../project2/PklProject") } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json index 0312d6c9..efbcd85e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/PklProject.deps.json @@ -1,28 +1,28 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/project2@1": { + "package://localhost:0/project2@1": { "type": "local", - "uri": "projectpackage://localhost:12110/project2@1.0.0", + "uri": "projectpackage://localhost:0/project2@1.0.0", "path": "../project2/" }, - "package://localhost:12110/badImportsWithinPackage@1": { + "package://localhost:0/badImportsWithinPackage@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/badImportsWithinPackage@1.0.0", + "uri": "projectpackage://localhost:0/badImportsWithinPackage@1.0.0", "checksums": { "sha256": "$skipChecksumVerification" } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/basic.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/basic.pkl index 75457c09..8d40921b 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/basic.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/basic.pkl @@ -22,16 +22,16 @@ examples { facts { ["package-relative dependency is not same import as absolute URI dependency"] { - import("@birds/Bird.pkl") != import("package://localhost:12110/birds@0.5.0#/Bird.pkl") + import("@birds/Bird.pkl") != import("package://localhost:0/birds@0.5.0#/Bird.pkl") } ["package-relative dependency has scheme projectpackage"] { - import("@birds/Bird.pkl") == import("projectpackage://localhost:12110/birds@0.5.0#/Bird.pkl") + import("@birds/Bird.pkl") == import("projectpackage://localhost:0/birds@0.5.0#/Bird.pkl") } ["transitive import resolves to same dependency as direct dependency import"] { Swallow.favoriteFruit == import("@fruits/catalog/apple.pkl") } ["transitive import resolves to same dependency as projectpackage import"] { - Swallow.favoriteFruit == import("projectpackage://localhost:12110/fruit@1.1.0#/catalog/apple.pkl") - Swallow.favoriteFruit != import("projectpackage://localhost:12110/fruit@1.0.5#/catalog/apple.pkl") + Swallow.favoriteFruit == import("projectpackage://localhost:0/fruit@1.1.0#/catalog/apple.pkl") + Swallow.favoriteFruit != import("projectpackage://localhost:0/fruit@1.0.5#/catalog/apple.pkl") } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl index 6f5d71a5..570b79ef 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project1/globbing.pkl @@ -7,7 +7,7 @@ examples { } ["glob-import absolute package uri"] { - import*("package://localhost:12110/birds@0.5.0#/catalog/*.pkl") + import*("package://localhost:0/birds@0.5.0#/catalog/*.pkl") } ["glob-import local project"] { @@ -32,6 +32,6 @@ examples { } ["glob-read absolute package uri"] { - read*("package://localhost:12110/birds@0.5.0#/catalog/*.pkl") + read*("package://localhost:0/birds@0.5.0#/catalog/*.pkl") } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject index dc458e78..42c434c3 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject @@ -2,13 +2,13 @@ amends "pkl:Project" package { name = "project2" - baseUri = "package://localhost:12110/project2" + baseUri = "package://localhost:0/project2" version = "1.0.0" - packageZipUrl = "https://localhost:12110/project2/project2-\(version).zip" + packageZipUrl = "https://localhost:0/project2/project2-\(version).zip" } dependencies { ["burds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject.deps.json index 0f3046b0..749b595e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project2/PklProject.deps.json @@ -1,16 +1,16 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { "sha256": "$skipChecksumVerification" } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json index 0312d6c9..efbcd85e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project3/PklProject.deps.json @@ -1,28 +1,28 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/project2@1": { + "package://localhost:0/project2@1": { "type": "local", - "uri": "projectpackage://localhost:12110/project2@1.0.0", + "uri": "projectpackage://localhost:0/project2@1.0.0", "path": "../project2/" }, - "package://localhost:12110/badImportsWithinPackage@1": { + "package://localhost:0/badImportsWithinPackage@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/badImportsWithinPackage@1.0.0", + "uri": "projectpackage://localhost:0/badImportsWithinPackage@1.0.0", "checksums": { "sha256": "$skipChecksumVerification" } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject index 20138264..7379ee2c 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject @@ -3,6 +3,6 @@ amends "pkl:Project" dependencies { ["fruit"] { // need to manually keep the checksum in `PklProject.deps.json` in sync - uri = "package://localhost:12110/fruit@1.0.5" + uri = "package://localhost:0/fruit@1.0.5" } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject.deps.json index 2d73ff81..681310c7 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject.deps.json @@ -1,11 +1,11 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { - "sha256": "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + "sha256": "34a15b02346e6acb85da5bd71d8b0738a79008b38a7fc805e5869d9129ad27d2" } } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject index 56f75ac2..9a2510f9 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject @@ -5,7 +5,7 @@ import "pkl:reflect" myProject: Project = (Project.newInstance(module)) { dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject.deps.json index 0f3046b0..749b595e 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project5/PklProject.deps.json @@ -1,16 +1,16 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { "sha256": "$skipChecksumVerification" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { "sha256": "$skipChecksumVerification" } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/basic/importGlob.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/basic/importGlob.pcf index de9077a0..e39d3d2a 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/basic/importGlob.pcf +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/basic/importGlob.pcf @@ -69,13 +69,13 @@ examples { } ["package"] { new { - ["package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] { name = "Ostritch" favoriteFruit { name = "Orange" } } - ["package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] { name = "Swallow" favoriteFruit { name = "Apple" @@ -83,31 +83,31 @@ examples { } } new { - "package://localhost:12110/birds@0.5.0#/Bird.pkl" - "package://localhost:12110/birds@0.5.0#/allFruit.pkl" - "package://localhost:12110/birds@0.5.0#/catalog.pkl" - "package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" - "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" - "package://localhost:12110/birds@0.5.0#/some/dir/Bird.pkl" + "package://localhost:0/birds@0.5.0#/Bird.pkl" + "package://localhost:0/birds@0.5.0#/allFruit.pkl" + "package://localhost:0/birds@0.5.0#/catalog.pkl" + "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" + "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" + "package://localhost:0/birds@0.5.0#/some/dir/Bird.pkl" } } ["globbing with absolute URIs and percent encoding"] { new { - ["package://localhost:12110/packageContainingWildcardCharacters@1.0.0#/name%20with%20%5Bwildcard%5D!%20characters~~.pkl"] {} + ["package://localhost:0/packageContainingWildcardCharacters@1.0.0#/name%20with%20%5Bwildcard%5D!%20characters~~.pkl"] {} } new { - ["package://localhost:12110/packageContainingWildcardCharacters@1.0.0#/name%20with%20%5Bwildcard%5D!%20characters~~.pkl"] {} + ["package://localhost:0/packageContainingWildcardCharacters@1.0.0#/name%20with%20%5Bwildcard%5D!%20characters~~.pkl"] {} } } ["package glob and up one level"] { new { - ["package://localhost:12110/birds@0.5.0#/catalog/../catalog/Ostritch.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/../catalog/Ostritch.pkl"] { name = "Ostritch" favoriteFruit { name = "Orange" } } - ["package://localhost:12110/birds@0.5.0#/catalog/../catalog/Swallow.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/../catalog/Swallow.pkl"] { name = "Swallow" favoriteFruit { name = "Apple" diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/basic/readGlob.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/basic/readGlob.pcf index f5955d0b..3df2be34 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/basic/readGlob.pcf +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/basic/readGlob.pcf @@ -96,8 +96,8 @@ examples { } ["package:"] { new { - ["package://localhost:12110/birds@0.5.0#/Bird.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/Bird.pkl" + ["package://localhost:0/birds@0.5.0#/Bird.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/Bird.pkl" text = """ open module birds.Bird @@ -110,8 +110,8 @@ examples { """ base64 = "b3BlbiBtb2R1bGUgYmlyZHMuQmlyZAoKaW1wb3J0ICJAZnJ1aXRpZXMvRnJ1aXQucGtsIgoKbmFtZTogU3RyaW5nCgpmYXZvcml0ZUZydWl0OiBGcnVpdAo=" } - ["package://localhost:12110/birds@0.5.0#/allFruit.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/allFruit.pkl" + ["package://localhost:0/birds@0.5.0#/allFruit.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/allFruit.pkl" text = """ module birds.allFruit @@ -121,8 +121,8 @@ examples { """ base64 = "bW9kdWxlIGJpcmRzLmFsbEZydWl0CgpmcnVpdCA9IGltcG9ydCooIkBmcnVpdGllcy9jYXRhbG9nLyoucGtsIikKZnJ1aXRGaWxlcyA9IHJlYWQqKCJAZnJ1aXRpZXMvY2F0YWxvZy8qLnBrbCIpCg==" } - ["package://localhost:12110/birds@0.5.0#/catalog.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog.pkl" + ["package://localhost:0/birds@0.5.0#/catalog.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog.pkl" text = """ module birds.catalog @@ -132,8 +132,8 @@ examples { """ base64 = "bW9kdWxlIGJpcmRzLmNhdGFsb2cKCmNhdGFsb2cgPSBpbXBvcnQqKCJjYXRhbG9nLyoucGtsIikKY2F0YWxvZ0ZpbGVzID0gcmVhZCooImNhdGFsb2cvKi5wa2wiKQo=" } - ["package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + ["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -146,8 +146,8 @@ examples { """ base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } - ["package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + ["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -160,8 +160,8 @@ examples { """ base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCmltcG9ydCAiQGZydWl0aWVzL2NhdGFsb2cvYXBwbGUucGtsIgoKbmFtZSA9ICJTd2FsbG93IgoKZmF2b3JpdGVGcnVpdCA9IGFwcGxlCg==" } - ["package://localhost:12110/birds@0.5.0#/some/dir/Bird.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/some/dir/Bird.pkl" + ["package://localhost:0/birds@0.5.0#/some/dir/Bird.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/some/dir/Bird.pkl" text = """ amends "..." diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport1.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport1.err index 406f8428..7af2a8b8 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport1.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport1.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Module URI `package://localhost:12110/foo#/bar.pkl` has invalid syntax. +Module URI `package://localhost:0/foo#/bar.pkl` has invalid syntax. -x | res = import("package://localhost:12110/foo#/bar.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/foo#/bar.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport1.error#res (file:///$snippetsDir/input/packages/badImport1.error.pkl) Invalid path `/foo`. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport10.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport10.err index ab0da344..944c9b39 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport10.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport10.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Module URI `package://localhost:12110/birds@0.5.0::invalidalgo:abc123#/catalog/Bird.pkl` has invalid syntax. +Module URI `package://localhost:0/birds@0.5.0::invalidalgo:abc123#/catalog/Bird.pkl` has invalid syntax. -x | res = import("package://localhost:12110/birds@0.5.0::invalidalgo:abc123#/catalog/Bird.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/birds@0.5.0::invalidalgo:abc123#/catalog/Bird.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport10.error#res (file:///$snippetsDir/input/packages/badImport10.error.pkl) Unrecognized checksum algorithm: `invalidalgo`. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport11.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport11.err index 9ca36f28..76d5758d 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport11.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport11.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Module URI `package://localhost:12110/birds@0.5.0::boguschecksumpart#/catalog/Bird.pkl` has invalid syntax. +Module URI `package://localhost:0/birds@0.5.0::boguschecksumpart#/catalog/Bird.pkl` has invalid syntax. -x | res = import("package://localhost:12110/birds@0.5.0::boguschecksumpart#/catalog/Bird.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/birds@0.5.0::boguschecksumpart#/catalog/Bird.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport11.error#res (file:///$snippetsDir/input/packages/badImport11.error.pkl) Invalid checksum specification: `boguschecksumpart`. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport2.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport2.err index 5559c774..a45d54b2 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport2.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport2.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Module URI `package://localhost:12110/foo@notAVersion#/bar.pkl` has invalid syntax. +Module URI `package://localhost:0/foo@notAVersion#/bar.pkl` has invalid syntax. -x | res = import("package://localhost:12110/foo@notAVersion#/bar.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/foo@notAVersion#/bar.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport2.error#res (file:///$snippetsDir/input/packages/badImport2.error.pkl) `notAVersion` could not be parsed as a semantic version number. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport3.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport3.err index c6308a97..87b91636 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport3.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport3.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Module URI `package://localhost:12110/bar/baz@1.0.0` has invalid syntax. +Module URI `package://localhost:0/bar/baz@1.0.0` has invalid syntax. -x | res = import("package://localhost:12110/bar/baz@1.0.0") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/bar/baz@1.0.0") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport3.error#res (file:///$snippetsDir/input/packages/badImport3.error.pkl) Expected URI to contain a fragment. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport4.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport4.err index 2983acc9..7f321277 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport4.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport4.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Module URI `package://localhost:12110/birds@0.5.0#catalog/Swallow.pkl` has invalid syntax. +Module URI `package://localhost:0/birds@0.5.0#catalog/Swallow.pkl` has invalid syntax. -x | res = import("package://localhost:12110/birds@0.5.0#catalog/Swallow.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/birds@0.5.0#catalog/Swallow.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport4.error#res (file:///$snippetsDir/input/packages/badImport4.error.pkl) Cannot have a relative fragment path `catalog/Swallow.pkl`. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport6.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport6.err index 8d5576ce..6960ef1c 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport6.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport6.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Expected the zip asset for package `package://localhost:12110/badPackageZipUrl@1.0.0` to be an HTTPS URI, but got `ftp://wait/a/minute`. +Expected the zip asset for package `package://localhost:0/badPackageZipUrl@1.0.0` to be an HTTPS URI, but got `ftp://wait/a/minute`. -x | import "package://localhost:12110/badPackageZipUrl@1.0.0#/Bug.pkl" - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | import "package://localhost:0/badPackageZipUrl@1.0.0#/Bug.pkl" + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport6.error#Bug (file:///$snippetsDir/input/packages/badImport6.error.pkl) x | res: Bug diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport7.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport7.err index 19e8725f..540b3b42 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport7.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport7.err @@ -1,13 +1,13 @@ –– Pkl Error –– -Received invalid dependency metadata for package `package://localhost:12110/badMetadataJson@1.0.0` when making request `GET https://localhost:12110/badMetadataJson@1.0.0`: +Received invalid dependency metadata for package `package://localhost:0/badMetadataJson@1.0.0` when making request `GET https://localhost:0/badMetadataJson@1.0.0`: Malformed JSON: Expected 'r' at 1:2. Original input: `this is not json ` -x | res = import("package://localhost:12110/badMetadataJson@1.0.0#/Bug.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/badMetadataJson@1.0.0#/Bug.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badImport7.error#res (file:///$snippetsDir/input/packages/badImport7.error.pkl) xxx | text = renderer.renderDocument(value) diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport8.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport8.err index 6f6b6123..5ffb854f 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport8.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport8.err @@ -1,9 +1,9 @@ –– Pkl Error –– -Cannot find dependency named `fruits`, because it was not declared in package `package://localhost:12110/badImportsWithinPackage@1.0.0`. +Cannot find dependency named `fruits`, because it was not declared in package `package://localhost:0/badImportsWithinPackage@1.0.0`. x | res = import("@fruits/Foo.pkl") ^^^^^^^^^^^^^^^^^ -at badImport8.error#res (package://localhost:12110/badImportsWithinPackage@1.0.0#/unknownDependency.pkl) +at badImport8.error#res (package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependency.pkl) xxx | text = renderer.renderDocument(value) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport9.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport9.err index 28e1e713..083f92db 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport9.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badImport9.err @@ -1,9 +1,9 @@ –– Pkl Error –– -Cannot find module `package://localhost:12110/badImportsWithinPackage@1.0.0#/not/a/valid/path.pkl`. +Cannot find module `package://localhost:0/badImportsWithinPackage@1.0.0#/not/a/valid/path.pkl`. x | res = import("not/a/valid/path.pkl") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -at invalidPath#res (package://localhost:12110/badImportsWithinPackage@1.0.0#/invalidPath.pkl) +at invalidPath#res (package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPath.pkl) xxx | text = renderer.renderDocument(value) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead1.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead1.err index 959c3649..bd70a874 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead1.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead1.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Resource URI `package://localhost:12110/foo#/bar.pkl` has invalid syntax. +Resource URI `package://localhost:0/foo#/bar.pkl` has invalid syntax. -x | res = read("package://localhost:12110/foo#/bar.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = read("package://localhost:0/foo#/bar.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badRead1.error#res (file:///$snippetsDir/input/packages/badRead1.error.pkl) Invalid path `/foo`. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead2.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead2.err index 747bff33..29ba8ddd 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead2.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead2.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Resource URI `package://localhost:12110/foo@notAVersion#/bar.pkl` has invalid syntax. +Resource URI `package://localhost:0/foo@notAVersion#/bar.pkl` has invalid syntax. -x | res = read("package://localhost:12110/foo@notAVersion#/bar.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = read("package://localhost:0/foo@notAVersion#/bar.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badRead2.error#res (file:///$snippetsDir/input/packages/badRead2.error.pkl) `notAVersion` could not be parsed as a semantic version number. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead3.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead3.err index c43ac278..0ca824cb 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead3.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead3.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Resource URI `package://localhost:12110/bar/baz@1.0.0` has invalid syntax. +Resource URI `package://localhost:0/bar/baz@1.0.0` has invalid syntax. -x | res = read("package://localhost:12110/bar/baz@1.0.0") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = read("package://localhost:0/bar/baz@1.0.0") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badRead3.error#res (file:///$snippetsDir/input/packages/badRead3.error.pkl) Expected URI to contain a fragment. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead4.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead4.err index 2a21cd25..24760080 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead4.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead4.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Resource URI `package://localhost:12110/birds@0.5.0#catalog/Swallow.pkl` has invalid syntax. +Resource URI `package://localhost:0/birds@0.5.0#catalog/Swallow.pkl` has invalid syntax. -x | res = read("package://localhost:12110/birds@0.5.0#catalog/Swallow.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = read("package://localhost:0/birds@0.5.0#catalog/Swallow.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badRead4.error#res (file:///$snippetsDir/input/packages/badRead4.error.pkl) Cannot have a relative fragment path `catalog/Swallow.pkl`. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead8.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead8.err index b34b89a5..4a6140e0 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead8.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead8.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Cannot find module `package://localhost:12110/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl`. +Cannot find module `package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl`. -x | res = import("package://localhost:12110/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependencyReaad.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badRead8.error#res (file:///$snippetsDir/input/packages/badRead8.error.pkl) xxx | text = renderer.renderDocument(value) diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead9.err b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead9.err index 83753119..ece9a711 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead9.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/badRead9.err @@ -1,8 +1,8 @@ –– Pkl Error –– -Cannot find module `package://localhost:12110/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl`. +Cannot find module `package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl`. -x | res = import("package://localhost:12110/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl") - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +x | res = import("package://localhost:0/badImportsWithinPackage@1.0.0#/invalidPathReaad.pkl") + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ at badRead9.error#res (file:///$snippetsDir/input/packages/badRead9.error.pkl) xxx | text = renderer.renderDocument(value) diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages1.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages1.pcf index 3015417f..370c3456 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages1.pcf +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages1.pcf @@ -29,7 +29,7 @@ examples { } ["reads"] { new { - uri = "package://localhost:12110/birds@0.5.0#/Bird.pkl" + uri = "package://localhost:0/birds@0.5.0#/Bird.pkl" text = """ open module birds.Bird @@ -43,7 +43,7 @@ examples { base64 = "b3BlbiBtb2R1bGUgYmlyZHMuQmlyZAoKaW1wb3J0ICJAZnJ1aXRpZXMvRnJ1aXQucGtsIgoKbmFtZTogU3RyaW5nCgpmYXZvcml0ZUZydWl0OiBGcnVpdAo=" } new { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -57,7 +57,7 @@ examples { base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCmltcG9ydCAiQGZydWl0aWVzL2NhdGFsb2cvYXBwbGUucGtsIgoKbmFtZSA9ICJTd2FsbG93IgoKZmF2b3JpdGVGcnVpdCA9IGFwcGxlCg==" } new { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages2.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages2.pcf index 880ee484..ff4c139c 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages2.pcf +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/packages/packages2.pcf @@ -1,13 +1,13 @@ examples { ["glob import"] { new { - ["package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] { name = "Ostritch" favoriteFruit { name = "Orange" } } - ["package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] { name = "Swallow" favoriteFruit { name = "Apple" @@ -40,8 +40,8 @@ examples { } ["glob read"] { new { - ["package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + ["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -54,8 +54,8 @@ examples { """ base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } - ["package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + ["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -73,7 +73,7 @@ examples { ["glob read within package"] { new { ["catalog/Ostritch.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -87,7 +87,7 @@ examples { base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } ["catalog/Swallow.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -105,7 +105,7 @@ examples { ["glob read transitive dep within package"] { new { ["@fruities/catalog/apple.pkl"] { - uri = "package://localhost:12110/fruit@1.0.5#/catalog/apple.pkl" + uri = "package://localhost:0/fruit@1.0.5#/catalog/apple.pkl" text = """ amends "../Fruit.pkl" @@ -118,13 +118,13 @@ examples { } ["glob import while specifying checksum"] { new { - ["package://localhost:12110/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/Ostritch.pkl"] { + ["package://localhost:0/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/Ostritch.pkl"] { name = "Ostritch" favoriteFruit { name = "Orange" } } - ["package://localhost:12110/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/Swallow.pkl"] { + ["package://localhost:0/birds@0.5.0::sha256:3f19ab9fcee2f44f93a75a09e531db278c6d2cd25206836c8c2c4071cd7d3118#/catalog/Swallow.pkl"] { name = "Swallow" favoriteFruit { name = "Apple" diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps3/bug.err b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps3/bug.err index 117390ff..d60514bd 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps3/bug.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps3/bug.err @@ -1,5 +1,5 @@ –– Pkl Error –– -Did not find a resolved dependency for package `package://localhost:12110/birds@0.5.0`. +Did not find a resolved dependency for package `package://localhost:0/birds@0.5.0`. Run `pkl project resolve` to update resolved dependencies. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps5/bug.err b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps5/bug.err index 985ecd50..53ec4ea5 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps5/bug.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps5/bug.err @@ -1,14 +1,14 @@ –– Pkl Error –– -Transitive dependency declared by package `package://localhost:12110/birds@0.5.0` is newer than what is declared in `PklProject.deps.json`. +Transitive dependency declared by package `package://localhost:0/birds@0.5.0` is newer than what is declared in `PklProject.deps.json`. -Declared: `package://localhost:12110/fruit@1.0.5` -Resolved: `package://localhost:12110/fruit@1.0.0` +Declared: `package://localhost:0/fruit@1.0.5` +Resolved: `package://localhost:0/fruit@1.0.0` Run `pkl project resolve` to update resolved dependencies. x | import "@fruities/Fruit.pkl" ^^^^^^^^^^^^^^^^^^^^^ -at bug#Bird (projectpackage://localhost:12110/birds@0.5.0#/Bird.pkl) +at bug#Bird (projectpackage://localhost:0/birds@0.5.0#/Bird.pkl) x | bird: Bird ^^^^ diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps6/bug.err b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps6/bug.err index 541ca3c0..c4ab02b5 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps6/bug.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/badProjectDeps6/bug.err @@ -1,8 +1,8 @@ –– Pkl Error –– Project `file:///$snippetsDir/input/projects/badProjectDeps6/PklProject` declares a dependency on a package that is newer than what is declared in `PklProject.deps.json`. -Declared: `package://localhost:12110/birds@0.8.0` -Resolved: `package://localhost:12110/birds@0.5.0` +Declared: `package://localhost:0/birds@0.8.0` +Resolved: `package://localhost:0/birds@0.5.0` Run `pkl project resolve` to update resolved dependencies. diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/badImport3.err b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/badImport3.err index cdad2189..34dde808 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/badImport3.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/badImport3.err @@ -1,9 +1,9 @@ –– Pkl Error –– -Cannot find dependency named `fruits`, because it was not declared in package `package://localhost:12110/badImportsWithinPackage@1.0.0`. +Cannot find dependency named `fruits`, because it was not declared in package `package://localhost:0/badImportsWithinPackage@1.0.0`. x | res = import("@fruits/Foo.pkl") ^^^^^^^^^^^^^^^^^ -at badImport3.error#res (projectpackage://localhost:12110/badImportsWithinPackage@1.0.0#/unknownDependency.pkl) +at badImport3.error#res (projectpackage://localhost:0/badImportsWithinPackage@1.0.0#/unknownDependency.pkl) xxx | text = renderer.renderDocument(value) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/basic.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/basic.pcf index 92c27634..dd28472f 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/basic.pcf +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/basic.pcf @@ -38,7 +38,7 @@ examples { } ["reading directories"] { new { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog" text = """ Ostritch.pkl Swallow.pkl @@ -47,7 +47,7 @@ examples { base64 = "T3N0cml0Y2gucGtsClN3YWxsb3cucGtsCg==" } new { - uri = "projectpackage://localhost:12110/birds@0.5.0#/" + uri = "projectpackage://localhost:0/birds@0.5.0#/" text = """ Bird.pkl allFruit.pkl diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/directPackageImport.err b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/directPackageImport.err index a0e6d1eb..aa97e901 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/directPackageImport.err +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/directPackageImport.err @@ -1,5 +1,5 @@ –– Pkl Error –– -I/O error loading module `projectpackage://localhost:12110/birds@0.5.0#/`. +I/O error loading module `projectpackage://localhost:0/birds@0.5.0#/`. IOException: Is a directory x | res = import("@birds") diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/globbing.pcf b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/globbing.pcf index a1805b00..5c8dbe57 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/globbing.pcf +++ b/pkl-core/src/test/files/LanguageSnippetTests/output/projects/project1/globbing.pcf @@ -17,13 +17,13 @@ examples { } ["glob-import absolute package uri"] { new { - ["package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] { name = "Ostritch" favoriteFruit { name = "Orange" } } - ["package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"] { + ["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] { name = "Swallow" favoriteFruit { name = "Apple" @@ -42,7 +42,7 @@ examples { ["glob-read using dependency notation"] { new { ["@birds/catalog/Ostritch.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -56,7 +56,7 @@ examples { base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } ["@birds/catalog/Swallow.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -72,7 +72,7 @@ examples { } new { ["@birds/Bird.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/Bird.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/Bird.pkl" text = """ open module birds.Bird @@ -86,7 +86,7 @@ examples { base64 = "b3BlbiBtb2R1bGUgYmlyZHMuQmlyZAoKaW1wb3J0ICJAZnJ1aXRpZXMvRnJ1aXQucGtsIgoKbmFtZTogU3RyaW5nCgpmYXZvcml0ZUZydWl0OiBGcnVpdAo=" } ["@birds/allFruit.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/allFruit.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/allFruit.pkl" text = """ module birds.allFruit @@ -97,7 +97,7 @@ examples { base64 = "bW9kdWxlIGJpcmRzLmFsbEZydWl0CgpmcnVpdCA9IGltcG9ydCooIkBmcnVpdGllcy9jYXRhbG9nLyoucGtsIikKZnJ1aXRGaWxlcyA9IHJlYWQqKCJAZnJ1aXRpZXMvY2F0YWxvZy8qLnBrbCIpCg==" } ["@birds/catalog.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog.pkl" text = """ module birds.catalog @@ -110,7 +110,7 @@ examples { } new { ["@birds/Bird.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/Bird.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/Bird.pkl" text = """ open module birds.Bird @@ -124,7 +124,7 @@ examples { base64 = "b3BlbiBtb2R1bGUgYmlyZHMuQmlyZAoKaW1wb3J0ICJAZnJ1aXRpZXMvRnJ1aXQucGtsIgoKbmFtZTogU3RyaW5nCgpmYXZvcml0ZUZydWl0OiBGcnVpdAo=" } ["@birds/allFruit.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/allFruit.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/allFruit.pkl" text = """ module birds.allFruit @@ -135,7 +135,7 @@ examples { base64 = "bW9kdWxlIGJpcmRzLmFsbEZydWl0CgpmcnVpdCA9IGltcG9ydCooIkBmcnVpdGllcy9jYXRhbG9nLyoucGtsIikKZnJ1aXRGaWxlcyA9IHJlYWQqKCJAZnJ1aXRpZXMvY2F0YWxvZy8qLnBrbCIpCg==" } ["@birds/catalog.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog.pkl" text = """ module birds.catalog @@ -146,7 +146,7 @@ examples { base64 = "bW9kdWxlIGJpcmRzLmNhdGFsb2cKCmNhdGFsb2cgPSBpbXBvcnQqKCJjYXRhbG9nLyoucGtsIikKY2F0YWxvZ0ZpbGVzID0gcmVhZCooImNhdGFsb2cvKi5wa2wiKQo=" } ["@birds/catalog/Ostritch.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -160,7 +160,7 @@ examples { base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } ["@birds/catalog/Swallow.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -174,7 +174,7 @@ examples { base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCmltcG9ydCAiQGZydWl0aWVzL2NhdGFsb2cvYXBwbGUucGtsIgoKbmFtZSA9ICJTd2FsbG93IgoKZmF2b3JpdGVGcnVpdCA9IGFwcGxlCg==" } ["@birds/some/dir/Bird.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/some/dir/Bird.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/some/dir/Bird.pkl" text = """ amends "..." @@ -192,7 +192,7 @@ examples { ["glob-read within package"] { new { ["catalog/Ostritch.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -206,7 +206,7 @@ examples { base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } ["catalog/Swallow.pkl"] { - uri = "projectpackage://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + uri = "projectpackage://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" @@ -223,8 +223,8 @@ examples { } ["glob-read absolute package uri"] { new { - ["package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Ostritch.pkl" + ["package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog/Ostritch.pkl" text = """ amends "../Bird.pkl" @@ -237,8 +237,8 @@ examples { """ base64 = "YW1lbmRzICIuLi9CaXJkLnBrbCIKCm5hbWUgPSAiT3N0cml0Y2giCgpmYXZvcml0ZUZydWl0IHsKICBuYW1lID0gIk9yYW5nZSIKfQo=" } - ["package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"] { - uri = "package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl" + ["package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"] { + uri = "package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl" text = """ amends "../Bird.pkl" diff --git a/pkl-core/src/test/kotlin/org/pkl/core/StackFrameTransformersTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/StackFrameTransformersTest.kt index 648857ec..eff38f5f 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/StackFrameTransformersTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/StackFrameTransformersTest.kt @@ -17,7 +17,7 @@ class StackFrameTransformersTest { .setHttpClient(httpClient) .build().use { val frame = StackFrame( - "package://localhost:12110/birds@0.5.0#/Bird.pkl", + "package://localhost:0/birds@0.5.0#/Bird.pkl", null, listOf(), 1, diff --git a/pkl-core/src/test/kotlin/org/pkl/core/http/RequestRewritingClientTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/http/RequestRewritingClientTest.kt index da9793f3..537c8385 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/http/RequestRewritingClientTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/http/RequestRewritingClientTest.kt @@ -104,10 +104,10 @@ class RequestRewritingClientTest { } @Test - fun `rewrites port 12110 if test port is set`() { + fun `rewrites port 0 if test port is set`() { val captured = RequestCapturingClient() val client = RequestRewritingClient("Pkl", Duration.ofSeconds(42), 5000, captured) - val request = HttpRequest.newBuilder(URI("https://example.com:12110")).build() + val request = HttpRequest.newBuilder(URI("https://example.com:0")).build() client.send(request, BodyHandlers.discarding()) @@ -115,12 +115,12 @@ class RequestRewritingClientTest { } @Test - fun `leaves port 12110 intact if no test port is set`() { - val request = HttpRequest.newBuilder(URI("https://example.com:12110")).build() + fun `leaves port 0 intact if no test port is set`() { + val request = HttpRequest.newBuilder(URI("https://example.com:0")).build() client.send(request, BodyHandlers.discarding()) - assertThat(captured.request.uri().port).isEqualTo(12110) + assertThat(captured.request.uri().port).isEqualTo(0) } } diff --git a/pkl-core/src/test/kotlin/org/pkl/core/module/ModuleKeysTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/module/ModuleKeysTest.kt index b09a6590..35297a4f 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/module/ModuleKeysTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/module/ModuleKeysTest.kt @@ -160,7 +160,7 @@ class ModuleKeysTest { @Test fun `package - no version`() { val e = assertThrows { - ModuleKeys.pkg(URI("package://localhost:12110/birds#/Bird.pkl")) + ModuleKeys.pkg(URI("package://localhost:0/birds#/Bird.pkl")) } assertThat(e).hasMessageContaining("A package URI must have its path suffixed by its version") } @@ -168,7 +168,7 @@ class ModuleKeysTest { @Test fun `package - invalid semver`() { val e = assertThrows { - ModuleKeys.pkg(URI("package://localhost:12110/birds@notAVersion#/Bird.pkl")) + ModuleKeys.pkg(URI("package://localhost:0/birds@notAVersion#/Bird.pkl")) } assertThat(e).hasMessageContaining("`notAVersion` could not be parsed") } diff --git a/pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt index ecd67a45..ee28edd4 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt @@ -47,7 +47,7 @@ class PackageResolversTest { @Test fun `get module bytes`() { val expectedBirdModule = packageRoot.resolve("birds@0.5.0/package/Bird.pkl").readString(StandardCharsets.UTF_8) - val assetUri = PackageAssetUri("package://localhost:12110/birds@0.5.0#/Bird.pkl") + val assetUri = PackageAssetUri("package://localhost:0/birds@0.5.0#/Bird.pkl") val birdModule = resolver .getBytes(assetUri, false, null) .toString(StandardCharsets.UTF_8) @@ -56,7 +56,7 @@ class PackageResolversTest { @Test fun `get directory`() { - val assetUri = PackageAssetUri("package://localhost:12110/birds@0.5.0#/") + val assetUri = PackageAssetUri("package://localhost:0/birds@0.5.0#/") val err = assertThrows { resolver .getBytes(assetUri, false, null) @@ -67,7 +67,7 @@ class PackageResolversTest { @Test fun `get directory, allowing directory reads`() { - val assetUri = PackageAssetUri("package://localhost:12110/birds@0.5.0#/") + val assetUri = PackageAssetUri("package://localhost:0/birds@0.5.0#/") val bytes = resolver .getBytes(assetUri, true, null) .toString(StandardCharsets.UTF_8) @@ -84,7 +84,7 @@ class PackageResolversTest { @Test fun `get module bytes resolving path`() { val expectedBirdModule = packageRoot.resolve("birds@0.5.0/package/Bird.pkl").readString(StandardCharsets.UTF_8) - val assetUri = PackageAssetUri("package://localhost:12110/birds@0.5.0#/foo/../Bird.pkl") + val assetUri = PackageAssetUri("package://localhost:0/birds@0.5.0#/foo/../Bird.pkl") val birdModule = resolver .getBytes(assetUri, false, null) .toString(StandardCharsets.UTF_8) @@ -95,7 +95,7 @@ class PackageResolversTest { fun `list path elements at root`() { // cast to set to avoid sort issues val elements = resolver - .listElements(PackageAssetUri("package://localhost:12110/birds@0.5.0#/"), null) + .listElements(PackageAssetUri("package://localhost:0/birds@0.5.0#/"), null) .toSet() assertThat(elements).isEqualTo( setOf( @@ -111,12 +111,12 @@ class PackageResolversTest { @Test fun `get multiple assets`() { val bird = resolver.getBytes( - PackageAssetUri("package://localhost:12110/birds@0.5.0#/Bird.pkl"), + PackageAssetUri("package://localhost:0/birds@0.5.0#/Bird.pkl"), false, null ) val swallow = resolver.getBytes( - PackageAssetUri("package://localhost:12110/birds@0.5.0#/catalog/Swallow.pkl"), + PackageAssetUri("package://localhost:0/birds@0.5.0#/catalog/Swallow.pkl"), false, null ) @@ -127,7 +127,7 @@ class PackageResolversTest { @Test fun `list path elements in nested directory`() { // cast to set to avoid sort issues - val elements = resolver.listElements(PackageAssetUri("package://localhost:12110/birds@0.5.0#/catalog/"), null).toSet() + val elements = resolver.listElements(PackageAssetUri("package://localhost:0/birds@0.5.0#/catalog/"), null).toSet() assertThat(elements).isEqualTo( setOf( PathElement("Ostritch.pkl", false), @@ -141,7 +141,7 @@ class PackageResolversTest { assertThrows { resolver .getBytes( - PackageAssetUri("package://localhost:12110/birds@0.5.0#/Horse.pkl"), + PackageAssetUri("package://localhost:0/birds@0.5.0#/Horse.pkl"), false, null ) @@ -154,7 +154,7 @@ class PackageResolversTest { assertThrows { resolver .getBytes( - PackageAssetUri("package://localhost:12110/not-a-package@0.5.0#/Horse.pkl"), + PackageAssetUri("package://localhost:0/not-a-package@0.5.0#/Horse.pkl"), false, null) .toString(StandardCharsets.UTF_8) @@ -165,18 +165,18 @@ class PackageResolversTest { fun `requires package zip to be an HTTPS URI`() { assertThatCode { resolver.getBytes( - PackageAssetUri("package://localhost:12110/badPackageZipUrl@1.0.0#/Bug.pkl"), + PackageAssetUri("package://localhost:0/badPackageZipUrl@1.0.0#/Bug.pkl"), false, null) } - .hasMessage("Expected the zip asset for package `package://localhost:12110/badPackageZipUrl@1.0.0` to be an HTTPS URI, but got `ftp://wait/a/minute`.") + .hasMessage("Expected the zip asset for package `package://localhost:0/badPackageZipUrl@1.0.0` to be an HTTPS URI, but got `ftp://wait/a/minute`.") } @Test fun `throws if package checksum is invalid`() { val error = assertThrows { resolver.getBytes( - PackageAssetUri("package://localhost:12110/badChecksum@1.0.0#/Bug.pkl"), + PackageAssetUri("package://localhost:0/badChecksum@1.0.0#/Bug.pkl"), false, null) } diff --git a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt index 48318781..ff6d77a1 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt @@ -46,23 +46,23 @@ class ProjectDependenciesResolverTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "projectpackage://localhost:12110/birds@0.5.0", + "uri": "projectpackage://localhost:0/birds@0.5.0", "checksums": { - "sha256": "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + "sha256": "${PackageServer.BIRDS_SHA}" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.1.0", + "uri": "projectpackage://localhost:0/fruit@1.1.0", "checksums": { - "sha256": "a82e92e0c259591111d09d18a14f5ad66e2b6e13d827ee3e6f7ce06f5d0fbe0c" + "sha256": "${PackageServer.FRUIT_1_1_SHA}" } }, - "package://localhost:12110/project3@1": { + "package://localhost:0/project3@1": { "type": "local", - "uri": "projectpackage://localhost:12110/project3@1.5.0", + "uri": "projectpackage://localhost:0/project3@1.5.0", "path": "../project3" } } @@ -79,9 +79,9 @@ class ProjectDependenciesResolverTest { ProjectDependenciesResolver(project, packageResolver, System.err.writer()).resolve() } assertThat(e).hasMessage(""" - Computed checksum did not match declared checksum for dependency `package://localhost:12110/birds@0.5.0`. + Computed checksum did not match declared checksum for dependency `package://localhost:0/birds@0.5.0`. - Computed: "0a5ad2dc13f06f73f96ba94e8d01d48252bc934e2de71a837620ca0fef8a7453" + Computed: "${PackageServer.BIRDS_SHA}" Declared: "intentionally bogus value" """.trimIndent()) } diff --git a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt index 396530fa..3d44dc50 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt @@ -14,16 +14,16 @@ class ProjectDepsTest { { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/birds@0": { + "package://localhost:0/birds@0": { "type": "remote", - "uri": "package://localhost:12110/birds@0.5.0", + "uri": "package://localhost:0/birds@0.5.0", "checksums": { "sha256": "abc123" } }, - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "local", - "uri": "package://localhost:12110/fruit@1.1.0", + "uri": "package://localhost:0/fruit@1.1.0", "path": "../fruit" } } @@ -32,12 +32,12 @@ class ProjectDepsTest { private val projectDeps = let { val projectDepsMap = EconomicMaps.of( - CanonicalPackageUri.of("package://localhost:12110/birds@0"), Dependency.RemoteDependency( - PackageUri.create("package://localhost:12110/birds@0.5.0"), + CanonicalPackageUri.of("package://localhost:0/birds@0"), Dependency.RemoteDependency( + PackageUri.create("package://localhost:0/birds@0.5.0"), Checksums("abc123") ), - CanonicalPackageUri.of("package://localhost:12110/fruit@1"), Dependency.LocalDependency( - PackageUri.create("package://localhost:12110/fruit@1.1.0"), + CanonicalPackageUri.of("package://localhost:0/fruit@1"), Dependency.LocalDependency( + PackageUri.create("package://localhost:0/fruit@1.1.0"), Path.of("../fruit") ) ) diff --git a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectTest.kt index 690fc57d..450dc088 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectTest.kt @@ -151,11 +151,11 @@ class ProjectTest { assertThatCode { evaluator.evaluate(ModuleSource.path(projectDir.resolve("bug.pkl"))) } .hasMessageStartingWith(""" –– Pkl Error –– - Cannot download package `package://localhost:12110/fruit@1.0.5` because the computed checksum for package metadata does not match the expected checksum. + Cannot download package `package://localhost:0/fruit@1.0.5` because the computed checksum for package metadata does not match the expected checksum. - Computed checksum: "abd173e8a25f5b930b0e34269a441e32c9d95e0b0a715bc6eff918f0afd0688e" + Computed checksum: "${PackageServer.FRUIT_SHA}" Expected checksum: "intentionally bogus checksum" - Asset URL: "https://localhost:12110/fruit@1.0.5" + Asset URL: "https://localhost:0/fruit@1.0.5" 1 | import "@fruit/Fruit.pkl" ^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum/PklProject b/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum/PklProject index 7758d0a6..2d1a4e02 100644 --- a/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum/PklProject +++ b/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum/PklProject @@ -2,7 +2,7 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" checksums { sha256 = "intentionally bogus value" } diff --git a/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject b/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject index cd4c8a75..dae36103 100644 --- a/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject +++ b/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject @@ -3,6 +3,6 @@ amends "pkl:Project" dependencies { ["fruit"] { // should fail because the checksum is invalid - uri = "package://localhost:12110/fruit@1.0.5" + uri = "package://localhost:0/fruit@1.0.5" } } diff --git a/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject.deps.json b/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject.deps.json index 7bb3852a..0477c5a4 100644 --- a/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject.deps.json +++ b/pkl-core/src/test/resources/org/pkl/core/project/badProjectChecksum2/PklProject.deps.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, "resolvedDependencies": { - "package://localhost:12110/fruit@1": { + "package://localhost:0/fruit@1": { "type": "remote", - "uri": "projectpackage://localhost:12110/fruit@1.0.5", + "uri": "projectpackage://localhost:0/fruit@1.0.5", "checksums": { "sha256": "intentionally bogus checksum" } diff --git a/pkl-core/src/test/resources/org/pkl/core/project/project2/PklProject b/pkl-core/src/test/resources/org/pkl/core/project/project2/PklProject index 81b49d2d..15ec367e 100644 --- a/pkl-core/src/test/resources/org/pkl/core/project/project2/PklProject +++ b/pkl-core/src/test/resources/org/pkl/core/project/project2/PklProject @@ -2,7 +2,7 @@ amends "pkl:Project" dependencies { ["birds"] { - uri = "package://localhost:12110/birds@0.5.0" + uri = "package://localhost:0/birds@0.5.0" } ["project3"] = import("../project3/PklProject") } diff --git a/pkl-core/src/test/resources/org/pkl/core/project/project3/PklProject b/pkl-core/src/test/resources/org/pkl/core/project/project3/PklProject index a5611ba0..5605a357 100644 --- a/pkl-core/src/test/resources/org/pkl/core/project/project3/PklProject +++ b/pkl-core/src/test/resources/org/pkl/core/project/project3/PklProject @@ -2,7 +2,7 @@ amends "pkl:Project" package { name = "project3" - baseUri = "package://localhost:12110/project3" + baseUri = "package://localhost:0/project3" version = "1.5.0" // not actually used, just need to provide one so tests pass packageZipUrl = "https://bogus.value" @@ -10,6 +10,6 @@ package { dependencies { ["fruit"] { - uri = "package://localhost:12110/fruit@1.1.0" + uri = "package://localhost:0/fruit@1.1.0" } } diff --git a/pkl-core/src/test/resources/org/pkl/core/project/project4/PklProject b/pkl-core/src/test/resources/org/pkl/core/project/project4/PklProject index d2d75d1a..02624569 100644 --- a/pkl-core/src/test/resources/org/pkl/core/project/project4/PklProject +++ b/pkl-core/src/test/resources/org/pkl/core/project/project4/PklProject @@ -4,5 +4,5 @@ package { name = "project4" version = "1.0.0" packageZipUrl = "https://bogus.value" - baseUri = "package://localhost:12110/project4" + baseUri = "package://localhost:0/project4" } diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/Bird/index.js b/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/Bird/index.js similarity index 100% rename from pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/Bird/index.js rename to pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/Bird/index.js diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/allFruit/index.js b/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/allFruit/index.js similarity index 100% rename from pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/allFruit/index.js rename to pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/allFruit/index.js diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/catalog/index.js b/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/catalog/index.js similarity index 100% rename from pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/catalog/index.js rename to pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/catalog/index.js diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/index.js b/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/index.js similarity index 100% rename from pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/birds/0.5.0/index.js rename to pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/birds/0.5.0/index.js diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/fruit/1.1.0/Fruit/index.js b/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/fruit/1.1.0/Fruit/index.js similarity index 100% rename from pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/fruit/1.1.0/Fruit/index.js rename to pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/fruit/1.1.0/Fruit/index.js diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/fruit/1.1.0/index.js b/pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/fruit/1.1.0/index.js similarity index 100% rename from pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:12110/fruit/1.1.0/index.js rename to pkl-doc/src/test/files/DocGeneratorTest/output/data/localhost:0/fruit/1.1.0/index.js diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/index.html b/pkl-doc/src/test/files/DocGeneratorTest/output/index.html index 92a4968e..375050f2 100644 --- a/pkl-doc/src/test/files/DocGeneratorTest/output/index.html +++ b/pkl-doc/src/test/files/DocGeneratorTest/output/index.html @@ -108,24 +108,24 @@ age: Int

  • -
    -
    link +
    +
    link
    package
    -
    localhost:12110/birds
    +
    localhost:0/birds
  • -
    -
    link +
    +
    link
    package
    -
    localhost:12110/fruit
    +
    localhost:0/fruit
    • diff --git a/pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/Bird/index.html b/pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/Bird/index.html similarity index 97% rename from pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/Bird/index.html rename to pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/Bird/index.html index f6ad5c75..a21b005c 100644 --- a/pkl-doc/src/test/files/DocGeneratorTest/output/localhost:12110/birds/0.5.0/Bird/index.html +++ b/pkl-doc/src/test/files/DocGeneratorTest/output/localhost:0/birds/0.5.0/Bird/index.html @@ -1,10 +1,10 @@ - Bird (localhost:12110/birds:0.5.0) • Docsite Title + Bird (localhost:0/birds:0.5.0) • Docsite Title - + @@ -15,9 +15,9 @@
    Docsite Title
    - +
    -
    Docsite Title > localhost:12110/birds +
    Docsite Title > localhost:0/birds

    birds.Bird0.5.0