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

cmd: do not pass img around, use scope

Browse Source 
Signed-off-by: Alfredo Deza <adeza@anchore.com>
This commit is contained in:
Alfredo Deza 2020-07-07 16:45:44 -04:00
parent 66a16a67fd
commit 6cbf6d3409
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/root.go
View File

@ -7,6 +7,7 @@ import (
"github.com/anchore/imgbom/imgbom" "github.com/anchore/imgbom/imgbom"
"github.com/anchore/imgbom/imgbom/event" "github.com/anchore/imgbom/imgbom/event"
"github.com/anchore/imgbom/imgbom/presenter" "github.com/anchore/imgbom/imgbom/presenter"
"github.com/anchore/imgbom/imgbom/scope"
"github.com/anchore/imgbom/internal" "github.com/anchore/imgbom/internal"
"github.com/anchore/imgbom/internal/bus" "github.com/anchore/imgbom/internal/bus"
"github.com/anchore/imgbom/internal/log" "github.com/anchore/imgbom/internal/log"
@ -52,19 +53,17 @@ func startWorker(userInput string) <-chan error {
protocol := imgbom.NewProtocol(userInput) protocol := imgbom.NewProtocol(userInput)
log.Debugf("protocol: %+v", protocol) log.Debugf("protocol: %+v", protocol)
var s scope.Scope
var err error
switch protocol.Type { switch protocol.Type {
case imgbom.DirProtocol: case imgbom.DirProtocol:
// populate the scope object for dir
log.Info("Cataloging directory") s, err = imgbom.GetScopeFromDir(protocol.Value, appConfig.ScopeOpt)
catalog, err := imgbom.CatalogDir(protocol.Value, appConfig.ScopeOpt)
if err != nil { if err != nil {
errs <- fmt.Errorf("could not produce catalog: %w", err) errs <- fmt.Errorf("could not populate scope from path (%s): %w", protocol.Value, err)
} }
bus.Publish(partybus.Event{
Type: event.CatalogerFinished,
Value: presenter.GetDirPresenter(appConfig.PresenterOpt, protocol.Value, catalog),
})
default: default:
log.Infof("Fetching image '%s'", userInput) log.Infof("Fetching image '%s'", userInput)
img, err := stereoscope.GetImage(userInput) img, err := stereoscope.GetImage(userInput)
@ -81,25 +80,25 @@ func startWorker(userInput string) <-chan error {
} }
defer stereoscope.Cleanup() defer stereoscope.Cleanup()
log.Info("Identifying Distro") // populate the scope object for image
distro := imgbom.IdentifyDistro(img) s, err = imgbom.GetScopeFromImage(img, appConfig.ScopeOpt)
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 { if err != nil {
errs <- fmt.Errorf("could not produce catalog: %w", err) errs <- fmt.Errorf("could not populate scope with image: %w", err)
} }
bus.Publish(partybus.Event{
Type: event.CatalogerFinished,
Value: presenter.GetImgPresenter(appConfig.PresenterOpt, img, catalog),
})
} }
log.Info("Identifying Distro")
distro := imgbom.IdentifyDistro(s)
if distro == nil {
log.Errorf("error identifying distro")
} else {
log.Infof(" Distro: %s", distro)
}
bus.Publish(partybus.Event{
Type: event.CatalogerFinished,
Value: presenter.GetPresenter(appConfig.PresenterOpt, s),
})
}() }()
return errs return errs
} }