refactor: delete ListAllPackages

Since packages are always included and filtered out on the client side, we don't havd to send ListAllPackages to the server. Signed-off-by: knqyf263 <[email protected]>
aquasecurity · May 28, 2024 · bc1c51e · bc1c51e
1 parent 5ff1a3d
commit bc1c51e
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 122 deletions.
diff --git a/pkg/rpc/client/client.go b/pkg/rpc/client/client.go
@@ -84,7 +84,6 @@ func (s Scanner) Scan(ctx context.Context, target, artifactKey string, blobKeys
 			Options: &rpc.ScanOptions{
 				VulnType:          opts.VulnType,
 				Scanners:          xstrings.ToStringSlice(opts.Scanners),
-				ListAllPackages:   opts.ListAllPackages,
 				LicenseCategories: licenseCategories,
 				IncludeDevDeps:    opts.IncludeDevDeps,
 			},

diff --git a/pkg/scanner/local/scan_test.go b/pkg/scanner/local/scan_test.go
@@ -377,9 +377,8 @@ func TestScanner_Scan(t *testing.T) {
 				target:   "./result.cdx",
 				layerIDs: []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
 				options: types.ScanOptions{
-					VulnType:        []string{types.VulnTypeLibrary},
-					Scanners:        types.Scanners{types.VulnerabilityScanner},
-					ListAllPackages: true,
+					VulnType: []string{types.VulnTypeLibrary},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},

diff --git a/pkg/types/scan.go b/pkg/types/scan.go
@@ -26,7 +26,6 @@ type ScanOptions struct {
 	Scanners            Scanners
 	ImageConfigScanners Scanners // Scanners for container image configuration
 	ScanRemovedPackages bool
-	ListAllPackages     bool
 	LicenseCategories   map[types.LicenseCategory][]string
 	FilePatterns        []string
 	IncludeDevDeps      bool

diff --git a/rpc/scanner/service.pb.go b/rpc/scanner/service.pb.go
diff --git a/rpc/scanner/service.proto b/rpc/scanner/service.proto
@@ -25,9 +25,10 @@ message Licenses {
 message ScanOptions {
   repeated string       vuln_type          = 1;
   repeated string       scanners           = 2;
-  bool                  list_all_packages  = 3;
   map<string, Licenses> license_categories = 4;
   bool                  include_dev_deps   = 5;
+
+  reserved 3;  // deleted 'list_all_packages'
 }
 
 message ScanResponse {