Skip to content

fix: explicitly handle exhausted Trivy retries #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yashh56 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

fix: explicitly handle exhausted Trivy retries #2339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pkg/image/vulnerability_scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,20 @@ func RunVulnerabilityScan(ctx context.Context, imagePath string, settings builda
// GET https://ghcr.io/v2/aquasecurity/trivy-db/manifests/2: TOOMANYREQUESTS: retry-after: 508.904┬Ás, allowed: 44000/minute
//
// FATAL Fatal error init error: DB error: failed to download vulnerability DB: OCI artifact error: failed to download vulnerability DB: failed to download artifact from any source
if i < 10 && strings.Contains(sResult, "failed to download vulnerability DB") {
if strings.Contains(sResult, "failed to download vulnerability DB") {
log.Println("Will retry")
time.Sleep(time.Second)
} else {
return nil, fmt.Errorf("failed to run trivy: %w", err)
}
}

// All retry attempts were exhausted return the underlying Trivy error
// rather than falling through to json.Unmarshal with error output.
if err != nil {
return nil, fmt.Errorf("failed to run trivy: %w", err)
}

var trivyResult TrivyResult
if err := json.Unmarshal(result, &trivyResult); err != nil {
return nil, err
Expand Down