From 9e43725951751f03260530be2a1ae90323e3108a Mon Sep 17 00:00:00 2001 From: Keith Zantow Date: Wed, 30 Nov 2022 10:30:57 -0500 Subject: [PATCH] fix: Update node binary package name (#1375) --- syft/pkg/cataloger/binary/cataloger_test.go | 12 ++++++++++++ syft/pkg/cataloger/binary/default_classifiers.go | 2 +- .../binary/test-fixtures/classifiers/positive/node | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/node diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go index 808fe1ffe..e98a7da7a 100644 --- a/syft/pkg/cataloger/binary/cataloger_test.go +++ b/syft/pkg/cataloger/binary/cataloger_test.go @@ -65,6 +65,18 @@ func TestClassifierCataloger_DefaultClassifiers_PositiveCases(t *testing.T) { }, }, }, + { + name: "positive-node", + fixtureDir: "test-fixtures/classifiers/positive", + expected: pkg.Package{ + Name: "node", + Version: "19.2.1", + Locations: singleLocation("node"), + Metadata: pkg.BinaryMetadata{ + Classifier: "nodejs-binary", + }, + }, + }, { name: "positive-go-hint", fixtureDir: "test-fixtures/classifiers/positive", diff --git a/syft/pkg/cataloger/binary/default_classifiers.go b/syft/pkg/cataloger/binary/default_classifiers.go index 65f8de5a4..d0f601fe3 100644 --- a/syft/pkg/cataloger/binary/default_classifiers.go +++ b/syft/pkg/cataloger/binary/default_classifiers.go @@ -38,7 +38,7 @@ var defaultClassifiers = []classifier{ FileGlob: "**/node", EvidenceMatcher: fileContentsVersionMatcher( `(?m)node\.js\/v(?P[0-9]+\.[0-9]+\.[0-9]+)`), - Package: "node.js", + Package: "node", Language: pkg.JavaScript, PURL: mustPURL("pkg:generic/node@version"), CPEs: singleCPE("cpe:2.3:a:nodejs:node.js:*:*:*:*:*:*:*:*"), diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/node b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/node new file mode 100644 index 000000000..9e7608b56 --- /dev/null +++ b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/node @@ -0,0 +1,2 @@ +# this should match node 19.2.1 +node.js/v19.2.1