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

refactor: rename security-checks to scanners (#3467)

Browse Source
This commit is contained in:
Teppei Fukuda
2023-01-23 16:53:06 +02:00
committed by GitHub
parent aaf845d02e
commit e1076085d9
53 changed files with 1100 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,10 @@ type runner struct {
}
func newRunner(flagOpts flag.Options, cluster string) *runner {
return &runner{flagOpts, cluster}
return &runner{
flagOpts,
cluster,
}
}
func (r *runner) run(ctx context.Context, artifacts []*artifacts.Artifact) error {
@@ -90,11 +93,11 @@ func (r *runner) run(ctx context.Context, artifacts []*artifacts.Artifact) error
if err = yaml.Unmarshal(cs, &complianceSpec); err != nil {
return xerrors.Errorf("yaml unmarshal error: %w", err)
}
securityChecks, err := complianceSpec.SecurityChecks()
scanners, err := complianceSpec.Scanners()
if err != nil {
return xerrors.Errorf("security check error: %w", err)
return xerrors.Errorf("scanner error: %w", err)
}
r.flagOpts.ScanOptions.SecurityChecks = securityChecks
r.flagOpts.ScanOptions.Scanners = scanners
}
rpt, err := s.Scan(ctx, artifacts)
@@ -117,16 +120,17 @@ func (r *runner) run(ctx context.Context, artifacts []*artifacts.Artifact) error
return cr.Write(complianceReport, cr.Option{
Format: r.flagOpts.Format,
Report: r.flagOpts.ReportFormat,
Output: r.flagOpts.Output})
Output: r.flagOpts.Output,
})
}
if err := report.Write(rpt, report.Option{
Format: r.flagOpts.Format,
Report: r.flagOpts.ReportFormat,
Output: r.flagOpts.Output,
Severities: r.flagOpts.Severities,
Components: r.flagOpts.Components,
SecurityChecks: r.flagOpts.ScanOptions.SecurityChecks,
Format: r.flagOpts.Format,
Report: r.flagOpts.ReportFormat,
Output: r.flagOpts.Output,
Severities: r.flagOpts.Severities,
Components: r.flagOpts.Components,
Scanners: r.flagOpts.ScanOptions.Scanners,
}); err != nil {
return xerrors.Errorf("unable to write results: %w", err)
}