fix unit tests and linting

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
anchore · Mar 24, 2023 · 063b95d · 063b95d
1 parent 49c24dd
commit 063b95d
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 7 deletions.
diff --git a/syft/formats/common/spdxhelpers/source_info.go b/syft/formats/common/spdxhelpers/source_info.go
@@ -45,6 +45,8 @@ func SourceInfo(p pkg.Package) string {
 		answer = "acquired package info from cabal or stack manifest files"
 	case pkg.HexPkg:
 		answer = "acquired package info from rebar3 or mix manifest file"
+	case pkg.NixPkg:
+		answer = "acquired package info from nix store path"
 	default:
 		answer = "acquired package info from the following paths"
 	}

diff --git a/syft/formats/common/spdxhelpers/source_info_test.go b/syft/formats/common/spdxhelpers/source_info_test.go
@@ -199,6 +199,14 @@ func Test_SourceInfo(t *testing.T) {
 				"from rebar3 or mix manifest file",
 			},
 		},
+		{
+			input: pkg.Package{
+				Type: pkg.NixPkg,
+			},
+			expected: []string{
+				"from nix store path",
+			},
+		},
 	}
 	var pkgTypes []pkg.Type
 	for _, test := range tests {

diff --git a/syft/pkg/cataloger/cataloger.go b/syft/pkg/cataloger/cataloger.go
@@ -87,6 +87,7 @@ func DirectoryCatalogers(cfg Config) []pkg.Cataloger {
 		binary.NewCataloger(),
 		elixir.NewMixLockCataloger(),
 		erlang.NewRebarLockCataloger(),
+		nix.NewStoreCataloger(),
 	}, cfg.Catalogers)
 }
 
@@ -123,6 +124,7 @@ func AllCatalogers(cfg Config) []pkg.Cataloger {
 		binary.NewCataloger(),
 		elixir.NewMixLockCataloger(),
 		erlang.NewRebarLockCataloger(),
+		nix.NewStoreCataloger(),
 	}, cfg.Catalogers)
 }
 

diff --git a/syft/pkg/cataloger/nix/cataloger_test.go b/syft/pkg/cataloger/nix/cataloger_test.go
@@ -25,7 +25,7 @@ func TestCataloger_Catalog(t *testing.T) {
 					PURL:         "pkg:nix/glibc@2.34-210?output=bin&hash=h0cnbmfcn93xm5dg2x27ixhag1cwndga",
 					Locations:    source.NewLocationSet(source.NewLocation("nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin")),
 					FoundBy:      catalogerName,
-					Type:         pkg.NixStorePkg,
+					Type:         pkg.NixPkg,
 					MetadataType: pkg.NixStoreMetadataType,
 					Metadata: pkg.NixStoreMetadata{
 						Hash:   "h0cnbmfcn93xm5dg2x27ixhag1cwndga",
@@ -47,7 +47,7 @@ func TestCataloger_Catalog(t *testing.T) {
 			c := NewStoreCataloger()
 
 			pkgtest.NewCatalogTester().
-				WithDirectoryResolver(t, tt.fixture).
+				FromDirectory(t, tt.fixture).
 				Expects(tt.wantPkgs, tt.wantRel).
 				TestCataloger(t, c)
 		})

diff --git a/syft/pkg/cataloger/nix/package.go b/syft/pkg/cataloger/nix/package.go
@@ -12,7 +12,7 @@ func newNixStorePackage(storePath nixStorePath, locations ...source.Location) pk
 		Version:      storePath.version,
 		FoundBy:      catalogerName,
 		Locations:    source.NewLocationSet(locations...),
-		Type:         pkg.NixStorePkg,
+		Type:         pkg.NixPkg,
 		PURL:         packageURL(storePath),
 		MetadataType: pkg.NixStoreMetadataType,
 		Metadata: pkg.NixStoreMetadata{

diff --git a/syft/pkg/cataloger/nix/test-fixtures/fixture-1/.gitignore b/syft/pkg/cataloger/nix/test-fixtures/fixture-1/.gitignore
@@ -0,0 +1,2 @@
+# this is not a real binary, just a small text file
+!nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/lib/glibc.so
diff --git a/...ures/fixture-1/nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/lib/glibc.so b/...ures/fixture-1/nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/lib/glibc.so
@@ -0,0 +1 @@
+the binary
diff --git a/...fixture-1/nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/share/man/glibc.1 b/...fixture-1/nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/share/man/glibc.1
@@ -0,0 +1 @@
+the man pages
diff --git a/syft/pkg/nix_store_metadata.go b/syft/pkg/nix_store_metadata.go
@@ -1,8 +1,9 @@
 package pkg
 
 import (
-	"github.com/scylladb/go-set/strset"
 	"sort"
+
+	"github.com/scylladb/go-set/strset"
 )
 
 type NixStoreMetadata struct {

diff --git a/syft/pkg/type.go b/syft/pkg/type.go
@@ -26,7 +26,7 @@ const (
 	JavaPkg               Type = "java-archive"
 	JenkinsPluginPkg      Type = "jenkins-plugin"
 	KbPkg                 Type = "msrc-kb"
-	NixStorePkg           Type = "nix-store"
+	NixPkg                Type = "nix"
 	NpmPkg                Type = "npm"
 	PhpComposerPkg        Type = "php-composer"
 	PortagePkg            Type = "portage"
@@ -52,7 +52,7 @@ var AllPkgs = []Type{
 	JavaPkg,
 	JenkinsPluginPkg,
 	KbPkg,
-	NixStorePkg,
+	NixPkg,
 	NpmPkg,
 	PhpComposerPkg,
 	PortagePkg,
@@ -94,7 +94,7 @@ func (t Type) PackageURLType() string {
 		return packageurl.TypePyPi
 	case PortagePkg:
 		return "portage"
-	case NixStorePkg:
+	case NixPkg:
 		return "nix"
 	case NpmPkg:
 		return packageurl.TypeNPM
@@ -155,6 +155,8 @@ func TypeByName(name string) Type {
 		return PortagePkg
 	case packageurl.TypeHex:
 		return HexPkg
+	case "nix":
+		return NixPkg
 	default:
 		return UnknownPkg
 	}

diff --git a/syft/pkg/type_test.go b/syft/pkg/type_test.go
@@ -83,6 +83,10 @@ func TestTypeFromPURL(t *testing.T) {
 			purl:     "pkg:hex/hpax/hpax@0.1.1",
 			expected: HexPkg,
 		},
+		{
+			purl:     "pkg:nix/glibc@2.34?hash=h0cnbmfcn93xm5dg2x27ixhag1cwndga",
+			expected: NixPkg,
+		},
 	}
 
 	var pkgTypes []string

diff --git a/test/integration/catalog_packages_cases_test.go b/test/integration/catalog_packages_cases_test.go
@@ -390,4 +390,11 @@ var commonTestCases = []testCase{
 			"example-jenkins-plugin": "1.0-SNAPSHOT",
 		},
 	},
+	{
+		name:    "find nix store packages",
+		pkgType: pkg.NixPkg,
+		pkgInfo: map[string]string{
+			"glibc": "2.34-210",
+		},
+	},
 }
diff --git a/...rage/pkgs/nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/share/man/glibc.1 b/...rage/pkgs/nix/store/h0cnbmfcn93xm5dg2x27ixhag1cwndga-glibc-2.34-210-bin/share/man/glibc.1
@@ -0,0 +1 @@
+the man pages