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

cmd: add note about panic when img is nil

Browse Source 
Signed-off-by: Alfredo Deza <adeza@anchore.com>
This commit is contained in:
Alfredo Deza 2020-06-30 09:24:22 -04:00
parent ec52e91301
commit feef7e28dc
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/root.go
View File

@ -23,8 +23,8 @@ var rootCmd = &cobra.Command{
Supports the following image sources: Supports the following image sources:
{{.appName}} yourrepo/yourimage:tag defaults to using images from a docker daemon {{.appName}} yourrepo/yourimage:tag defaults to using images from a docker daemon
{{.appName}} docker://yourrepo/yourimage:tag explicitly use the docker daemon {{.appName}} docker://yourrepo/yourimage:tag explicitly use the docker daemon
{{.appName}} tar://path/to/yourimage.tar use a tarball from disk {{.appName}} tar://path/to/yourimage.tar use a tarball from disk
{{.appName}} dir://path/to/yourproject read directly from a path in disk {{.appName}} dir://path/to/yourproject read directly from a path in disk
`, map[string]interface{}{ `, map[string]interface{}{
"appName": internal.ApplicationName, "appName": internal.ApplicationName,
}), }),
@ -51,27 +51,50 @@ func startWorker(userInput string) <-chan error {
defer close(errs) defer close(errs)
protocol := imgbom.NewProtocol(userInput) protocol := imgbom.NewProtocol(userInput)
fmt.Printf("protocol: %+v", protocol) fmt.Printf("protocol: %+v", protocol)
catalog, err := imgbom.Catalog(protocol, appConfig.ScopeOpt)
if err != nil {
errs <- fmt.Errorf("could not catalog image: %w", err)
}
switch protocol.Type { switch protocol.Type {
case imgbom.DirProtocol: case imgbom.DirProtocol:
log.Info("Cataloging directory") log.Info("Cataloging directory")
catalog, err := imgbom.CatalogDir(protocol.Value, appConfig.ScopeOpt)
if err != nil {
errs <- fmt.Errorf("could not produce catalog: %w", err)
}
bus.Publish(partybus.Event{ bus.Publish(partybus.Event{
Type: event.CatalogerFinished, Type: event.CatalogerFinished,
Value: presenter.GetDirPresenter(appConfig.PresenterOpt, catalog), Value: presenter.GetDirPresenter(appConfig.PresenterOpt, protocol.Value, catalog),
}) })
default: default:
log.Info("Cataloging image")
log.Infof("Fetching image '%s'", userInput) log.Infof("Fetching image '%s'", userInput)
img, err := stereoscope.GetImage(userInput) img, err := stereoscope.GetImage(userInput)
if err != nil {
if err != nil || img == nil {
errs <- fmt.Errorf("could not fetch image '%s': %w", userInput, err) errs <- fmt.Errorf("could not fetch image '%s': %w", userInput, err)
// TODO: this needs to be handled better
bus.Publish(partybus.Event{
Type: event.CatalogerFinished,
Value: nil,
})
return
} }
defer stereoscope.Cleanup() defer stereoscope.Cleanup()
log.Info("Identifying Distro")
distro := imgbom.IdentifyDistro(img)
if distro == nil {
log.Errorf("error identifying distro")
} else {
log.Infof(" Distro: %s", distro)
}
log.Info("Cataloging Image")
catalog, err := imgbom.CatalogImg(img, appConfig.ScopeOpt)
if err != nil {
errs <- fmt.Errorf("could not produce catalog: %w", err)
}
bus.Publish(partybus.Event{ bus.Publish(partybus.Event{
Type: event.CatalogerFinished, Type: event.CatalogerFinished,
Value: presenter.GetImgPresenter(appConfig.PresenterOpt, img, catalog), Value: presenter.GetImgPresenter(appConfig.PresenterOpt, img, catalog),
@ -87,5 +110,4 @@ func doRunCmd(_ *cobra.Command, args []string) int {
ux := ui.Select(appConfig.CliOptions.Verbosity > 0, appConfig.Quiet) ux := ui.Select(appConfig.CliOptions.Verbosity > 0, appConfig.Quiet)
return ux(errs, eventSubscription) return ux(errs, eventSubscription)
} }