Fix issue with detection from source

Author: cdupuis

sbom/detect/detect.go

@@ -44,11 +44,11 @@ func AdditionalPackages(packages []types.Package, image source.Source, lm types.
 	return additionalPackages
 }
 
-func stringsNodeDetector(executable string, versionEnvVar string, expr *regexp.Regexp, pkg types.Package) PackageDetector {
+func stringsNodeDetector(executable string, versionEnvVar string, expr *regexp.Regexp, pkg types.Package, filterFunc func(purl string) bool) PackageDetector {
 	return func(packages []types.Package, image source.Source, lm types.LayerMapping) []types.Package {
 		// Already found via package manager
 		for _, p := range packages {
-			if purl, err := types.ToPackageUrl(p.Purl); err == nil && purl.Name == pkg.Name {
+			if filterFunc(p.Purl) {
 				return []types.Package{}
 			}
 		}

sbom/detect/detect_test.go

@@ -22,22 +22,28 @@ import (
 	stereoscopeimage "github.com/anchore/stereoscope/pkg/image"
 	"github.com/anchore/syft/syft/source"
 	"github.com/docker/cli/cli/command"
+	"github.com/docker/cli/cli/flags"
 	"github.com/docker/index-cli-plugin/registry"
 	"github.com/docker/index-cli-plugin/types"
 )
 
 func TestNodeDetector(t *testing.T) {
 	cmd, _ := command.NewDockerCli()
-	_, ociPath, _, _ := registry.SaveImage("node@sha256:2b00d259f3b07d8aa694b298a7dcf4655571aea2ab91375b5adb8e5a905d3ee2", cmd.Client())
+	cmd.Initialize(flags.NewClientOptions())
+	cache, _ := registry.SaveImage("atomist/skill@sha256:a691a1ccfa81ab7cc6b422a53bfb9bbcea4d78873426b0389eec8f554da9b0b8", cmd)
+	cache.StoreImage()
 	lm := types.LayerMapping{
 		ByDiffId: make(map[string]string),
 	}
 	i := source.Input{
 		Scheme:      source.ImageScheme,
-		ImageSource: stereoscopeimage.DockerTarballSource,
-		Location:    ociPath + "/archive.tar",
+		ImageSource: stereoscopeimage.OciDirectorySource,
+		Location:    cache.ImagePath,
+	}
+	src, _, err := source.New(i, nil, nil)
+	if err != nil {
+		t.Fail()
 	}
-	src, _, _ := source.New(i, nil, nil)
 	packages := nodePackageDetector()([]types.Package{}, *src, lm)
 	if len(packages) != 1 {
 		t.Errorf("Expected package missing")

sbom/detect/node.go

@@ -33,5 +33,9 @@ func nodePackageDetector() PackageDetector {
 		Licenses:    []string{"MIT"},
 		Url:         "https://nodejs.org",
 	}
-	return stringsNodeDetector("node", "NODE_VERSION", expr, pkg)
+	filter := func(purl string) bool {
+		pkg, _ := types.ToPackageUrl(purl)
+		return pkg.Name == "nodejs" || pkg.Name == "node"
+	}
+	return stringsNodeDetector("node", "NODE_VERSION", expr, pkg, filter)
 }