From 5b08616e475aee486365ce06bae053405a7b4e16 Mon Sep 17 00:00:00 2001
From: Toure Dunnon <toure.dunnon@anchore.com>
Date: Wed, 21 Oct 2020 10:44:05 -0400
Subject: [PATCH] Fix for errors+failures parsing `package.json`

closes: #230

Signed-off-by: Toure Dunnon <toure.dunnon@anchore.com>
---
 go.mod                                        |  1 +
 .../javascript/parse_package_json.go          | 26 ++++++++-----------
 .../javascript/parse_package_json_test.go     |  1 +
 syft/pkg/metadata.go                          | 11 --------
 4 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 syft/pkg/metadata.go

diff --git a/go.mod b/go.mod
index af71131ea..f7af429f9 100644
--- a/go.mod
+++ b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04
 	github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b
 	github.com/anchore/stereoscope v0.0.0-20200925184903-c82da54e98fe
+	github.com/apex/log v1.3.0
 	github.com/bmatcuk/doublestar v1.3.1
 	github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
 	github.com/dustin/go-humanize v1.0.0
diff --git a/syft/cataloger/javascript/parse_package_json.go b/syft/cataloger/javascript/parse_package_json.go
index 0b3a39a11..9d6ec9060 100644
--- a/syft/cataloger/javascript/parse_package_json.go
+++ b/syft/cataloger/javascript/parse_package_json.go
@@ -35,37 +35,33 @@ type Author struct {
 	URL   string `json:"url" mapstruct:"url"`
 }
 
+// match example: "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)"
+// ---> name: "Isaac Z. Schlueter" email: "i@izs.me" url: "http://blog.izs.me"
 var authorPattern = regexp.MustCompile(`^\s*(?P<name>[^<(]*)(\s+<(?P<email>.*)>)?(\s\((?P<url>.*)\))?\s*$`)
 
 func (a *Author) UnmarshalJSON(b []byte) error {
 	var authorStr string
+	var fields map[string]string
+	var author Author
+
 	if err := json.Unmarshal(b, &authorStr); err != nil {
 		// string parsing did not work, assume a map was given
 		// for more information: https://docs.npmjs.com/files/package.json#people-fields-author-contributors
-		var fields map[string]string
-		var author Author
 		if err := json.Unmarshal(b, &fields); err != nil {
 			return fmt.Errorf("unable to parse package.json author: %w", err)
 		}
-		// translate the map into a structure
-		if err := mapstructure.Decode(fields, &author); err != nil {
-			return fmt.Errorf("unable to decode package.json author: %w", err)
-		}
-		*a = author
 	} else {
 		// parse out "name <email> (url)" into an Author struct
-		var fields = internal.MatchCaptureGroups(authorPattern, authorStr)
-		*a = Author{
-			Name:  fields["name"],
-			Email: fields["email"],
-			URL:   fields["url"],
-		}
+		fields = internal.MatchCaptureGroups(authorPattern, authorStr)
 	}
 
-	if a.Name == "" {
-		return fmt.Errorf("package.json author name is empty")
+	// translate the map into a structure
+	if err := mapstructure.Decode(fields, &author); err != nil {
+		return fmt.Errorf("unable to decode package.json author: %w", err)
 	}
 
+	*a = author
+
 	return nil
 }
 
diff --git a/syft/cataloger/javascript/parse_package_json_test.go b/syft/cataloger/javascript/parse_package_json_test.go
index b843f199d..ae38d37be 100644
--- a/syft/cataloger/javascript/parse_package_json_test.go
+++ b/syft/cataloger/javascript/parse_package_json_test.go
@@ -62,6 +62,7 @@ func TestParsePackageJSON(t *testing.T) {
 			}
 
 			for _, d := range deep.Equal(actual[0], test.ExpectedPkg) {
+
 				t.Errorf("diff: %+v", d)
 			}
 		})
diff --git a/syft/pkg/metadata.go b/syft/pkg/metadata.go
deleted file mode 100644
index 2d5eb2def..000000000
--- a/syft/pkg/metadata.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package pkg
-
-type MetadataType string
-
-const (
-	UnknownMetadataType MetadataType = "UnknownMetadata"
-	ApkMetadataType     MetadataType = "apk-metadata"
-	DpkgMetadataType    MetadataType = "dpkg-metadata"
-	GemgMetadataType    MetadataType = "gem-metadata"
-	RpmdbMetadataType   MetadataType = "rpmdb-metadata"
-)