revert: --list-all-pkgs

Signed-off-by: knqyf263 <[email protected]>
aquasecurity · May 28, 2024 · 5ff1a3d · 5ff1a3d
1 parent 8e1c970
commit 5ff1a3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkg/flag/report_flags.go b/pkg/flag/report_flags.go
@@ -132,6 +132,7 @@ type ReportOptions struct {
 	ReportFormat     string
 	Template         string
 	DependencyTree   bool
+	ListAllPkgs      bool
 	IgnoreFile       string
 	ExitCode         int
 	ExitOnEOL        int
@@ -141,8 +142,6 @@ type ReportOptions struct {
 	Severities       []dbTypes.Severity
 	Compliance       spec.ComplianceSpec
 	ShowSuppressed   bool
-
-	listAllPkgs bool
 }
 
 func NewReportFlagGroup() *ReportFlagGroup {
@@ -243,7 +242,7 @@ func (f *ReportFlagGroup) ToOptions() (ReportOptions, error) {
 		ReportFormat:     f.ReportFormat.Value(),
 		Template:         template,
 		DependencyTree:   dependencyTree,
-		listAllPkgs:      listAllPkgs,
+		ListAllPkgs:      listAllPkgs,
 		IgnoreFile:       f.IgnoreFile.Value(),
 		ExitCode:         f.ExitCode.Value(),
 		ExitOnEOL:        f.ExitOnEOL.Value(),

diff --git a/pkg/report/writer.go b/pkg/report/writer.go
@@ -57,7 +57,7 @@ func Write(ctx context.Context, report types.Report, option flag.Options) (err e
 	case types.FormatJSON:
 		writer = &JSONWriter{
 			Output:      output,
-			ListAllPkgs: option.Scanners.Enabled(types.SBOMScanner),
+			ListAllPkgs: option.ListAllPkgs,
 		}
 	case types.FormatGitHub:
 		writer = &github.Writer{