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-05 00:46:38 +01:00 · 2023-10-30 12:12:04 -04:00
parent f442586ec9
commit 1aaa644007
261 changed files with 7010 additions and 4040 deletions
@@ -4,54 +4,38 @@ import (
 	"testing"

 	"github.com/sergi/go-diff/diffmatchpatch"
-
-	"github.com/anchore/syft/syft/pkg"
 )

 func Test_packageURL(t *testing.T) {
 	tests := []struct {
-		name     string
-		metadata parsedData
-		expected string
+		name           string
+		packageName    string
+		packageVersion string
+		expected       string
 	}{
 		{
-			name: "with extractable vendor",
-			metadata: parsedData{
-				[]string{},
-				pkg.PhpComposerJSONMetadata{
-					Version: "1.0.1",
-					Name:    "ven/name",
-				},
-			},
-			expected: "pkg:composer/ven/name@1.0.1",
+			name:           "with extractable vendor",
+			packageName:    "ven/name",
+			packageVersion: "1.0.1",
+			expected:       "pkg:composer/ven/name@1.0.1",
 		},
 		{
-			name: "name with slashes (invalid)",
-			metadata: parsedData{
-				[]string{},
-				pkg.PhpComposerJSONMetadata{
-					Name:    "ven/name/component",
-					Version: "1.0.1",
-				},
-			},
-			expected: "pkg:composer/ven/name-component@1.0.1",
+			name:           "name with slashes (invalid)",
+			packageName:    "ven/name/component",
+			packageVersion: "1.0.1",
+			expected:       "pkg:composer/ven/name-component@1.0.1",
 		},
 		{
-			name: "unknown vendor",
-			metadata: parsedData{
-				[]string{},
-				pkg.PhpComposerJSONMetadata{
-					Name:    "name",
-					Version: "1.0.1",
-				},
-			},
-			expected: "pkg:composer/name@1.0.1",
+			name:           "unknown vendor",
+			packageName:    "name",
+			packageVersion: "1.0.1",
+			expected:       "pkg:composer/name@1.0.1",
 		},
 	}

 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			actual := packageURL(test.metadata)
+			actual := packageURL(test.packageName, test.packageVersion)
 			if actual != test.expected {
 				dmp := diffmatchpatch.New()
 				diffs := dmp.DiffMain(test.expected, actual, true)