From d5779a9822d4b2ec2182f60b29c18e498d49a89d Mon Sep 17 00:00:00 2001 From: Dan Luhring Date: Fri, 22 Jan 2021 15:20:24 -0500 Subject: [PATCH] Clarify debug message for package.json omissions Signed-off-by: Dan Luhring --- syft/cataloger/javascript/parse_package_json.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/syft/cataloger/javascript/parse_package_json.go b/syft/cataloger/javascript/parse_package_json.go index cccd0b51f..5a4fbadc9 100644 --- a/syft/cataloger/javascript/parse_package_json.go +++ b/syft/cataloger/javascript/parse_package_json.go @@ -174,9 +174,8 @@ func parsePackageJSON(_ string, reader io.Reader) ([]pkg.Package, error) { return nil, fmt.Errorf("failed to parse package.json file: %w", err) } - if !p.hasMinimumRequiredValues() { - log.Debug("encountered package.json file without the minimum number of field values required for" + - " consideration as a package") + if !p.hasNameAndVersionValues() { + log.Debug("encountered package.json file without a name and/or version field, ignoring this file") return nil, nil } @@ -204,6 +203,6 @@ func parsePackageJSON(_ string, reader io.Reader) ([]pkg.Package, error) { return packages, nil } -func (p PackageJSON) hasMinimumRequiredValues() bool { +func (p PackageJSON) hasNameAndVersionValues() bool { return p.Name != "" && p.Version != "" }