From fa0b3c04384f08b03e4ba10aa5b191bd9af9db95 Mon Sep 17 00:00:00 2001
From: Christopher Angelo Phillips <32073428+spiffcs@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:35:46 -0400
Subject: [PATCH] fix: reset merged package into map; (#1258)

---
 syft/pkg/catalog.go      | 1 +
 syft/pkg/catalog_test.go | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/syft/pkg/catalog.go b/syft/pkg/catalog.go
index 59ff0292a43..f9069ec7b94 100644
--- a/syft/pkg/catalog.go
+++ b/syft/pkg/catalog.go
@@ -110,6 +110,7 @@ func (c *Catalog) Add(p Package) {
 		if err := existing.merge(p); err != nil {
 			log.Warnf("failed to merge packages: %+v", err)
 		} else {
+			c.byID[id] = existing
 			c.addPathsToIndex(p)
 		}
 		return
diff --git a/syft/pkg/catalog_test.go b/syft/pkg/catalog_test.go
index 71c3a6d0f0c..09b6a973ec2 100644
--- a/syft/pkg/catalog_test.go
+++ b/syft/pkg/catalog_test.go
@@ -70,9 +70,7 @@ func TestCatalogAddPopulatesIndex(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			c := NewCatalog(pkgs...)
-
 			assertIndexes(t, c, test.expectedIndexes)
-
 		})
 	}
 }
@@ -178,11 +176,13 @@ func TestCatalog_MergeRecords(t *testing.T) {
 		name              string
 		pkgs              []Package
 		expectedLocations []source.Location
+		expectedCPECount  int
 	}{
 		{
 			name: "multiple Locations with shared path",
 			pkgs: []Package{
 				{
+					CPEs: []CPE{MustCPE("cpe:2.3:a:package:1:1:*:*:*:*:*:*:*")},
 					Locations: source.NewLocationSet(
 						source.Location{
 							Coordinates: source.Coordinates{
@@ -195,6 +195,7 @@ func TestCatalog_MergeRecords(t *testing.T) {
 					Type: RpmPkg,
 				},
 				{
+					CPEs: []CPE{MustCPE("cpe:2.3:b:package:1:1:*:*:*:*:*:*:*")},
 					Locations: source.NewLocationSet(
 						source.Location{
 							Coordinates: source.Coordinates{
@@ -223,6 +224,7 @@ func TestCatalog_MergeRecords(t *testing.T) {
 					VirtualPath: "/another/path",
 				},
 			},
+			expectedCPECount: 2,
 		},
 	}
 
@@ -231,6 +233,7 @@ func TestCatalog_MergeRecords(t *testing.T) {
 			actual := NewCatalog(tt.pkgs...).PackagesByPath("/b/path")
 			require.Len(t, actual, 1)
 			assert.Equal(t, tt.expectedLocations, actual[0].Locations.ToSlice())
+			require.Len(t, actual[0].CPEs, tt.expectedCPECount)
 		})
 	}
 }