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

fix: lock downloading policies and database (#4017)

Browse Source
This commit is contained in:
Teppei Fukuda
2023-04-10 15:37:13 +03:00
committed by GitHub
parent 009675c825
commit f0df725c5a
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/commands/artifact/run.go
View File

@@ -126,7 +126,7 @@ func NewRunner(ctx context.Context, cliOptions flag.Options, opts ...runnerOptio
}
// Update the vulnerability database if needed.
if err := r.initDB(cliOptions); err != nil {
if err := r.initDB(ctx, cliOptions); err != nil {
return nil, xerrors.Errorf("DB error: %w", err)
}
@@ -302,7 +302,7 @@ func (r *runner) Report(opts flag.Options, report types.Report) error {
return nil
}
func (r *runner) initDB(opts flag.Options) error {
func (r *runner) initDB(ctx context.Context, opts flag.Options) error {
if err := r.initJavaDB(opts); err != nil {
return err
}
@@ -314,7 +314,7 @@ func (r *runner) initDB(opts flag.Options) error {
// download the database file
noProgress := opts.Quiet || opts.NoProgress
if err := operation.DownloadDB(opts.AppVersion, opts.CacheDir, opts.DBRepository, noProgress, opts.SkipDBUpdate, opts.Remote()); err != nil {
if err := operation.DownloadDB(ctx, opts.AppVersion, opts.CacheDir, opts.DBRepository, noProgress, opts.SkipDBUpdate, opts.Remote()); err != nil {
return err
}