feat: change flag name to disable-node-collector

Signed-off-by: chenk <[email protected]>
chen-keinan · Apr 15, 2024 · 660c113 · 660c113
1 parent 7e8c80d
commit 660c113
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/pkg/flag/kubernetes_flags.go b/pkg/flag/kubernetes_flags.go
@@ -45,9 +45,9 @@ var (
 		Shorthand:  "A",
 		Usage:      "fetch resources from all cluster namespaces",
 	}
-	NonIntrusive = Flag[bool]{
-		Name:       "non-intrusive",
-		ConfigName: "kubernetes.non.intrusive",
+	DisableNodeCollector = Flag[bool]{
+		Name:       "disable-node-collector",
+		ConfigName: "kubernetes.disable.node.collector",
 		Usage:      "When the flag is activated, the node-collector job will not be executed, thus skipping misconfiguration findings on the node.",
 	}
 	NodeCollectorNamespace = Flag[string]{
@@ -92,7 +92,7 @@ type K8sFlagGroup struct {
 	KubeConfig             *Flag[string]
 	K8sVersion             *Flag[string]
 	Tolerations            *Flag[[]string]
-	NonIntrusive           *Flag[bool]
+	DisableNodeCollector   *Flag[bool]
 	NodeCollectorImageRef  *Flag[string]
 	AllNamespaces          *Flag[bool]
 	NodeCollectorNamespace *Flag[string]
@@ -112,7 +112,7 @@ type K8sOptions struct {
 	AllNamespaces          bool
 	NodeCollectorNamespace string
 	ExcludeOwned           bool
-	NonIntrusive           bool
+	DisableNodeCollector   bool
 	ExcludeNodes           map[string]string
 	QPS                    float32
 	Burst                  int
@@ -125,7 +125,7 @@ func NewK8sFlagGroup() *K8sFlagGroup {
 		KubeConfig:             KubeConfigFlag.Clone(),
 		K8sVersion:             K8sVersionFlag.Clone(),
 		Tolerations:            TolerationsFlag.Clone(),
-		NonIntrusive:           NonIntrusive.Clone(),
+		DisableNodeCollector:   DisableNodeCollector.Clone(),
 		AllNamespaces:          AllNamespaces.Clone(),
 		NodeCollectorNamespace: NodeCollectorNamespace.Clone(),
 		ExcludeOwned:           ExcludeOwned.Clone(),
@@ -146,7 +146,7 @@ func (f *K8sFlagGroup) Flags() []Flagger {
 		f.Namespace,
 		f.KubeConfig,
 		f.K8sVersion,
-		f.NonIntrusive,
+		f.DisableNodeCollector,
 		f.Tolerations,
 		f.AllNamespaces,
 		f.NodeCollectorNamespace,
@@ -184,7 +184,7 @@ func (f *K8sFlagGroup) ToOptions() (K8sOptions, error) {
 		KubeConfig:             f.KubeConfig.Value(),
 		K8sVersion:             f.K8sVersion.Value(),
 		Tolerations:            tolerations,
-		NonIntrusive:           f.NonIntrusive.Value(),
+		DisableNodeCollector:   f.DisableNodeCollector.Value(),
 		AllNamespaces:          f.AllNamespaces.Value(),
 		NodeCollectorNamespace: f.NodeCollectorNamespace.Value(),
 		ExcludeOwned:           f.ExcludeOwned.Value(),

diff --git a/pkg/flag/options.go b/pkg/flag/options.go
@@ -361,7 +361,7 @@ func (o *Options) Align() {
 
 	// Vulnerability scanning is disabled by default for CycloneDX.
 	if o.Format == types.FormatCycloneDX && !viper.IsSet(ScannersFlag.ConfigName) {
-		log.Logger.Info(`"--format cyclonedx" disables security scanning. Specify "--scanners vuln" explicitly if you want to include vulnerabilities in the CycloneDX report.`)
+		log.Info(`"--format cyclonedx" disables security scanning. Specify "--scanners vuln" explicitly if you want to include vulnerabilities in the CycloneDX report.`)
 		o.Scanners = nil
 	}
 }

diff --git a/pkg/k8s/commands/cluster.go b/pkg/k8s/commands/cluster.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 
 	k8sArtifacts "github.com/aquasecurity/trivy-kubernetes/pkg/artifacts"
@@ -18,7 +17,6 @@ import (
 func clusterRun(ctx context.Context, opts flag.Options, cluster k8s.Cluster) error {
 	// TODO: replace with log.Logger
 	logger, _ := zap.NewProduction()
-
 	if err := validateReportArguments(opts); err != nil {
 		return err
 	}
@@ -31,13 +29,9 @@ func clusterRun(ctx context.Context, opts flag.Options, cluster k8s.Cluster) err
 			return xerrors.Errorf("get k8s artifacts with node info error: %w", err)
 		}
 	case types.FormatJSON, types.FormatTable:
-<<<<<<< HEAD
-		if opts.Scanners.AnyEnabled(types.MisconfigScanner) && !opts.SkipIntrusive {
+
+		if opts.Scanners.AnyEnabled(types.MisconfigScanner) && !opts.DisableNodeCollector {
 			artifacts, err = trivyk8s.New(cluster, logger.Sugar(), trivyk8s.WithExcludeOwned(opts.ExcludeOwned)).ListArtifactAndNodeInfo(ctx,
-=======
-		if opts.Scanners.AnyEnabled(types.MisconfigScanner) && !opts.NonIntrusive {
-			artifacts, err = trivyk8s.New(cluster, log.Logger, trivyk8s.WithExcludeOwned(opts.ExcludeOwned)).ListArtifactAndNodeInfo(ctx,
->>>>>>> 1d05c3394 (feat: change flag name from skip-intrusive to non-intrusive)
 				trivyk8s.WithScanJobNamespace(opts.NodeCollectorNamespace),
 				trivyk8s.WithIgnoreLabels(opts.ExcludeNodes),
 				trivyk8s.WithScanJobImageRef(opts.NodeCollectorImageRef),
@@ -55,9 +49,9 @@ func clusterRun(ctx context.Context, opts flag.Options, cluster k8s.Cluster) err
 		return xerrors.Errorf(`unknown format %q. Use "json" or "table" or "cyclonedx"`, opts.Format)
 	}
 
-	if !opts.NonIntrusive && !opts.Quiet {
-		log.Logger.Info("Node scanning is enabled")
-		log.Logger.Info("If you want to disable Node scanning via an in-cluster Job, please try '--non-intrusive' to disable the Node-Collector job.")
+	if !opts.DisableNodeCollector && !opts.Quiet {
+		logger.Sugar().Info("Node scanning is enabled")
+		logger.Sugar().Info("If you want to disable Node scanning via an in-cluster Job, please try '--disable-node-collector' to disable the Node-Collector job.")
 	}
 	runner := newRunner(opts, cluster.GetCurrentContext())
 	return runner.run(ctx, artifacts)