upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-04-22 22:59:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor retry for scanner download

Browse source
This commit is contained in:
Anurag Sharma 2026-03-20 12:21:38 +05:30
parent 79d6e3f7ba
commit b7f4440749
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
provisioner/hcp-sbom/provisioner.go
View file

@ -452,32 +452,30 @@ func (p *Provisioner) getUserDestination() (string, error) {
return dst, nil
}
// downloadAndVerifyScanner is the retry callback for downloading and verifying the scanner binary.
// downloadAndVerifyScanner downloads and verifies the scanner binary.
// It performs atomic download + checksum verification to ensure consistency.
func (p *Provisioner) downloadAndVerifyScanner(
ctx context.Context, ui packersdk.Ui, osType, osArch string, scannerPath *string,
) func(context.Context) error {
return func(ctx context.Context) error {
// Download the scanner
path, err := p.downloadScanner(ctx, ui, osType, osArch)
if err != nil {
log.Printf("[WARN] Scanner download failed, will retry: %s", err)
) error {
// Download the scanner
path, err := p.downloadScanner(ctx, ui, osType, osArch)
if err != nil {
log.Printf("[WARN] Scanner download failed, will retry: %s", err)
return err
}
// Verify checksum if provided (part of atomic operation)
if p.config.ScannerChecksum != "" {
if err := p.verifyChecksum(path); err != nil {
log.Printf("[WARN] Checksum verification failed, will retry: %s", err)
_ = os.Remove(path) // Clean up failed download, ignore error
return err
}
// Verify checksum if provided (part of atomic operation)
if p.config.ScannerChecksum != "" {
if err := p.verifyChecksum(path); err != nil {
log.Printf("[WARN] Checksum verification failed, will retry: %s", err)
_ = os.Remove(path) // Clean up failed download, ignore error
return err
}
log.Printf("[INFO] Checksum verification passed")
}
*scannerPath = path
return nil
log.Printf("[INFO] Checksum verification passed")
}
*scannerPath = path
return nil
}
// provisionWithNativeGeneration handles the new native SBOM generation flow
@ -494,7 +492,9 @@ func (p *Provisioner) provisionWithNativeGeneration(
err := retry.Config{
Tries: 3,
RetryDelay: func() time.Duration { return 10 * time.Second },
}.Run(ctx, p.downloadAndVerifyScanner(ctx, ui, osType, osArch, &scannerLocalPath))
}.Run(ctx, func(ctx context.Context) error {
return p.downloadAndVerifyScanner(ctx, ui, osType, osArch, &scannerLocalPath)
})
if err != nil {
return fmt.Errorf("failed to download and verify scanner after retries: %s", err)