feat: change flag name from skip-deep to skip images

Signed-off-by: chenk <[email protected]>
aquasecurity · Apr 3, 2024 · 0f79a25 · 0f79a25
1 parent 000cb88
commit 0f79a25
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/docs/docs/references/configuration/cli/trivy_kubernetes.md b/docs/docs/references/configuration/cli/trivy_kubernetes.md
@@ -89,9 +89,9 @@ trivy kubernetes [flags] { cluster | all | specific resources like kubectl. eg:
   -s, --severity strings                  severities of security issues to be displayed (UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL) (default [UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL])
       --show-suppressed                   [EXPERIMENTAL] show suppressed vulnerabilities
       --skip-db-update                    skip updating vulnerability database
-      --skip-deep                         skip the deep scan of the resources
       --skip-dirs strings                 specify the directories or glob patterns to skip
       --skip-files strings                specify the files or glob patterns to skip
+      --skip-images                       skip the scanning of images in the resources
       --skip-java-db-update               skip updating Java index database
       --skip-policy-update                skip fetching rego policy updates
   -t, --template string                   output template

diff --git a/pkg/flag/kubernetes_flags.go b/pkg/flag/kubernetes_flags.go
@@ -69,10 +69,10 @@ var (
 		ConfigName: "kubernetes.exclude.owned",
 		Usage:      "exclude resources that have an owner reference",
 	}
-	SkipDeep = Flag[bool]{
-		Name:       "skip-deep",
-		ConfigName: "kubernetes.skip.deep",
-		Usage:      "skip the deep scan of the resources",
+	SkipImages = Flag[bool]{
+		Name:       "skip-images",
+		ConfigName: "kubernetes.skip.images",
+		Usage:      "skip the scanning of images in the resources",
 	}
 	ExcludeNodes = Flag[[]string]{
 		Name:       "exclude-nodes",
@@ -110,7 +110,7 @@ type K8sFlagGroup struct {
 	AllNamespaces          *Flag[bool]
 	NodeCollectorNamespace *Flag[string]
 	ExcludeOwned           *Flag[bool]
-	SkipDeep               *Flag[bool]
+	SkipImages             *Flag[bool]
 	ExcludeNodes           *Flag[[]string]
 	QPS                    *Flag[float64]
 	Burst                  *Flag[int]
@@ -129,7 +129,7 @@ type K8sOptions struct {
 	ExcludeOwned           bool
 	ExcludeNodes           map[string]string
 	QPS                    float32
-	SkipDeep               bool
+	SkipImages             bool
 	Burst                  int
 }
 
@@ -147,7 +147,7 @@ func NewK8sFlagGroup() *K8sFlagGroup {
 		ExcludeNodes:           ExcludeNodes.Clone(),
 		NodeCollectorImageRef:  NodeCollectorImageRef.Clone(),
 		QPS:                    QPS.Clone(),
-		SkipDeep:               SkipDeep.Clone(),
+		SkipImages:             SkipImages.Clone(),
 		Burst:                  Burst.Clone(),
 	}
 }
@@ -170,7 +170,7 @@ func (f *K8sFlagGroup) Flags() []Flagger {
 		f.ExcludeNodes,
 		f.NodeCollectorImageRef,
 		f.QPS,
-		f.SkipDeep,
+		f.SkipImages,
 		f.Burst,
 	}
 }
@@ -208,7 +208,7 @@ func (f *K8sFlagGroup) ToOptions() (K8sOptions, error) {
 		ExcludeNodes:           exludeNodeLabels,
 		NodeCollectorImageRef:  f.NodeCollectorImageRef.Value(),
 		QPS:                    float32(f.QPS.Value()),
-		SkipDeep:               f.SkipDeep.Value(),
+		SkipImages:             f.SkipImages.Value(),
 		Burst:                  f.Burst.Value(),
 	}, nil
 }

diff --git a/pkg/k8s/scanner/scanner.go b/pkg/k8s/scanner/scanner.go
@@ -98,7 +98,7 @@ func (s *Scanner) Scan(ctx context.Context, artifactsData []*artifacts.Artifact)
 
 	onItem := func(ctx context.Context, artifact *artifacts.Artifact) (scanResult, error) {
 		scanResults := scanResult{}
-		if s.opts.Scanners.AnyEnabled(types.VulnerabilityScanner, types.SecretScanner) && !s.opts.SkipDeep {
+		if s.opts.Scanners.AnyEnabled(types.VulnerabilityScanner, types.SecretScanner) && !s.opts.SkipImages {
 			opts := s.opts
 			opts.Credentials = make([]ftypes.Credential, len(s.opts.Credentials))
 			copy(opts.Credentials, s.opts.Credentials)