Skip to content

Commit

Permalink
Merge pull request #1700 from SaschaSchwarze0/sascha-retry-trivy
Browse files Browse the repository at this point in the history
Retry trivy when it fails to download the vulnerability database due to rate-limiting
  • Loading branch information
openshift-merge-bot[bot] authored Oct 28, 2024
2 parents 22cce02 + caaac89 commit 84aa01c
Showing 1 changed file with 26 additions and 6 deletions.
32 changes: 26 additions & 6 deletions pkg/image/vulnerability_scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"os/exec"
"sort"
"strings"
"time"

"github.com/google/go-containerregistry/pkg/authn"
buildapi "github.com/shipwright-io/build/pkg/apis/build/v1beta1"
Expand Down Expand Up @@ -51,14 +52,33 @@ func RunVulnerabilityScan(ctx context.Context, imagePath string, settings builda
}
}

cmd := exec.CommandContext(ctx, "trivy", trivyArgs...)
var result []byte
var err error

cmd.Stdin = nil
for i := 0; i < 10; i++ {
cmd := exec.CommandContext(ctx, "trivy", trivyArgs...)
cmd.Stdin = nil

result, err := cmd.CombinedOutput()
if err != nil {
log.Printf("failed to run trivy:\n%s", string(result))
return nil, fmt.Errorf("failed to run trivy: %w", err)
result, err = cmd.CombinedOutput()
if err == nil {
break
}

sResult := string(result)
log.Printf("failed to run trivy:\n%s", sResult)

// Retry the following errors
//
// FATAL Fatal error init error: DB error: failed to download vulnerability DB: database download error: OCI repository error: 1 error occurred:
// 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") {
log.Println("Will retry")
time.Sleep(time.Second)
} else {
return nil, fmt.Errorf("failed to run trivy: %w", err)
}
}

var trivyResult TrivyResult
Expand Down

0 comments on commit 84aa01c

Please sign in to comment.