oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 17:03:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: return both failures when failed to retrieve an image with a scheme (#1801)

Browse Source 
Signed-off-by: Idan Frimark <idanf@cisco.com>
This commit is contained in:
Idan Frimark 2023-05-23 17:32:12 +03:00 committed by GitHub
parent 26c201f7f7
commit 087a6356b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
syft/source/source.go
View File

@ -216,13 +216,27 @@ func getImageWithRetryStrategy(in Input, registryOptions *image.RegistryOptions)
// We need to determine the image source again, such that this determination // We need to determine the image source again, such that this determination
// doesn't take scheme parsing into account. // doesn't take scheme parsing into account.
in.ImageSource = image.DetermineDefaultImagePullSource(in.UserInput) in.ImageSource = image.DetermineDefaultImagePullSource(in.UserInput)
img, err = stereoscope.GetImageFromSource(ctx, in.UserInput, in.ImageSource, opts...) img, userInputErr := stereoscope.GetImageFromSource(ctx, in.UserInput, in.ImageSource, opts...)
cleanup = func() { cleanup = func() {
if err := img.Cleanup(); err != nil { if err := img.Cleanup(); err != nil {
log.Warnf("unable to cleanup image=%q: %w", in.UserInput, err) log.Warnf("unable to cleanup image=%q: %w", in.UserInput, err)
} }
} }
return img, cleanup, err if userInputErr != nil {
// Image retrieval failed on both tries, we will want to return both errors.
return nil, nil, fmt.Errorf(
"scheme %q specified; "+
"image retrieval using scheme parsing (%s) was unsuccessful: %v; "+
"image retrieval without scheme parsing (%s) was unsuccessful: %v",
scheme,
in.Location,
err,
in.UserInput,
userInputErr,
)
}
return img, cleanup, nil
} }
func generateDirectorySource(fs afero.Fs, in Input) (*Source, func(), error) { func generateDirectorySource(fs afero.Fs, in Input) (*Source, func(), error) {