From 3a8812d1d4fe6df39011be9e699e000e882d4715 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Thu, 24 Oct 2024 13:07:57 +0200 Subject: [PATCH] fix(model): Correctly map `Identifier` namespaces to purl namespaces The purl specification treats everything before the last slash in the string representation of package coordinates as the namespace, and the remainder as the name [1]. Consequently, purl names can never contain slashes, encoded or not. Fixes #8567, fixes #9298. [1]: https://github.com/package-url/purl-spec/pull/176#issuecomment-2419876021 Signed-off-by: Sebastian Schuberth --- model/src/main/kotlin/utils/PurlExtensions.kt | 9 +++- .../funTest/kotlin/VulnerableCodeFunTest.kt | 6 +-- .../synthetic/dep-tree-expected-output.yml | 38 ++++++++--------- .../external-sources-expected-output.yml | 8 ++-- .../synthetic/regular-expected-output.yml | 10 ++--- .../version-resolution-expected-output.yml | 42 +++++++++---------- ...p-with-transitive-deps-expected-output.yml | 22 +++++----- .../project-with-tests-expected-output.yml | 30 ++++++------- .../gomod/submodules-expected-output.yml | 12 +++--- .../gomod/subpkg-expected-output.yml | 8 ++-- ...workspaces-main-module-expected-output.yml | 4 +- .../workspaces-sub-module-expected-output.yml | 8 ++-- .../expected-output-only-lockfile-v1.yml | 10 ++--- .../expected-output-only-lockfile-v2.yml | 2 +- .../expected-output-only-lockfile-v3.yml | 2 +- .../expected-output-project-with-lockfile.yml | 42 +++++++++---------- 16 files changed, 128 insertions(+), 125 deletions(-) diff --git a/model/src/main/kotlin/utils/PurlExtensions.kt b/model/src/main/kotlin/utils/PurlExtensions.kt index 387b50a7776a1..52468d0309cd0 100644 --- a/model/src/main/kotlin/utils/PurlExtensions.kt +++ b/model/src/main/kotlin/utils/PurlExtensions.kt @@ -71,7 +71,14 @@ fun Identifier.getPurlType() = */ @JvmOverloads fun Identifier.toPurl(qualifiers: Map = emptyMap(), subpath: String = "") = - if (this == Identifier.EMPTY) "" else createPurl(getPurlType(), namespace, name, version, qualifiers, subpath) + if (this == Identifier.EMPTY) { + "" + } else { + val combined = "$namespace/$name" + val purlNamespace = combined.substringBeforeLast('/') + val purlName = combined.substringAfterLast('/') + createPurl(getPurlType(), purlNamespace, purlName, version, qualifiers, subpath) + } fun Identifier.toPurl(extras: PurlExtras) = toPurl(extras.qualifiers, extras.subpath) diff --git a/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt b/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt index 0cf2edccf7244..443fdd7924e20 100644 --- a/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt +++ b/plugins/advisors/vulnerable-code/src/funTest/kotlin/VulnerableCodeFunTest.kt @@ -87,11 +87,7 @@ class VulnerableCodeFunTest : WordSpec({ "Vulnerable Go packages" should { "return findings for QUIC" { val vc = VulnerableCodeFactory().create(PluginConfig()) - - // TODO: To work-around issue #9298, this hard-codes the `Identifier` to have a namespace although ORT - // produces Go `Identifier`s without namespaces. This way `toPurl()` produces purl conforming to the - // specification which does treat Go packages as if they had namespaces. - val id = Identifier("Go:github.com/quic-go:quic-go:0.40.0") + val id = Identifier("Go::github.com/quic-go/quic-go:0.40.0") val pkg = Package.EMPTY.copy(id, purl = id.toPurl()) val findings = vc.retrievePackageFindings(setOf(pkg)) diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml index 0fc02342c3b76..73a5d3057e2be 100644 --- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml +++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/dep-tree-expected-output.yml @@ -348,7 +348,7 @@ packages: revision: "v2.0.1" path: "" - id: "Pod::MaterialComponents/AnimationTiming:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FAnimationTiming@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/AnimationTiming@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -379,7 +379,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Availability:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FAvailability@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Availability@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -410,7 +410,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Buttons:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FButtons@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Buttons@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -441,7 +441,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Elevation:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FElevation@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Elevation@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -472,7 +472,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Ink:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FInk@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Ink@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -503,7 +503,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Palettes:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FPalettes@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Palettes@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -534,7 +534,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Ripple:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FRipple@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Ripple@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -565,7 +565,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Shadow:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FShadow@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Shadow@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -596,7 +596,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/ShadowElevations:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FShadowElevations@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/ShadowElevations@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -627,7 +627,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/ShadowLayer:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FShadowLayer@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/ShadowLayer@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -658,7 +658,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/ShapeLibrary:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FShapeLibrary@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/ShapeLibrary@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -689,7 +689,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Shapes:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FShapes@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Shapes@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -720,7 +720,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/TextFields:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FTextFields@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/TextFields@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -751,7 +751,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/Typography:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2FTypography@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/Typography@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -782,7 +782,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/private/Application:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2Fprivate%2FApplication@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/private/Application@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -813,7 +813,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/private/Color:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2Fprivate%2FColor@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/private/Color@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -844,7 +844,7 @@ packages: revision: "v124.2.0" path: "" - id: "Pod::MaterialComponents/private/Math:124.2.0" - purl: "pkg:cocoapods/MaterialComponents%2Fprivate%2FMath@124.2.0" + purl: "pkg:cocoapods/MaterialComponents/private/Math@124.2.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -931,7 +931,7 @@ packages: revision: "3.3.3" path: "" - id: "Pod::PhoneNumberKit/PhoneNumberKitCore:3.3.3" - purl: "pkg:cocoapods/PhoneNumberKit%2FPhoneNumberKitCore@3.3.3" + purl: "pkg:cocoapods/PhoneNumberKit/PhoneNumberKitCore@3.3.3" declared_licenses: - "MIT" declared_licenses_processed: @@ -959,7 +959,7 @@ packages: revision: "3.3.3" path: "" - id: "Pod::PhoneNumberKit/UIKit:3.3.3" - purl: "pkg:cocoapods/PhoneNumberKit%2FUIKit@3.3.3" + purl: "pkg:cocoapods/PhoneNumberKit/UIKit@3.3.3" declared_licenses: - "MIT" declared_licenses_processed: diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml index 1720c1b2d2547..712b26677461b 100644 --- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml +++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/external-sources-expected-output.yml @@ -61,7 +61,7 @@ packages: revision: "3.2.1" path: "" - id: "Pod::AFNetworking/NSURLSession:3.2.1" - purl: "pkg:cocoapods/AFNetworking%2FNSURLSession@3.2.1" + purl: "pkg:cocoapods/AFNetworking/NSURLSession@3.2.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -89,7 +89,7 @@ packages: revision: "3.2.1" path: "" - id: "Pod::AFNetworking/Reachability:3.2.1" - purl: "pkg:cocoapods/AFNetworking%2FReachability@3.2.1" + purl: "pkg:cocoapods/AFNetworking/Reachability@3.2.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -117,7 +117,7 @@ packages: revision: "3.2.1" path: "" - id: "Pod::AFNetworking/Security:3.2.1" - purl: "pkg:cocoapods/AFNetworking%2FSecurity@3.2.1" + purl: "pkg:cocoapods/AFNetworking/Security@3.2.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -145,7 +145,7 @@ packages: revision: "3.2.1" path: "" - id: "Pod::AFNetworking/Serialization:3.2.1" - purl: "pkg:cocoapods/AFNetworking%2FSerialization@3.2.1" + purl: "pkg:cocoapods/AFNetworking/Serialization@3.2.1" declared_licenses: - "MIT" declared_licenses_processed: diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml index ba2d7d2ec0f5c..fdd7bfbb386f5 100644 --- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml +++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/regular-expected-output.yml @@ -150,7 +150,7 @@ packages: revision: "v0.27.3" path: "" - id: "Pod::RestKit/Core:0.27.3" - purl: "pkg:cocoapods/RestKit%2FCore@0.27.3" + purl: "pkg:cocoapods/RestKit/Core@0.27.3" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -181,7 +181,7 @@ packages: revision: "v0.27.3" path: "" - id: "Pod::RestKit/CoreData:0.27.3" - purl: "pkg:cocoapods/RestKit%2FCoreData@0.27.3" + purl: "pkg:cocoapods/RestKit/CoreData@0.27.3" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -212,7 +212,7 @@ packages: revision: "v0.27.3" path: "" - id: "Pod::RestKit/Network:0.27.3" - purl: "pkg:cocoapods/RestKit%2FNetwork@0.27.3" + purl: "pkg:cocoapods/RestKit/Network@0.27.3" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -243,7 +243,7 @@ packages: revision: "v0.27.3" path: "" - id: "Pod::RestKit/ObjectMapping:0.27.3" - purl: "pkg:cocoapods/RestKit%2FObjectMapping@0.27.3" + purl: "pkg:cocoapods/RestKit/ObjectMapping@0.27.3" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -274,7 +274,7 @@ packages: revision: "v0.27.3" path: "" - id: "Pod::RestKit/Support:0.27.3" - purl: "pkg:cocoapods/RestKit%2FSupport@0.27.3" + purl: "pkg:cocoapods/RestKit/Support@0.27.3" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: diff --git a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml index e0bd17ec787f2..8f0a214344ab7 100644 --- a/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml +++ b/plugins/package-managers/cocoapods/src/funTest/assets/projects/synthetic/version-resolution-expected-output.yml @@ -188,7 +188,7 @@ packages: revision: "4.0.1" path: "" - id: "Pod::AFNetworking/NSURLSession:4.0.1" - purl: "pkg:cocoapods/AFNetworking%2FNSURLSession@4.0.1" + purl: "pkg:cocoapods/AFNetworking/NSURLSession@4.0.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -216,7 +216,7 @@ packages: revision: "4.0.1" path: "" - id: "Pod::AFNetworking/Reachability:4.0.1" - purl: "pkg:cocoapods/AFNetworking%2FReachability@4.0.1" + purl: "pkg:cocoapods/AFNetworking/Reachability@4.0.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -244,7 +244,7 @@ packages: revision: "4.0.1" path: "" - id: "Pod::AFNetworking/Security:4.0.1" - purl: "pkg:cocoapods/AFNetworking%2FSecurity@4.0.1" + purl: "pkg:cocoapods/AFNetworking/Security@4.0.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -272,7 +272,7 @@ packages: revision: "4.0.1" path: "" - id: "Pod::AFNetworking/Serialization:4.0.1" - purl: "pkg:cocoapods/AFNetworking%2FSerialization@4.0.1" + purl: "pkg:cocoapods/AFNetworking/Serialization@4.0.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -300,7 +300,7 @@ packages: revision: "4.0.1" path: "" - id: "Pod::AFNetworking/UIKit:4.0.1" - purl: "pkg:cocoapods/AFNetworking%2FUIKit@4.0.1" + purl: "pkg:cocoapods/AFNetworking/UIKit@4.0.1" declared_licenses: - "MIT" declared_licenses_processed: @@ -534,7 +534,7 @@ packages: revision: "1.6.26" path: "" - id: "Pod::DTCoreText/Core:1.6.26" - purl: "pkg:cocoapods/DTCoreText%2FCore@1.6.26" + purl: "pkg:cocoapods/DTCoreText/Core@1.6.26" declared_licenses: - "BSD" declared_licenses_processed: @@ -564,7 +564,7 @@ packages: revision: "1.6.26" path: "" - id: "Pod::DTFoundation/Core:1.7.18" - purl: "pkg:cocoapods/DTFoundation%2FCore@1.7.18" + purl: "pkg:cocoapods/DTFoundation/Core@1.7.18" declared_licenses: - "BSD" declared_licenses_processed: @@ -594,7 +594,7 @@ packages: revision: "1.7.18" path: "" - id: "Pod::DTFoundation/DTAnimatedGIF:1.7.18" - purl: "pkg:cocoapods/DTFoundation%2FDTAnimatedGIF@1.7.18" + purl: "pkg:cocoapods/DTFoundation/DTAnimatedGIF@1.7.18" declared_licenses: - "BSD" declared_licenses_processed: @@ -624,7 +624,7 @@ packages: revision: "1.7.18" path: "" - id: "Pod::DTFoundation/DTHTMLParser:1.7.18" - purl: "pkg:cocoapods/DTFoundation%2FDTHTMLParser@1.7.18" + purl: "pkg:cocoapods/DTFoundation/DTHTMLParser@1.7.18" declared_licenses: - "BSD" declared_licenses_processed: @@ -654,7 +654,7 @@ packages: revision: "1.7.18" path: "" - id: "Pod::DTFoundation/UIKit:1.7.18" - purl: "pkg:cocoapods/DTFoundation%2FUIKit@1.7.18" + purl: "pkg:cocoapods/DTFoundation/UIKit@1.7.18" declared_licenses: - "BSD" declared_licenses_processed: @@ -801,7 +801,7 @@ packages: revision: "6.6.0" path: "" - id: "Pod::GBDeviceInfo/Core:6.6.0" - purl: "pkg:cocoapods/GBDeviceInfo%2FCore@6.6.0" + purl: "pkg:cocoapods/GBDeviceInfo/Core@6.6.0" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -1100,7 +1100,7 @@ packages: revision: "v0.23.18" path: "" - id: "Pod::MatrixSDK/Core:0.23.18" - purl: "pkg:cocoapods/MatrixSDK%2FCore@0.23.18" + purl: "pkg:cocoapods/MatrixSDK/Core@0.23.18" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -1130,7 +1130,7 @@ packages: revision: "v0.23.18" path: "" - id: "Pod::MatrixSDK/CryptoSDK:0.23.18" - purl: "pkg:cocoapods/MatrixSDK%2FCryptoSDK@0.23.18" + purl: "pkg:cocoapods/MatrixSDK/CryptoSDK@0.23.18" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -1160,7 +1160,7 @@ packages: revision: "v0.23.18" path: "" - id: "Pod::MatrixSDK/JingleCallStack:0.23.18" - purl: "pkg:cocoapods/MatrixSDK%2FJingleCallStack@0.23.18" + purl: "pkg:cocoapods/MatrixSDK/JingleCallStack@0.23.18" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -1250,7 +1250,7 @@ packages: revision: "3.2.12" path: "" - id: "Pod::OLMKit/olmc:3.2.12" - purl: "pkg:cocoapods/OLMKit%2Folmc@3.2.12" + purl: "pkg:cocoapods/OLMKit/olmc@3.2.12" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -1280,7 +1280,7 @@ packages: revision: "3.2.12" path: "" - id: "Pod::OLMKit/olmcpp:3.2.12" - purl: "pkg:cocoapods/OLMKit%2Folmcpp@3.2.12" + purl: "pkg:cocoapods/OLMKit/olmcpp@3.2.12" declared_licenses: - "Apache License, Version 2.0" declared_licenses_processed: @@ -1398,7 +1398,7 @@ packages: revision: "v10.27.0" path: "" - id: "Pod::Realm/Headers:10.27.0" - purl: "pkg:cocoapods/Realm%2FHeaders@10.27.0" + purl: "pkg:cocoapods/Realm/Headers@10.27.0" declared_licenses: - "Apache 2.0" declared_licenses_processed: @@ -1458,7 +1458,7 @@ packages: revision: "4.1.2" path: "" - id: "Pod::Reusable/Storyboard:4.1.2" - purl: "pkg:cocoapods/Reusable%2FStoryboard@4.1.2" + purl: "pkg:cocoapods/Reusable/Storyboard@4.1.2" declared_licenses: - "MIT" declared_licenses_processed: @@ -1487,7 +1487,7 @@ packages: revision: "4.1.2" path: "" - id: "Pod::Reusable/View:4.1.2" - purl: "pkg:cocoapods/Reusable%2FView@4.1.2" + purl: "pkg:cocoapods/Reusable/View@4.1.2" declared_licenses: - "MIT" declared_licenses_processed: @@ -1546,7 +1546,7 @@ packages: revision: "7.15.0" path: "" - id: "Pod::Sentry/Core:7.15.0" - purl: "pkg:cocoapods/Sentry%2FCore@7.15.0" + purl: "pkg:cocoapods/Sentry/Core@7.15.0" declared_licenses: - "mit" declared_licenses_processed: @@ -1863,7 +1863,7 @@ packages: revision: "3.6.5" path: "" - id: "Pod::ZXingObjC/All:3.6.5" - purl: "pkg:cocoapods/ZXingObjC%2FAll@3.6.5" + purl: "pkg:cocoapods/ZXingObjC/All@3.6.5" declared_licenses: - "Apache License 2.0" declared_licenses_processed: diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml index 7753bbdd2a80c..9f9c0b84ad987 100644 --- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml +++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/go-as-dep-with-transitive-deps-expected-output.yml @@ -92,7 +92,7 @@ project: linkage: "PROJECT_STATIC" packages: - id: "Go::github.com/golang/snappy:0.0.1" - purl: "pkg:golang/github.com%2Fgolang%2Fsnappy@0.0.1" + purl: "pkg:golang/github.com/golang/snappy@0.0.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -118,7 +118,7 @@ packages: revision: "2a8bb927dd31d8daada140a5d09578521ce5c36a" path: "" - id: "Go::github.com/klauspost/compress:1.13.6" - purl: "pkg:golang/github.com%2Fklauspost%2Fcompress@1.13.6" + purl: "pkg:golang/github.com/klauspost/compress@1.13.6" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -144,7 +144,7 @@ packages: revision: "38d4ba985ac157cb858763e016645e14e74c13c4" path: "" - id: "Go::github.com/montanaflynn/stats:0.0.0-20171201202039-1bf9dbcd8cbe" - purl: "pkg:golang/github.com%2Fmontanaflynn%2Fstats@0.0.0-20171201202039-1bf9dbcd8cbe" + purl: "pkg:golang/github.com/montanaflynn/stats@0.0.0-20171201202039-1bf9dbcd8cbe" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -170,7 +170,7 @@ packages: revision: "1bf9dbcd8cbe1fdb75add3785b1d4a9a646269ab" path: "" - id: "Go::github.com/xdg-go/pbkdf2:1.0.0" - purl: "pkg:golang/github.com%2Fxdg-go%2Fpbkdf2@1.0.0" + purl: "pkg:golang/github.com/xdg-go/pbkdf2@1.0.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -196,7 +196,7 @@ packages: revision: "7f452ef1dac88350356f1bb84a23748205e64b96" path: "" - id: "Go::github.com/xdg-go/scram:1.1.2" - purl: "pkg:golang/github.com%2Fxdg-go%2Fscram@1.1.2" + purl: "pkg:golang/github.com/xdg-go/scram@1.1.2" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -222,7 +222,7 @@ packages: revision: "17629a50d5ce12875d83f9095809ae43b765c303" path: "" - id: "Go::github.com/xdg-go/stringprep:1.0.4" - purl: "pkg:golang/github.com%2Fxdg-go%2Fstringprep@1.0.4" + purl: "pkg:golang/github.com/xdg-go/stringprep@1.0.4" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -248,7 +248,7 @@ packages: revision: "dabf77401b04b57597914595d170883092e0df3c" path: "" - id: "Go::github.com/youmark/pkcs8:0.0.0-20181117223130-1be2e3e5546d" - purl: "pkg:golang/github.com%2Fyoumark%2Fpkcs8@0.0.0-20181117223130-1be2e3e5546d" + purl: "pkg:golang/github.com/youmark/pkcs8@0.0.0-20181117223130-1be2e3e5546d" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -274,7 +274,7 @@ packages: revision: "1be2e3e5546da8a58903ff4adcfab015022538ea" path: "" - id: "Go::go.mongodb.org/mongo-driver:1.12.0" - purl: "pkg:golang/go.mongodb.org%2Fmongo-driver@1.12.0" + purl: "pkg:golang/go.mongodb.org/mongo-driver@1.12.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -300,7 +300,7 @@ packages: revision: "e113d80138eabfce810c6369d25e57b146aac917" path: "" - id: "Go::golang.org/x/crypto:0.0.0-20220622213112-05595931fe9d" - purl: "pkg:golang/golang.org%2Fx%2Fcrypto@0.0.0-20220622213112-05595931fe9d" + purl: "pkg:golang/golang.org/x/crypto@0.0.0-20220622213112-05595931fe9d" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -326,7 +326,7 @@ packages: revision: "05595931fe9d3f8894ab063e1981d28e9873e2cb" path: "" - id: "Go::golang.org/x/sync:0.0.0-20220722155255-886fb9371eb4" - purl: "pkg:golang/golang.org%2Fx%2Fsync@0.0.0-20220722155255-886fb9371eb4" + purl: "pkg:golang/golang.org/x/sync@0.0.0-20220722155255-886fb9371eb4" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -352,7 +352,7 @@ packages: revision: "886fb9371eb4b47af10bff9c8025a8c9e1554b92" path: "" - id: "Go::golang.org/x/text:0.7.0" - purl: "pkg:golang/golang.org%2Fx%2Ftext@0.7.0" + purl: "pkg:golang/golang.org/x/text@0.7.0" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml index 9f68ae9465c41..5ab21eefd8883 100644 --- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml +++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/project-with-tests-expected-output.yml @@ -119,7 +119,7 @@ project: linkage: "PROJECT_STATIC" packages: - id: "Go::github.com/atomtree/go-spew:1.1.0" - purl: "pkg:golang/github.com%2Fatomtree%2Fgo-spew@1.1.0" + purl: "pkg:golang/github.com/atomtree/go-spew@1.1.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -145,7 +145,7 @@ packages: revision: "346938d642f2ec3594ed81d874461961cd0faa76" path: "" - id: "Go::github.com/fatih/color:1.13.0" - purl: "pkg:golang/github.com%2Ffatih%2Fcolor@1.13.0" + purl: "pkg:golang/github.com/fatih/color@1.13.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -171,7 +171,7 @@ packages: revision: "a05da93ebe62ca9fc6791d3376ec4dad01196448" path: "" - id: "Go::github.com/google/uuid:1.0.0" - purl: "pkg:golang/github.com%2Fgoogle%2Fuuid@1.0.0" + purl: "pkg:golang/github.com/google/uuid@1.0.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -197,7 +197,7 @@ packages: revision: "d460ce9f8df2e77fb1ba55ca87fafed96c607494" path: "" - id: "Go::github.com/hashicorp/go-secure-stdlib/parseutil:0.1.6" - purl: "pkg:golang/github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fparseutil@0.1.6" + purl: "pkg:golang/github.com/hashicorp/go-secure-stdlib/parseutil@0.1.6" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -223,7 +223,7 @@ packages: revision: "43c607d97e1d4615c5140017131807d1f0b702ff" path: "parseutil" - id: "Go::github.com/hashicorp/go-secure-stdlib/strutil:0.1.1" - purl: "pkg:golang/github.com%2Fhashicorp%2Fgo-secure-stdlib%2Fstrutil@0.1.1" + purl: "pkg:golang/github.com/hashicorp/go-secure-stdlib/strutil@0.1.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -249,7 +249,7 @@ packages: revision: "1b80d53b4662d4b15ea0c23754dd81e3ae21d58b" path: "strutil" - id: "Go::github.com/hashicorp/go-sockaddr:1.0.2" - purl: "pkg:golang/github.com%2Fhashicorp%2Fgo-sockaddr@1.0.2" + purl: "pkg:golang/github.com/hashicorp/go-sockaddr@1.0.2" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -275,7 +275,7 @@ packages: revision: "c7188e74f6acae5a989bdc959aa779f8b9f42faf" path: "" - id: "Go::github.com/mattn/go-colorable:0.1.12" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-colorable@0.1.12" + purl: "pkg:golang/github.com/mattn/go-colorable@0.1.12" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -301,7 +301,7 @@ packages: revision: "e1bb79c8d53c38a60962ad4b8f658226cc983710" path: "" - id: "Go::github.com/mattn/go-isatty:0.0.14" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-isatty@0.0.14" + purl: "pkg:golang/github.com/mattn/go-isatty@0.0.14" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -327,7 +327,7 @@ packages: revision: "504425e14f742f1f517c4586048b49b37f829c8e" path: "" - id: "Go::github.com/mitchellh/mapstructure:1.4.1" - purl: "pkg:golang/github.com%2Fmitchellh%2Fmapstructure@1.4.1" + purl: "pkg:golang/github.com/mitchellh/mapstructure@1.4.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -353,7 +353,7 @@ packages: revision: "8ebf2d61a8b4adcce25fc9fc9b76e8452a00672f" path: "" - id: "Go::github.com/pborman/uuid:1.2.1" - purl: "pkg:golang/github.com%2Fpborman%2Fuuid@1.2.1" + purl: "pkg:golang/github.com/pborman/uuid@1.2.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -379,7 +379,7 @@ packages: revision: "5b6091a6a160ee5ce12917b21ab96acec2a4fdc0" path: "" - id: "Go::github.com/pmezard/go-difflib:1.0.0" - purl: "pkg:golang/github.com%2Fpmezard%2Fgo-difflib@1.0.0" + purl: "pkg:golang/github.com/pmezard/go-difflib@1.0.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -405,7 +405,7 @@ packages: revision: "792786c7400a136282c1664665ae0a8db921c6c2" path: "" - id: "Go::github.com/ryanuber/go-glob:1.0.0" - purl: "pkg:golang/github.com%2Fryanuber%2Fgo-glob@1.0.0" + purl: "pkg:golang/github.com/ryanuber/go-glob@1.0.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -431,7 +431,7 @@ packages: revision: "51a8f68e6c24dc43f1e371749c89a267de4ebc53" path: "" - id: "Go::github.com/stretchr/testify:1.7.2" - purl: "pkg:golang/github.com%2Fstretchr%2Ftestify@1.7.2" + purl: "pkg:golang/github.com/stretchr/testify@1.7.2" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -457,7 +457,7 @@ packages: revision: "41453c009af9a942261b7a25a88521d0d6804e7f" path: "" - id: "Go::golang.org/x/sys:0.0.0-20220610221304-9f5ed59c137d" - purl: "pkg:golang/golang.org%2Fx%2Fsys@0.0.0-20220610221304-9f5ed59c137d" + purl: "pkg:golang/golang.org/x/sys@0.0.0-20220610221304-9f5ed59c137d" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -483,7 +483,7 @@ packages: revision: "9f5ed59c137dcb0852024edd2e71af63c2d67707" path: "" - id: "Go::gopkg.in/yaml.v3:3.0.1" - purl: "pkg:golang/gopkg.in%2Fyaml.v3@3.0.1" + purl: "pkg:golang/gopkg.in/yaml.v3@3.0.1" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml index 3cdfaea58438c..1ebf6e144e3d3 100644 --- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml +++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/submodules-expected-output.yml @@ -108,7 +108,7 @@ projects: linkage: "PROJECT_STATIC" packages: - id: "Go::github.com/fatih/color:1.15.0" - purl: "pkg:golang/github.com%2Ffatih%2Fcolor@1.15.0" + purl: "pkg:golang/github.com/fatih/color@1.15.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -134,7 +134,7 @@ packages: revision: "12126ed593697635c525b302836b292b657ea573" path: "" - id: "Go::github.com/google/uuid:1.0.0" - purl: "pkg:golang/github.com%2Fgoogle%2Fuuid@1.0.0" + purl: "pkg:golang/github.com/google/uuid@1.0.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -160,7 +160,7 @@ packages: revision: "d460ce9f8df2e77fb1ba55ca87fafed96c607494" path: "" - id: "Go::github.com/mattn/go-colorable:0.1.13" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-colorable@0.1.13" + purl: "pkg:golang/github.com/mattn/go-colorable@0.1.13" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -186,7 +186,7 @@ packages: revision: "11a925cff3d38c293ddc8c05a16b504e3e2c63be" path: "" - id: "Go::github.com/mattn/go-isatty:0.0.17" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-isatty@0.0.17" + purl: "pkg:golang/github.com/mattn/go-isatty@0.0.17" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -212,7 +212,7 @@ packages: revision: "ed75e619dc0f0489fd4062163a7d061eaa249b9c" path: "" - id: "Go::github.com/pborman/uuid:1.2.1" - purl: "pkg:golang/github.com%2Fpborman%2Fuuid@1.2.1" + purl: "pkg:golang/github.com/pborman/uuid@1.2.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -238,7 +238,7 @@ packages: revision: "5b6091a6a160ee5ce12917b21ab96acec2a4fdc0" path: "" - id: "Go::golang.org/x/sys:0.6.0" - purl: "pkg:golang/golang.org%2Fx%2Fsys@0.6.0" + purl: "pkg:golang/golang.org/x/sys@0.6.0" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml index d4ba7e6d4deca..3f7d8a446da52 100644 --- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml +++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/subpkg-expected-output.yml @@ -26,7 +26,7 @@ project: linkage: "PROJECT_STATIC" packages: - id: "Go::github.com/fatih/color:1.7.0" - purl: "pkg:golang/github.com%2Ffatih%2Fcolor@1.7.0" + purl: "pkg:golang/github.com/fatih/color@1.7.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -52,7 +52,7 @@ packages: revision: "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" path: "" - id: "Go::github.com/mattn/go-colorable:0.1.4" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-colorable@0.1.4" + purl: "pkg:golang/github.com/mattn/go-colorable@0.1.4" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -78,7 +78,7 @@ packages: revision: "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1" path: "" - id: "Go::github.com/mattn/go-isatty:0.0.10" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-isatty@0.0.10" + purl: "pkg:golang/github.com/mattn/go-isatty@0.0.10" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -104,7 +104,7 @@ packages: revision: "88ba11cfdc67c7588b30042edf244b2875f892b6" path: "" - id: "Go::golang.org/x/sys:0.0.0-20191008105621-543471e840be" - purl: "pkg:golang/golang.org%2Fx%2Fsys@0.0.0-20191008105621-543471e840be" + purl: "pkg:golang/golang.org/x/sys@0.0.0-20191008105621-543471e840be" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml index b342e3154e10f..5c7cc7e68e3fc 100644 --- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml +++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-main-module-expected-output.yml @@ -32,7 +32,7 @@ project: linkage: "PROJECT_STATIC" packages: - id: "Go::github.com/google/uuid:1.0.0" - purl: "pkg:golang/github.com%2Fgoogle%2Fuuid@1.0.0" + purl: "pkg:golang/github.com/google/uuid@1.0.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -58,7 +58,7 @@ packages: revision: "d460ce9f8df2e77fb1ba55ca87fafed96c607494" path: "" - id: "Go::github.com/pborman/uuid:1.2.1" - purl: "pkg:golang/github.com%2Fpborman%2Fuuid@1.2.1" + purl: "pkg:golang/github.com/pborman/uuid@1.2.1" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml index c11bcb8aa61a9..82de16e0b09d7 100644 --- a/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml +++ b/plugins/package-managers/go/src/funTest/assets/projects/synthetic/gomod/workspaces-sub-module-expected-output.yml @@ -58,7 +58,7 @@ project: linkage: "PROJECT_STATIC" packages: - id: "Go::github.com/fatih/color:1.13.0" - purl: "pkg:golang/github.com%2Ffatih%2Fcolor@1.13.0" + purl: "pkg:golang/github.com/fatih/color@1.13.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -84,7 +84,7 @@ packages: revision: "a05da93ebe62ca9fc6791d3376ec4dad01196448" path: "" - id: "Go::github.com/mattn/go-colorable:0.1.12" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-colorable@0.1.12" + purl: "pkg:golang/github.com/mattn/go-colorable@0.1.12" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -110,7 +110,7 @@ packages: revision: "e1bb79c8d53c38a60962ad4b8f658226cc983710" path: "" - id: "Go::github.com/mattn/go-isatty:0.0.14" - purl: "pkg:golang/github.com%2Fmattn%2Fgo-isatty@0.0.14" + purl: "pkg:golang/github.com/mattn/go-isatty@0.0.14" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -136,7 +136,7 @@ packages: revision: "504425e14f742f1f517c4586048b49b37f829c8e" path: "" - id: "Go::golang.org/x/sys:0.0.0-20220610221304-9f5ed59c137d" - purl: "pkg:golang/golang.org%2Fx%2Fsys@0.0.0-20220610221304-9f5ed59c137d" + purl: "pkg:golang/golang.org/x/sys@0.0.0-20220610221304-9f5ed59c137d" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml index 9ebd3e148325a..ebbfed4fc3812 100644 --- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml +++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v1.yml @@ -25,7 +25,7 @@ project: - id: "Swift::github.com/grpc/grpc-swift:revision-efb67a324eaf1696b50e66bc471a53690e41fbf6" packages: - id: "Swift::github.com/apple/swift-argument-parser:0.2.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-argument-parser@0.2.0" + purl: "pkg:swift/github.com/apple/swift-argument-parser@0.2.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -51,7 +51,7 @@ packages: revision: "eb51f949cdd0c9d88abba9ce79d37eb7ea1231d0" path: "" - id: "Swift::github.com/apple/swift-crypto:" - purl: "pkg:swift/github.com%2Fapple%2Fswift-crypto" + purl: "pkg:swift/github.com/apple/swift-crypto" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -77,7 +77,7 @@ packages: revision: "" path: "" - id: "Swift::github.com/apple/swift-llbuild:9.0.8" - purl: "pkg:swift/github.com%2Fapple%2Fswift-llbuild@9.0.8" + purl: "pkg:swift/github.com/apple/swift-llbuild@9.0.8" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -103,7 +103,7 @@ packages: revision: "" path: "" - id: "Swift::github.com/braze-inc/braze-ios-sdk:branch-master" - purl: "pkg:swift/github.com%2Fbraze-inc%2Fbraze-ios-sdk@branch-master" + purl: "pkg:swift/github.com/braze-inc/braze-ios-sdk@branch-master" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -129,7 +129,7 @@ packages: revision: "" path: "" - id: "Swift::github.com/grpc/grpc-swift:revision-efb67a324eaf1696b50e66bc471a53690e41fbf6" - purl: "pkg:swift/github.com%2Fgrpc%2Fgrpc-swift@revision-efb67a324eaf1696b50e66bc471a53690e41fbf6" + purl: "pkg:swift/github.com/grpc/grpc-swift@revision-efb67a324eaf1696b50e66bc471a53690e41fbf6" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml index eaab929f0fc44..f78abee330780 100644 --- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml +++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v2.yml @@ -21,7 +21,7 @@ project: - id: "Swift::github.com/alamofire/alamofire:5.4.4" packages: - id: "Swift::github.com/alamofire/alamofire:5.4.4" - purl: "pkg:swift/github.com%2Falamofire%2Falamofire@5.4.4" + purl: "pkg:swift/github.com/alamofire/alamofire@5.4.4" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml index a14c4de07fbf3..a6fc01909ab36 100644 --- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml +++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-only-lockfile-v3.yml @@ -21,7 +21,7 @@ project: - id: "Swift::github.com/alamofire/alamofire:5.4.4" packages: - id: "Swift::github.com/alamofire/alamofire:5.4.4" - purl: "pkg:swift/github.com%2Falamofire%2Falamofire@5.4.4" + purl: "pkg:swift/github.com/alamofire/alamofire@5.4.4" declared_licenses: [] declared_licenses_processed: {} description: "" diff --git a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml index 27712721d5848..a99484d8780eb 100644 --- a/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml +++ b/plugins/package-managers/swiftpm/src/funTest/assets/projects/synthetic/expected-output-project-with-lockfile.yml @@ -181,7 +181,7 @@ project: - id: "Swift::github.com/apple/swift-system:1.2.1" packages: - id: "Swift::github.com/apple/swift-algorithms:1.2.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-algorithms@1.2.0" + purl: "pkg:swift/github.com/apple/swift-algorithms@1.2.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -207,7 +207,7 @@ packages: revision: "f6919dfc309e7f1b56224378b11e28bab5bccc42" path: "" - id: "Swift::github.com/apple/swift-atomics:1.2.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-atomics@1.2.0" + purl: "pkg:swift/github.com/apple/swift-atomics@1.2.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -233,7 +233,7 @@ packages: revision: "cd142fd2f64be2100422d658e7411e39489da985" path: "" - id: "Swift::github.com/apple/swift-collections:1.0.6" - purl: "pkg:swift/github.com%2Fapple%2Fswift-collections@1.0.6" + purl: "pkg:swift/github.com/apple/swift-collections@1.0.6" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -259,7 +259,7 @@ packages: revision: "d029d9d39c87bed85b1c50adee7c41795261a192" path: "" - id: "Swift::github.com/apple/swift-crypto:2.6.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-crypto@2.6.0" + purl: "pkg:swift/github.com/apple/swift-crypto@2.6.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -285,7 +285,7 @@ packages: revision: "60f13f60c4d093691934dc6cfdf5f508ada1f894" path: "" - id: "Swift::github.com/apple/swift-http-types:1.0.3" - purl: "pkg:swift/github.com%2Fapple%2Fswift-http-types@1.0.3" + purl: "pkg:swift/github.com/apple/swift-http-types@1.0.3" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -311,7 +311,7 @@ packages: revision: "12358d55a3824bd5fed310b999ea8cf83a9a1a65" path: "" - id: "Swift::github.com/apple/swift-log:1.5.4" - purl: "pkg:swift/github.com%2Fapple%2Fswift-log@1.5.4" + purl: "pkg:swift/github.com/apple/swift-log@1.5.4" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -337,7 +337,7 @@ packages: revision: "e97a6fcb1ab07462881ac165fdbb37f067e205d5" path: "" - id: "Swift::github.com/apple/swift-metrics:2.4.1" - purl: "pkg:swift/github.com%2Fapple%2Fswift-metrics@2.4.1" + purl: "pkg:swift/github.com/apple/swift-metrics@2.4.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -363,7 +363,7 @@ packages: revision: "971ba26378ab69c43737ee7ba967a896cb74c0d1" path: "" - id: "Swift::github.com/apple/swift-nio:2.63.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-nio@2.63.0" + purl: "pkg:swift/github.com/apple/swift-nio@2.63.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -389,7 +389,7 @@ packages: revision: "635b2589494c97e48c62514bc8b37ced762e0a62" path: "" - id: "Swift::github.com/apple/swift-nio-extras:1.21.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-nio-extras@1.21.0" + purl: "pkg:swift/github.com/apple/swift-nio-extras@1.21.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -415,7 +415,7 @@ packages: revision: "363da63c1966405764f380c627409b2f9d9e710b" path: "" - id: "Swift::github.com/apple/swift-nio-http2:1.30.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-nio-http2@1.30.0" + purl: "pkg:swift/github.com/apple/swift-nio-http2@1.30.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -441,7 +441,7 @@ packages: revision: "0904bf0feb5122b7e5c3f15db7df0eabe623dd87" path: "" - id: "Swift::github.com/apple/swift-nio-ssl:2.26.0" - purl: "pkg:swift/github.com%2Fapple%2Fswift-nio-ssl@2.26.0" + purl: "pkg:swift/github.com/apple/swift-nio-ssl@2.26.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -467,7 +467,7 @@ packages: revision: "7c381eb6083542b124a6c18fae742f55001dc2b5" path: "" - id: "Swift::github.com/apple/swift-nio-transport-services:1.20.1" - purl: "pkg:swift/github.com%2Fapple%2Fswift-nio-transport-services@1.20.1" + purl: "pkg:swift/github.com/apple/swift-nio-transport-services@1.20.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -493,7 +493,7 @@ packages: revision: "6cbe0ed2b394f21ab0d46b9f0c50c6be964968ce" path: "" - id: "Swift::github.com/apple/swift-numerics:1.0.2" - purl: "pkg:swift/github.com%2Fapple%2Fswift-numerics@1.0.2" + purl: "pkg:swift/github.com/apple/swift-numerics@1.0.2" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -519,7 +519,7 @@ packages: revision: "0a5bc04095a675662cf24757cc0640aa2204253b" path: "" - id: "Swift::github.com/apple/swift-system:1.2.1" - purl: "pkg:swift/github.com%2Fapple%2Fswift-system@1.2.1" + purl: "pkg:swift/github.com/apple/swift-system@1.2.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -545,7 +545,7 @@ packages: revision: "025bcb1165deab2e20d4eaba79967ce73013f496" path: "" - id: "Swift::github.com/swift-server/async-http-client:1.20.1" - purl: "pkg:swift/github.com%2Fswift-server%2Fasync-http-client@1.20.1" + purl: "pkg:swift/github.com/swift-server/async-http-client@1.20.1" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -571,7 +571,7 @@ packages: revision: "291438696abdd48d2a83b52465c176efbd94512b" path: "" - id: "Swift::github.com/swift-server/swift-backtrace:1.3.4" - purl: "pkg:swift/github.com%2Fswift-server%2Fswift-backtrace@1.3.4" + purl: "pkg:swift/github.com/swift-server/swift-backtrace@1.3.4" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -597,7 +597,7 @@ packages: revision: "80746bdd0ac8a7d83aad5d89dac3cbf15de652e6" path: "" - id: "Swift::github.com/vapor/async-kit:1.19.0" - purl: "pkg:swift/github.com%2Fvapor%2Fasync-kit@1.19.0" + purl: "pkg:swift/github.com/vapor/async-kit@1.19.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -623,7 +623,7 @@ packages: revision: "7ece208cd401687641c88367a00e3ea2b04311f1" path: "" - id: "Swift::github.com/vapor/console-kit:revision-a31f44ebfbd15a2cc0fda705279676773ac16355" - purl: "pkg:swift/github.com%2Fvapor%2Fconsole-kit@revision-a31f44ebfbd15a2cc0fda705279676773ac16355" + purl: "pkg:swift/github.com/vapor/console-kit@revision-a31f44ebfbd15a2cc0fda705279676773ac16355" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -649,7 +649,7 @@ packages: revision: "a31f44ebfbd15a2cc0fda705279676773ac16355" path: "" - id: "Swift::github.com/vapor/multipart-kit:4.6.0" - purl: "pkg:swift/github.com%2Fvapor%2Fmultipart-kit@4.6.0" + purl: "pkg:swift/github.com/vapor/multipart-kit@4.6.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -675,7 +675,7 @@ packages: revision: "12ee56f25bd3fc4c2d09c2aa16e69de61dc786e8" path: "" - id: "Swift::github.com/vapor/routing-kit:4.9.0" - purl: "pkg:swift/github.com%2Fvapor%2Frouting-kit@4.9.0" + purl: "pkg:swift/github.com/vapor/routing-kit@4.9.0" declared_licenses: [] declared_licenses_processed: {} description: "" @@ -701,7 +701,7 @@ packages: revision: "2a92a7eac411a82fb3a03731be5e76773ebe1b3e" path: "" - id: "Swift::github.com/vapor/websocket-kit:2.14.0" - purl: "pkg:swift/github.com%2Fvapor%2Fwebsocket-kit@2.14.0" + purl: "pkg:swift/github.com/vapor/websocket-kit@2.14.0" declared_licenses: [] declared_licenses_processed: {} description: ""