mirror of
https://github.com/aquasecurity/trivy.git
synced 2025-12-23 15:37:50 -08:00
refactor: replace zap with slog (#6466)
Signed-off-by: knqyf263 <knqyf263@gmail.com> Co-authored-by: Nikita Pivkin <nikita.pivkin@smartforce.io> Co-authored-by: simar7 <1254783+simar7@users.noreply.github.com>
This commit is contained in:
@@ -3,24 +3,27 @@ package commands
|
||||
import (
|
||||
"context"
|
||||
|
||||
"go.uber.org/zap"
|
||||
"golang.org/x/xerrors"
|
||||
|
||||
"github.com/aquasecurity/trivy-kubernetes/pkg/k8s"
|
||||
"github.com/aquasecurity/trivy-kubernetes/pkg/trivyk8s"
|
||||
"github.com/aquasecurity/trivy/pkg/flag"
|
||||
"github.com/aquasecurity/trivy/pkg/log"
|
||||
)
|
||||
|
||||
// namespaceRun runs scan on kubernetes cluster
|
||||
func namespaceRun(ctx context.Context, opts flag.Options, cluster k8s.Cluster) error {
|
||||
// TODO: replace with slog.Logger
|
||||
logger, _ := zap.NewProduction()
|
||||
|
||||
if err := validateReportArguments(opts); err != nil {
|
||||
return err
|
||||
}
|
||||
var trivyk trivyk8s.TrivyK8S
|
||||
if opts.AllNamespaces {
|
||||
trivyk = trivyk8s.New(cluster, log.Logger).AllNamespaces()
|
||||
trivyk = trivyk8s.New(cluster, logger.Sugar()).AllNamespaces()
|
||||
} else {
|
||||
trivyk = trivyk8s.New(cluster, log.Logger).Namespace(getNamespace(opts, cluster.GetCurrentNamespace()))
|
||||
trivyk = trivyk8s.New(cluster, logger.Sugar()).Namespace(getNamespace(opts, cluster.GetCurrentNamespace()))
|
||||
}
|
||||
|
||||
artifacts, err := trivyk.ListArtifacts(ctx)
|
||||
|
||||
Reference in New Issue
Block a user