diff --git a/tests/types/cocoapods-test.json b/tests/types/cocoapods-test.json index 3bbfa6db..a38c4e64 100644 --- a/tests/types/cocoapods-test.json +++ b/tests/types/cocoapods-test.json @@ -144,8 +144,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:cocoapods/GoogleUtilities@7.5.2#NSData+zlib", - "expected_output": "pkg:cocoapods/GoogleUtilities@7.5.2#NSData+zlib", + "input": "pkg:cocoapods/GoogleUtilities@7.5.2#NSData%2Bzlib", + "expected_output": "pkg:cocoapods/GoogleUtilities@7.5.2#NSData%2Bzlib", "expected_failure": false, "expected_failure_reason": null }, @@ -161,7 +161,7 @@ "qualifiers": null, "subpath": "NSData+zlib" }, - "expected_output": "pkg:cocoapods/GoogleUtilities@7.5.2#NSData+zlib", + "expected_output": "pkg:cocoapods/GoogleUtilities@7.5.2#NSData%2Bzlib", "expected_failure": false, "expected_failure_reason": null } diff --git a/tests/types/oci-test.json b/tests/types/oci-test.json index ccf8332c..5de5faa8 100644 --- a/tests/types/oci-test.json +++ b/tests/types/oci-test.json @@ -5,7 +5,7 @@ "description": "Parse test for PURL", "test_group": "base", "test_type": "parse", - "input": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=docker.io/library/debian&arch=amd64&tag=latest", + "input": "pkg:oci/debian@sha256:244fd47e07d10?repository_url=docker.io/library/debian&arch=amd64&tag=latest", "expected_output": { "type": "oci", "namespace": null, @@ -25,8 +25,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=docker.io/library/debian&arch=amd64&tag=latest", - "expected_output": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=docker.io/library/debian&arch=amd64&tag=latest", + "input": "pkg:oci/debian@sha256:244fd47e07d10?arch=amd64&repository_url=docker.io/library/debian&tag=latest", + "expected_output": "pkg:oci/debian@sha256:244fd47e07d10?arch=amd64&repository_url=docker.io/library/debian&tag=latest", "expected_failure": false, "expected_failure_reason": null }, @@ -46,7 +46,7 @@ }, "subpath": null }, - "expected_output": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=docker.io/library/debian&arch=amd64&tag=latest", + "expected_output": "pkg:oci/debian@sha256:244fd47e07d10?arch=amd64&repository_url=docker.io/library/debian&tag=latest", "expected_failure": false, "expected_failure_reason": null }, @@ -54,7 +54,7 @@ "description": "Parse test for PURL", "test_group": "base", "test_type": "parse", - "input": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", + "input": "pkg:oci/debian@sha256:244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", "expected_output": { "type": "oci", "namespace": null, @@ -73,8 +73,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", - "expected_output": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", + "input": "pkg:oci/debian@sha256:244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", + "expected_output": "pkg:oci/debian@sha256:244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", "expected_failure": false, "expected_failure_reason": null }, @@ -93,7 +93,7 @@ }, "subpath": null }, - "expected_output": "pkg:oci/debian@sha256%3A244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", + "expected_output": "pkg:oci/debian@sha256:244fd47e07d10?repository_url=ghcr.io/debian&tag=bullseye", "expected_failure": false, "expected_failure_reason": null }, @@ -101,7 +101,7 @@ "description": "Parse test for PURL", "test_group": "base", "test_type": "parse", - "input": "pkg:oci/static@sha256%3A244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", + "input": "pkg:oci/static@sha256:244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", "expected_output": { "type": "oci", "namespace": null, @@ -120,8 +120,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:oci/static@sha256%3A244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", - "expected_output": "pkg:oci/static@sha256%3A244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", + "input": "pkg:oci/static@sha256:244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", + "expected_output": "pkg:oci/static@sha256:244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", "expected_failure": false, "expected_failure_reason": null }, @@ -140,7 +140,7 @@ }, "subpath": null }, - "expected_output": "pkg:oci/static@sha256%3A244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", + "expected_output": "pkg:oci/static@sha256:244fd47e07d10?repository_url=gcr.io/distroless/static&tag=latest", "expected_failure": false, "expected_failure_reason": null }, @@ -148,7 +148,7 @@ "description": "Parse test for PURL", "test_group": "base", "test_type": "parse", - "input": "pkg:oci/hello-wasm@sha256%3A244fd47e07d10?tag=v1", + "input": "pkg:oci/hello-wasm@sha256:244fd47e07d10?tag=v1", "expected_output": { "type": "oci", "namespace": null, @@ -166,8 +166,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:oci/hello-wasm@sha256%3A244fd47e07d10?tag=v1", - "expected_output": "pkg:oci/hello-wasm@sha256%3A244fd47e07d10?tag=v1", + "input": "pkg:oci/hello-wasm@sha256:244fd47e07d10?tag=v1", + "expected_output": "pkg:oci/hello-wasm@sha256:244fd47e07d10?tag=v1", "expected_failure": false, "expected_failure_reason": null }, @@ -185,7 +185,7 @@ }, "subpath": null }, - "expected_output": "pkg:oci/hello-wasm@sha256%3A244fd47e07d10?tag=v1", + "expected_output": "pkg:oci/hello-wasm@sha256:244fd47e07d10?tag=v1", "expected_failure": false, "expected_failure_reason": null } diff --git a/tests/types/swid-test.json b/tests/types/swid-test.json index dd942d83..53dc5263 100644 --- a/tests/types/swid-test.json +++ b/tests/types/swid-test.json @@ -5,11 +5,11 @@ "description": "Parse test for PURL", "test_group": "base", "test_type": "parse", - "input": "pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", + "input": "pkg:swid/Acme/example.com/Enterprise%20Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", "expected_output": { "type": "swid", "namespace": "Acme/example.com", - "name": "Enterprise+Server", + "name": "Enterprise Server", "version": "1.0.0", "qualifiers": { "tag_id": "75b8c285-fa7b-485b-b199-4745e3004d0d" @@ -23,8 +23,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", - "expected_output": "pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", + "input": "pkg:swid/Acme/example.com/Enterprise%20Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", + "expected_output": "pkg:swid/Acme/example.com/Enterprise%20Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", "expected_failure": false, "expected_failure_reason": null }, @@ -35,14 +35,14 @@ "input": { "type": "swid", "namespace": "Acme/example.com", - "name": "Enterprise+Server", + "name": "Enterprise Server", "version": "1.0.0", "qualifiers": { "tag_id": "75b8c285-fa7b-485b-b199-4745e3004d0d" }, "subpath": null }, - "expected_output": "pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", + "expected_output": "pkg:swid/Acme/example.com/Enterprise%20Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", "expected_failure": false, "expected_failure_reason": null }, @@ -95,11 +95,11 @@ "description": "Parse test for PURL", "test_group": "base", "test_type": "parse", - "input": "pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", + "input": "pkg:swid/Adobe%20Systems%20Incorporated/Adobe%20InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", "expected_output": { "type": "swid", - "namespace": "Adobe+Systems+Incorporated", - "name": "Adobe+InDesign", + "namespace": "Adobe Systems Incorporated", + "name": "Adobe InDesign", "version": "CC", "qualifiers": { "tag_id": "CreativeCloud-CS6-Win-GM-MUL" @@ -113,8 +113,8 @@ "description": "Rountrip test for PURL", "test_group": "base", "test_type": "roundtrip", - "input": "pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", - "expected_output": "pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", + "input": "pkg:swid/Adobe%20Systems%20Incorporated/Adobe%20InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", + "expected_output": "pkg:swid/Adobe%20Systems%20Incorporated/Adobe%20InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", "expected_failure": false, "expected_failure_reason": null }, @@ -124,15 +124,15 @@ "test_type": "build", "input": { "type": "swid", - "namespace": "Adobe+Systems+Incorporated", - "name": "Adobe+InDesign", + "namespace": "Adobe Systems Incorporated", + "name": "Adobe InDesign", "version": "CC", "qualifiers": { "tag_id": "CreativeCloud-CS6-Win-GM-MUL" }, "subpath": null }, - "expected_output": "pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", + "expected_output": "pkg:swid/Adobe%20Systems%20Incorporated/Adobe%20InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL", "expected_failure": false, "expected_failure_reason": null } diff --git a/types-doc/swid-definition.md b/types-doc/swid-definition.md index 59800db2..c2f2ebc9 100644 --- a/types-doc/swid-definition.md +++ b/types-doc/swid-definition.md @@ -51,9 +51,9 @@ The structure of a PURL for this package type is: ## Examples -- `pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d` +- `pkg:swid/Acme/example.com/Enterprise%20Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d` - `pkg:swid/Fedora@29?tag_id=org.fedoraproject.Fedora-29` -- `pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL` +- `pkg:swid/Adobe%20Systems%20Incorporated/Adobe%20InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL` ## Note diff --git a/types/swid-definition.json b/types/swid-definition.json index 4d26ba98..dc076651 100644 --- a/types/swid-definition.json +++ b/types/swid-definition.json @@ -55,8 +55,8 @@ ], "note": "Use of known qualifiers key/value pairs such as download_url can be used to specify where the package was retrieved from.", "examples": [ - "pkg:swid/Acme/example.com/Enterprise+Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", + "pkg:swid/Acme/example.com/Enterprise%20Server@1.0.0?tag_id=75b8c285-fa7b-485b-b199-4745e3004d0d", "pkg:swid/Fedora@29?tag_id=org.fedoraproject.Fedora-29", - "pkg:swid/Adobe+Systems+Incorporated/Adobe+InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL" + "pkg:swid/Adobe%20Systems%20Incorporated/Adobe%20InDesign@CC?tag_id=CreativeCloud-CS6-Win-GM-MUL" ] }