move package purl and cpes (identities) to pkg.Package

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

syft/pkg/package.go

@@ -5,13 +5,8 @@ package pkg
 
 import (
 	"fmt"
-	"regexp"
-	"strings"
 
 	"github.com/anchore/syft/syft/source"
-
-	"github.com/anchore/syft/syft/distro"
-	"github.com/package-url/packageurl-go"
 )
 
 // ID represents a unique value for each package added to a package catalog.
@@ -28,6 +23,8 @@ type Package struct {
 	Licenses     []string     // licenses discovered with the package metadata
 	Language     Language     // the language ecosystem this package belongs to (e.g. JavaScript, Python, etc)
 	Type         Type         // the package type (e.g. Npm, Yarn, Python, Rpm, Deb, etc)
+	CPEs         []CPE        // all possible Common Platform Enumerators
+	PURL         string       // the Package URL (see https://github.com/package-url/purl-spec)
 	MetadataType MetadataType // the shape of the additional data in the "metadata" field
 	Metadata     interface{}  // additional data found while parsing the package source
 }
@@ -41,42 +38,3 @@ func (p Package) ID() ID {
 func (p Package) String() string {
 	return fmt.Sprintf("Pkg(type=%s, name=%s, version=%s)", p.Type, p.Name, p.Version)
 }
-
-// PackageURL returns a package-URL representation of the given package (see https://github.com/package-url/purl-spec)
-func (p Package) PackageURL(d distro.Distro) string {
-	// default to pURLs on the metadata
-	if p.Metadata != nil {
-		if i, ok := p.Metadata.(interface{ PackageURL() string }); ok {
-			return i.PackageURL()
-		} else if i, ok := p.Metadata.(interface{ PackageURL(distro.Distro) string }); ok {
-			return i.PackageURL(d)
-		}
-	}
-
-	var purlType = p.Type.PackageURLType()
-	var name = p.Name
-	var namespace = ""
-
-	switch {
-	case purlType == "":
-		// there is no purl type, don't attempt to craft a purl
-		// TODO: should this be a "generic" purl type instead?
-		return ""
-	case p.Type == GoModulePkg:
-		re := regexp.MustCompile(`(\/)[^\/]*$`)
-		fields := re.Split(p.Name, -1)
-		namespace = fields[0]
-		name = strings.TrimPrefix(p.Name, namespace+"/")
-	}
-
-	// generate a purl from the package data
-	pURL := packageurl.NewPackageURL(
-		purlType,
-		namespace,
-		name,
-		p.Version,
-		nil,
-		"")
-
-	return pURL.ToString()
-}