diff --git a/syft/pkg/cataloger/cataloger.go b/syft/pkg/cataloger/cataloger.go index c4eaa485072..1c25e48ac64 100644 --- a/syft/pkg/cataloger/cataloger.go +++ b/syft/pkg/cataloger/cataloger.go @@ -49,7 +49,6 @@ func ImageCatalogers(cfg Config) []pkg.Cataloger { java.NewJavaCataloger(cfg.Java()), java.NewNativeImageCataloger(), javascript.NewPackageCataloger(), - kernel.NewLinuxKernelCataloger(cfg.Kernel()), nix.NewStoreCataloger(), php.NewComposerInstalledCataloger(), portage.NewPortageCataloger(), @@ -80,7 +79,6 @@ func DirectoryCatalogers(cfg Config) []pkg.Cataloger { java.NewJavaPomCataloger(), java.NewNativeImageCataloger(), javascript.NewLockCataloger(), - kernel.NewLinuxKernelCataloger(cfg.Kernel()), nix.NewStoreCataloger(), php.NewComposerLockCataloger(), portage.NewPortageCataloger(), diff --git a/test/cli/packages_cmd_test.go b/test/cli/packages_cmd_test.go index 53e4d20e371..08ce77a1798 100644 --- a/test/cli/packages_cmd_test.go +++ b/test/cli/packages_cmd_test.go @@ -96,7 +96,7 @@ func TestPackagesCmdFlags(t *testing.T) { name: "squashed-scope-flag", args: []string{"packages", "-o", "json", "-s", "squashed", coverageImage}, assertions: []traitAssertion{ - assertPackageCount(37), + assertPackageCount(35), assertSuccessfulReturnCode, }, }, @@ -213,7 +213,7 @@ func TestPackagesCmdFlags(t *testing.T) { // the application config in the log matches that of what we expect to have been configured. assertInOutput("parallelism: 2"), assertInOutput("parallelism=2"), - assertPackageCount(37), + assertPackageCount(35), assertSuccessfulReturnCode, }, }, @@ -224,7 +224,7 @@ func TestPackagesCmdFlags(t *testing.T) { // the application config in the log matches that of what we expect to have been configured. assertInOutput("parallelism: 1"), assertInOutput("parallelism=1"), - assertPackageCount(37), + assertPackageCount(35), assertSuccessfulReturnCode, }, }, @@ -238,7 +238,7 @@ func TestPackagesCmdFlags(t *testing.T) { assertions: []traitAssertion{ assertNotInOutput("secret_password"), assertNotInOutput("secret_key_path"), - assertPackageCount(37), + assertPackageCount(35), assertSuccessfulReturnCode, }, }, diff --git a/test/integration/catalog_packages_cases_test.go b/test/integration/catalog_packages_cases_test.go index a7cbaf02dc8..bc3acbdf2fd 100644 --- a/test/integration/catalog_packages_cases_test.go +++ b/test/integration/catalog_packages_cases_test.go @@ -11,20 +11,6 @@ type testCase struct { } var imageOnlyTestCases = []testCase{ - { - name: "find kernel packages", - pkgType: pkg.LinuxKernelPkg, - pkgInfo: map[string]string{ - "linux-kernel": "6.0.7-301.fc37.x86_64", - }, - }, - { - name: "find kernel module packages", - pkgType: pkg.LinuxKernelModulePkg, - pkgInfo: map[string]string{ - "ttynull": "", - }, - }, { name: "find gemspec packages", pkgType: pkg.GemPkg, diff --git a/test/integration/catalog_packages_test.go b/test/integration/catalog_packages_test.go index 7819889385f..8b65ed9a9ba 100644 --- a/test/integration/catalog_packages_test.go +++ b/test/integration/catalog_packages_test.go @@ -91,6 +91,8 @@ func TestPkgCoverageImage(t *testing.T) { definedPkgs.Remove(string(pkg.HackagePkg)) definedPkgs.Remove(string(pkg.BinaryPkg)) definedPkgs.Remove(string(pkg.HexPkg)) + definedPkgs.Remove(string(pkg.LinuxKernelPkg)) + definedPkgs.Remove(string(pkg.LinuxKernelModulePkg)) var cases []testCase cases = append(cases, commonTestCases...) @@ -220,9 +222,9 @@ func TestPkgCoverageDirectory(t *testing.T) { definedLanguages.Remove(pkg.UnknownLanguage.String()) observedPkgs.Remove(string(pkg.UnknownPkg)) definedPkgs.Remove(string(pkg.BinaryPkg)) - definedPkgs.Remove(string(pkg.UnknownPkg)) definedPkgs.Remove(string(pkg.LinuxKernelPkg)) definedPkgs.Remove(string(pkg.LinuxKernelModulePkg)) + definedPkgs.Remove(string(pkg.UnknownPkg)) // for directory scans we should not expect to see any of the following package types definedPkgs.Remove(string(pkg.KbPkg))