gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-22 23:26:39 -08:00
Code Issues Packages Projects Releases Wiki Activity

BREAKING: support exclude kinds/namespaces and include kinds/namespaces (#6323)

Browse Source 
Signed-off-by: chenk <hen.keinan@gmail.com>
This commit is contained in:
chenk
2024-04-27 17:30:17 +03:00
committed by GitHub
parent 2d090ef2df
commit 060d0bb641
12 changed files with 129 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/k8s/commands/run.go
View File

@@ -20,48 +20,30 @@ import (
"github.com/aquasecurity/trivy/pkg/types"
)
const (
clusterArtifact = "cluster"
allArtifact = "all"
)
// Run runs a k8s scan
func Run(ctx context.Context, args []string, opts flag.Options) error {
ctx, cancel := context.WithTimeout(ctx, opts.Timeout)
defer cancel()
ctx = log.WithContextPrefix(ctx, "k8s")
cluster, err := k8s.GetCluster(
k8s.WithContext(opts.K8sOptions.ClusterContext),
clusterOptions := []k8s.ClusterOption{
k8s.WithKubeConfig(opts.K8sOptions.KubeConfig),
k8s.WithBurst(opts.K8sOptions.Burst),
k8s.WithQPS(opts.K8sOptions.QPS),
)
}
if len(args) > 0 {
clusterOptions = append(clusterOptions, k8s.WithContext(args[0]))
}
cluster, err := k8s.GetCluster(clusterOptions...)
if err != nil {
return xerrors.Errorf("failed getting k8s cluster: %w", err)
}
ctx, cancel := context.WithTimeout(ctx, opts.Timeout)
defer func() {
cancel()
if errors.Is(err, context.DeadlineExceeded) {
log.Warn("Increase --timeout value")
log.WarnContext(ctx, "Increase --timeout value")
}
}()
opts.K8sVersion = cluster.GetClusterVersion()
switch args[0] {
case clusterArtifact:
return clusterRun(ctx, opts, cluster)
case allArtifact:
if opts.Format == types.FormatCycloneDX {
return xerrors.Errorf("KBOM with CycloneDX format is not supported for all namespace scans")
}
return namespaceRun(ctx, opts, cluster)
default: // resourceArtifact
if opts.Format == types.FormatCycloneDX {
return xerrors.Errorf("KBOM with CycloneDX format is not supported for resource scans")
}
return resourceRun(ctx, args, opts, cluster)
}
return clusterRun(ctx, opts, cluster)
}
type runner struct {
@@ -71,8 +53,8 @@ type runner struct {
func newRunner(flagOpts flag.Options, cluster string) *runner {
return &runner{
flagOpts: flagOpts,
cluster: cluster,
flagOpts,
cluster,
}
}
@@ -86,7 +68,7 @@ func (r *runner) run(ctx context.Context, artifacts []*k8sArtifacts.Artifact) er
}
defer func() {
if err := runner.Close(ctx); err != nil {
log.ErrorContext(ctx, "Failed to close runner", log.Err(err))
log.ErrorContext(ctx, "failed to close runner: %s", err)
}
}()