with package id

imgbom/analyzer/controller.go

@@ -18,7 +18,7 @@ func init() {
 	controllerInstance.add(dpkg.NewAnalyzer())
 }
 
-func Analyze(s scope.Scope) (pkg.Catalog, error) {
+func Analyze(s scope.Scope) (*pkg.Catalog, error) {
 	return controllerInstance.analyze(s)
 }
 
@@ -31,7 +31,7 @@ func (c *controller) add(a Analyzer) {
 	c.analyzers = append(c.analyzers, a)
 }
 
-func (c *controller) analyze(s scope.Scope) (pkg.Catalog, error) {
+func (c *controller) analyze(s scope.Scope) (*pkg.Catalog, error) {
 	catalog := pkg.NewCatalog()
 	fileSelection := make([]file.Reference, 0)
 
@@ -44,7 +44,7 @@ func (c *controller) analyze(s scope.Scope) (pkg.Catalog, error) {
 	// fetch contents for requested selection by analyzers
 	contents, err := s.Image.MultipleFileContentsByRef(fileSelection...)
 	if err != nil {
-		return pkg.Catalog{}, err
+		return nil, err
 	}
 
 	// perform analysis, accumulating errors for each failed analysis
@@ -65,7 +65,7 @@ func (c *controller) analyze(s scope.Scope) (pkg.Catalog, error) {
 	}
 
 	if errs != nil {
-		return pkg.Catalog{}, errs
+		return nil, errs
 	}
 
 	return catalog, nil

imgbom/analyzer/dpkg/parser.go

@@ -10,7 +10,7 @@ import (
 	"github.com/mitchellh/mapstructure"
 )
 
-var endOfPackages = fmt.Errorf("no more packages to read")
+var errEndOfPackages = fmt.Errorf("no more packages to read")
 
 func ParseEntries(reader io.Reader) ([]pkg.DpkgMetadata, error) {
 	buffedReader := bufio.NewReader(reader)
@@ -19,7 +19,7 @@ func ParseEntries(reader io.Reader) ([]pkg.DpkgMetadata, error) {
 	for {
 		entry, err := parseEntry(buffedReader)
 		if err != nil {
-			if err == endOfPackages {
+			if err == errEndOfPackages {
 				break
 			}
 			return nil, err
@@ -38,7 +38,7 @@ func parseEntry(reader *bufio.Reader) (entry pkg.DpkgMetadata, err error) {
 		line, err := reader.ReadString('\n')
 		if err != nil {
 			if err == io.EOF {
-				return pkg.DpkgMetadata{}, endOfPackages
+				return pkg.DpkgMetadata{}, errEndOfPackages
 			}
 			return pkg.DpkgMetadata{}, err
 		}