Remove MetadataType from core package object and normalize JSON metadataType values (#1983)

* [wip] Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * distinct the package metadata functions Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * remove metadata type from package core model Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * incorporate review feedback for names Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add RPM archive metadata and split parser helpers Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * clarify the python package metadata type Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * rename the KB metadata type Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * break hackage and composer types by use case Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * linting fix Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix encoding and decoding for syft-json and cyclonedx Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * bump json schema to 11 Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update cyclonedx-json snapshots Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update cyclonedx-xml snapshots Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update spdx-json snapshots Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update spdx-tv snapshots Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update syft-json snapshots Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * correct metadata type in stack yaml parser test Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix bom-ref redactor for cyclonedx-xml Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add tests for legacy package metadata names Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * regenerate json schema v11 Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix legacy HackageMetadataType reflect type value check Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix linting Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * packagemetadata discovery should account for type shadowing Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix linting Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix cli tests Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * bump json schema version to v12 Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update json schema to incorporate changes from main Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add syft-json legacy config option Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add tests around v11-v12 json decoding Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add docs for SYFT_JSON_LEGACY Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * rename structs to be compliant with new naming scheme Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> --------- Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
2026-11-02 23:46:35 +01:00 · 2023-10-30 12:12:04 -04:00
parent f442586ec9
commit 1aaa644007
261 changed files with 7010 additions and 4040 deletions
@@ -10,14 +10,13 @@ import (

 func newSwiftPackageManagerPackage(name, version, sourceURL, revision string, locations ...file.Location) pkg.Package {
 	p := pkg.Package{
-		Name:         name,
-		Version:      version,
-		PURL:         swiftPackageManagerPackageURL(name, version, sourceURL),
-		Locations:    file.NewLocationSet(locations...),
-		Type:         pkg.SwiftPkg,
-		Language:     pkg.Swift,
-		MetadataType: pkg.SwiftPackageManagerMetadataType,
-		Metadata: pkg.SwiftPackageManagerMetadata{
+		Name:      name,
+		Version:   version,
+		PURL:      swiftPackageManagerPackageURL(name, version, sourceURL),
+		Locations: file.NewLocationSet(locations...),
+		Type:      pkg.SwiftPkg,
+		Language:  pkg.Swift,
+		Metadata: pkg.SwiftPackageManagerResolvedEntry{
 			Revision: revision,
 		},
 	}
@@ -29,14 +28,13 @@ func newSwiftPackageManagerPackage(name, version, sourceURL, revision string, lo

 func newCocoaPodsPackage(name, version, hash string, locations ...file.Location) pkg.Package {
 	p := pkg.Package{
-		Name:         name,
-		Version:      version,
-		PURL:         cocoaPodsPackageURL(name, version),
-		Locations:    file.NewLocationSet(locations...),
-		Type:         pkg.CocoapodsPkg,
-		Language:     pkg.Swift,
-		MetadataType: pkg.CocoapodsMetadataType,
-		Metadata: pkg.CocoapodsMetadata{
+		Name:      name,
+		Version:   version,
+		PURL:      cocoaPodsPackageURL(name, version),
+		Locations: file.NewLocationSet(locations...),
+		Type:      pkg.CocoapodsPkg,
+		Language:  pkg.Swift,
+		Metadata: pkg.CocoaPodfileLockEntry{
 			Checksum: hash,
 		},
 	}
@@ -84,14 +84,14 @@ func parsePackageResolved(_ file.Resolver, _ *generic.Environment, reader file.L
 	}

 	var pkgs []pkg.Package
-	for _, packagePin := range pins {
+	for _, pkgPin := range pins {
 		pkgs = append(
 			pkgs,
 			newSwiftPackageManagerPackage(
-				packagePin.Identity,
-				packagePin.Version,
-				packagePin.Location,
-				packagePin.Revision,
+				pkgPin.Identity,
+				pkgPin.Version,
+				pkgPin.Location,
+				pkgPin.Revision,
 				reader.Location.WithAnnotation(pkg.EvidenceAnnotationKey, pkg.PrimaryEvidenceAnnotation),
 			),
 		)
@@ -18,62 +18,57 @@ func TestParsePackageResolved(t *testing.T) {
 	locations := file.NewLocationSet(file.NewLocation(fixture))
 	expectedPkgs := []pkg.Package{
 		{
-			Name:         "swift-algorithms",
-			Version:      "1.0.0",
-			PURL:         "pkg:swift/github.com/apple/swift-algorithms.git/swift-algorithms@1.0.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.SwiftPkg,
-			MetadataType: pkg.SwiftPackageManagerMetadataType,
-			Metadata: pkg.SwiftPackageManagerMetadata{
+			Name:      "swift-algorithms",
+			Version:   "1.0.0",
+			PURL:      "pkg:swift/github.com/apple/swift-algorithms.git/swift-algorithms@1.0.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.SwiftPkg,
+			Metadata: pkg.SwiftPackageManagerResolvedEntry{
 				Revision: "b14b7f4c528c942f121c8b860b9410b2bf57825e",
 			},
 		},
 		{
-			Name:         "swift-async-algorithms",
-			Version:      "0.1.0",
-			PURL:         "pkg:swift/github.com/apple/swift-async-algorithms.git/swift-async-algorithms@0.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.SwiftPkg,
-			MetadataType: pkg.SwiftPackageManagerMetadataType,
-			Metadata: pkg.SwiftPackageManagerMetadata{
+			Name:      "swift-async-algorithms",
+			Version:   "0.1.0",
+			PURL:      "pkg:swift/github.com/apple/swift-async-algorithms.git/swift-async-algorithms@0.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.SwiftPkg,
+			Metadata: pkg.SwiftPackageManagerResolvedEntry{
 				Revision: "9cfed92b026c524674ed869a4ff2dcfdeedf8a2a",
 			},
 		},
 		{
-			Name:         "swift-atomics",
-			Version:      "1.1.0",
-			PURL:         "pkg:swift/github.com/apple/swift-atomics.git/swift-atomics@1.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.SwiftPkg,
-			MetadataType: pkg.SwiftPackageManagerMetadataType,
-			Metadata: pkg.SwiftPackageManagerMetadata{
+			Name:      "swift-atomics",
+			Version:   "1.1.0",
+			PURL:      "pkg:swift/github.com/apple/swift-atomics.git/swift-atomics@1.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.SwiftPkg,
+			Metadata: pkg.SwiftPackageManagerResolvedEntry{
 				Revision: "6c89474e62719ddcc1e9614989fff2f68208fe10",
 			},
 		},
 		{
-			Name:         "swift-collections",
-			Version:      "1.0.4",
-			PURL:         "pkg:swift/github.com/apple/swift-collections.git/swift-collections@1.0.4",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.SwiftPkg,
-			MetadataType: pkg.SwiftPackageManagerMetadataType,
-			Metadata: pkg.SwiftPackageManagerMetadata{
+			Name:      "swift-collections",
+			Version:   "1.0.4",
+			PURL:      "pkg:swift/github.com/apple/swift-collections.git/swift-collections@1.0.4",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.SwiftPkg,
+			Metadata: pkg.SwiftPackageManagerResolvedEntry{
 				Revision: "937e904258d22af6e447a0b72c0bc67583ef64a2",
 			},
 		},
 		{
-			Name:         "swift-numerics",
-			Version:      "1.0.2",
-			PURL:         "pkg:swift/github.com/apple/swift-numerics/swift-numerics@1.0.2",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.SwiftPkg,
-			MetadataType: pkg.SwiftPackageManagerMetadataType,
-			Metadata: pkg.SwiftPackageManagerMetadata{
+			Name:      "swift-numerics",
+			Version:   "1.0.2",
+			PURL:      "pkg:swift/github.com/apple/swift-numerics/swift-numerics@1.0.2",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.SwiftPkg,
+			Metadata: pkg.SwiftPackageManagerResolvedEntry{
 				Revision: "0a5bc04095a675662cf24757cc0640aa2204253b",
 			},
 		},
@@ -14,278 +14,255 @@ func TestParsePodfileLock(t *testing.T) {
 	locations := file.NewLocationSet(file.NewLocation(fixture))
 	expectedPkgs := []pkg.Package{
 		{
-			Name:         "GlossButtonNode",
-			Version:      "3.1.2",
-			PURL:         "pkg:cocoapods/GlossButtonNode@3.1.2",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "GlossButtonNode",
+			Version:   "3.1.2",
+			PURL:      "pkg:cocoapods/GlossButtonNode@3.1.2",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "4ea1197a744f2fb5fb875fe31caf17ded4762e8f",
 			},
 		},
 		{
-			Name:         "PINCache",
-			Version:      "3.0.3",
-			PURL:         "pkg:cocoapods/PINCache@3.0.3",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINCache",
+			Version:   "3.0.3",
+			PURL:      "pkg:cocoapods/PINCache@3.0.3",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "7a8fc1a691173d21dbddbf86cd515de6efa55086",
 			},
 		},
 		{
-			Name:         "PINCache/Arc-exception-safe",
-			Version:      "3.0.3",
-			PURL:         "pkg:cocoapods/PINCache/Arc-exception-safe@3.0.3",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINCache/Arc-exception-safe",
+			Version:   "3.0.3",
+			PURL:      "pkg:cocoapods/PINCache/Arc-exception-safe@3.0.3",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "7a8fc1a691173d21dbddbf86cd515de6efa55086",
 			},
 		},
 		{
-			Name:         "PINCache/Core",
-			Version:      "3.0.3",
-			PURL:         "pkg:cocoapods/PINCache/Core@3.0.3",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINCache/Core",
+			Version:   "3.0.3",
+			PURL:      "pkg:cocoapods/PINCache/Core@3.0.3",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "7a8fc1a691173d21dbddbf86cd515de6efa55086",
 			},
 		},
 		{
-			Name:         "PINOperation",
-			Version:      "1.2.1",
-			PURL:         "pkg:cocoapods/PINOperation@1.2.1",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINOperation",
+			Version:   "1.2.1",
+			PURL:      "pkg:cocoapods/PINOperation@1.2.1",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20",
 			},
 		},
 		{
-			Name:         "PINRemoteImage/Core",
-			Version:      "3.0.3",
-			PURL:         "pkg:cocoapods/PINRemoteImage/Core@3.0.3",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINRemoteImage/Core",
+			Version:   "3.0.3",
+			PURL:      "pkg:cocoapods/PINRemoteImage/Core@3.0.3",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "f1295b29f8c5e640e25335a1b2bd9d805171bd01",
 			},
 		},
 		{
-			Name:         "PINRemoteImage/iOS",
-			Version:      "3.0.3",
-			PURL:         "pkg:cocoapods/PINRemoteImage/iOS@3.0.3",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINRemoteImage/iOS",
+			Version:   "3.0.3",
+			PURL:      "pkg:cocoapods/PINRemoteImage/iOS@3.0.3",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "f1295b29f8c5e640e25335a1b2bd9d805171bd01",
 			},
 		},
 		{
-			Name:         "PINRemoteImage/PINCache",
-			Version:      "3.0.3",
-			PURL:         "pkg:cocoapods/PINRemoteImage/PINCache@3.0.3",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "PINRemoteImage/PINCache",
+			Version:   "3.0.3",
+			PURL:      "pkg:cocoapods/PINRemoteImage/PINCache@3.0.3",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "f1295b29f8c5e640e25335a1b2bd9d805171bd01",
 			},
 		},
 		{
-			Name:         "Reveal-SDK",
-			Version:      "33",
-			PURL:         "pkg:cocoapods/Reveal-SDK@33",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Reveal-SDK",
+			Version:   "33",
+			PURL:      "pkg:cocoapods/Reveal-SDK@33",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "effba1c940b8337195563c425a6b5862ec875caa",
 			},
 		},
 		{
-			Name:         "SwiftGen",
-			Version:      "6.5.1",
-			PURL:         "pkg:cocoapods/SwiftGen@6.5.1",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "SwiftGen",
+			Version:   "6.5.1",
+			PURL:      "pkg:cocoapods/SwiftGen@6.5.1",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "a6d22010845f08fe18fbdf3a07a8e380fd22e0ea",
 			},
 		},
 		{
-			Name:         "Texture",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "Texture/AssetsLibrary",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture/AssetsLibrary@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture/AssetsLibrary",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture/AssetsLibrary@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "Texture/Core",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture/Core@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture/Core",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture/Core@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "Texture/MapKit",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture/MapKit@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture/MapKit",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture/MapKit@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "Texture/Photos",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture/Photos@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture/Photos",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture/Photos@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "Texture/PINRemoteImage",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture/PINRemoteImage@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture/PINRemoteImage",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture/PINRemoteImage@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "Texture/Video",
-			Version:      "3.1.0",
-			PURL:         "pkg:cocoapods/Texture/Video@3.1.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "Texture/Video",
+			Version:   "3.1.0",
+			PURL:      "pkg:cocoapods/Texture/Video@3.1.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "2e8ab2519452515f7f5a520f5a8f7e0a413abfa3",
 			},
 		},
 		{
-			Name:         "TextureSwiftSupport",
-			Version:      "3.13.0",
-			PURL:         "pkg:cocoapods/TextureSwiftSupport@3.13.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "TextureSwiftSupport",
+			Version:   "3.13.0",
+			PURL:      "pkg:cocoapods/TextureSwiftSupport@3.13.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "c515c7927fab92d0d9485f49b885b8c5de34fbfb",
 			},
 		},
 		{
-			Name:         "TextureSwiftSupport/Components",
-			Version:      "3.13.0",
-			PURL:         "pkg:cocoapods/TextureSwiftSupport/Components@3.13.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "TextureSwiftSupport/Components",
+			Version:   "3.13.0",
+			PURL:      "pkg:cocoapods/TextureSwiftSupport/Components@3.13.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "c515c7927fab92d0d9485f49b885b8c5de34fbfb",
 			},
 		},
 		{
-			Name:         "TextureSwiftSupport/Experiments",
-			Version:      "3.13.0",
-			PURL:         "pkg:cocoapods/TextureSwiftSupport/Experiments@3.13.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "TextureSwiftSupport/Experiments",
+			Version:   "3.13.0",
+			PURL:      "pkg:cocoapods/TextureSwiftSupport/Experiments@3.13.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "c515c7927fab92d0d9485f49b885b8c5de34fbfb",
 			},
 		},
 		{
-			Name:         "TextureSwiftSupport/Extensions",
-			Version:      "3.13.0",
-			PURL:         "pkg:cocoapods/TextureSwiftSupport/Extensions@3.13.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "TextureSwiftSupport/Extensions",
+			Version:   "3.13.0",
+			PURL:      "pkg:cocoapods/TextureSwiftSupport/Extensions@3.13.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "c515c7927fab92d0d9485f49b885b8c5de34fbfb",
 			},
 		},
 		{
-			Name:         "TextureSwiftSupport/LayoutSpecBuilders",
-			Version:      "3.13.0",
-			PURL:         "pkg:cocoapods/TextureSwiftSupport/LayoutSpecBuilders@3.13.0",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "TextureSwiftSupport/LayoutSpecBuilders",
+			Version:   "3.13.0",
+			PURL:      "pkg:cocoapods/TextureSwiftSupport/LayoutSpecBuilders@3.13.0",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "c515c7927fab92d0d9485f49b885b8c5de34fbfb",
 			},
 		},
 		{
-			Name:         "TinyConstraints",
-			Version:      "4.0.2",
-			PURL:         "pkg:cocoapods/TinyConstraints@4.0.2",
-			Locations:    locations,
-			Language:     pkg.Swift,
-			Type:         pkg.CocoapodsPkg,
-			MetadataType: pkg.CocoapodsMetadataType,
-			Metadata: pkg.CocoapodsMetadata{
+			Name:      "TinyConstraints",
+			Version:   "4.0.2",
+			PURL:      "pkg:cocoapods/TinyConstraints@4.0.2",
+			Locations: locations,
+			Language:  pkg.Swift,
+			Type:      pkg.CocoapodsPkg,
+			Metadata: pkg.CocoaPodfileLockEntry{
 				Checksum: "7b7ccc0c485bb3bb47082138ff28bc33cd49897f",
 			},
 		},