fix tests to use location instead of file.Reference

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

syft/pkg/catalog.go

@@ -4,7 +4,8 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/anchore/stereoscope/pkg/file"
+	"github.com/anchore/syft/syft/source"
+
 	"github.com/anchore/syft/internal/log"
 )
 
@@ -14,7 +15,7 @@ var nextPackageID int64
 type Catalog struct {
 	byID   map[ID]*Package
 	byType map[Type][]*Package
-	byFile map[file.Reference][]*Package
+	byFile map[source.Location][]*Package
 	lock   sync.RWMutex
 }
 
@@ -23,7 +24,7 @@ func NewCatalog(pkgs ...Package) *Catalog {
 	catalog := Catalog{
 		byID:   make(map[ID]*Package),
 		byType: make(map[Type][]*Package),
-		byFile: make(map[file.Reference][]*Package),
+		byFile: make(map[source.Location][]*Package),
 	}
 
 	for _, p := range pkgs {
@@ -44,8 +45,8 @@ func (c *Catalog) Package(id ID) *Package {
 }
 
 // PackagesByFile returns all packages that were discovered from the given source file reference.
-func (c *Catalog) PackagesByFile(ref file.Reference) []*Package {
-	return c.byFile[ref]
+func (c *Catalog) PackagesByFile(location source.Location) []*Package {
+	return c.byFile[location]
 }
 
 // Add a package to the Catalog.
@@ -71,7 +72,7 @@ func (c *Catalog) Add(p Package) {
 	c.byType[p.Type] = append(c.byType[p.Type], &p)
 
 	// store by file references
-	for _, s := range p.Source {
+	for _, s := range p.Locations {
 		_, ok := c.byFile[s]
 		if !ok {
 			c.byFile[s] = make([]*Package, 0)

syft/pkg/dpkg_metadata.go

@@ -9,7 +9,7 @@ import (
 // at http://manpages.ubuntu.com/manpages/xenial/man1/dpkg-query.1.html in the --showformat section.
 type DpkgMetadata struct {
 	Package       string           `mapstructure:"Package" json:"package"`
-	Source        string           `mapstructure:"Source" json:"source"`
+	Source        string           `mapstructure:"Locations" json:"source"`
 	Version       string           `mapstructure:"Version" json:"version"`
 	Architecture  string           `mapstructure:"Architecture" json:"architecture"`
 	Maintainer    string           `mapstructure:"Maintainer" json:"maintainer"`

syft/pkg/package.go

@@ -8,7 +8,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/anchore/stereoscope/pkg/file"
+	"github.com/anchore/syft/syft/source"
+
 	"github.com/anchore/syft/syft/distro"
 	"github.com/package-url/packageurl-go"
 )
@@ -17,12 +18,11 @@ type ID int64
 
 // Package represents an application or library that has been bundled into a distributable format.
 type Package struct {
-	id       ID               // uniquely identifies a package, set by the cataloger
-	Name     string           `json:"manifest"` // the package name
-	Version  string           `json:"version"`  // the version of the package
-	FoundBy  string           `json:"foundBy"`  // the specific cataloger that discovered this package
-	Source   []file.Reference `json:"-"`        // the locations that lead to the discovery of this package (note: this is not necessarily the locations that make up this package)
-	Location interface{}      `json:"locations"`
+	id        ID                // uniquely identifies a package, set by the cataloger
+	Name      string            `json:"manifest"` // the package name
+	Version   string            `json:"version"`  // the version of the package
+	FoundBy   string            `json:"foundBy"`  // the specific cataloger that discovered this package
+	Locations []source.Location `json:"-"`        // the locations that lead to the discovery of this package (note: this is not necessarily the locations that make up this package)
 	// TODO: should we move licenses into metadata?
 	Licenses     []string     `json:"licenses"`               // licenses discovered with the package metadata
 	Language     Language     `json:"language"`               // the language ecosystem this package belongs to (e.g. JavaScript, Python, etc)