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

arrange power-user tasks ahead of parsing the source image

Browse Source 
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
Alex Goodman 2021-03-23 10:29:38 -04:00
parent 77e4c89a5a
commit 0e9c1c1d86
No known key found for this signature in database
GPG Key ID: 5CB45AE22BAB7EA7
2 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/power_user.go
View File

@ -72,6 +72,12 @@ func powerUserExecWorker(userInput string) <-chan error {
go func() {
defer close(errs)
tasks, err := powerUserTasks()
if err != nil {
errs <- err
return
}
checkForApplicationUpdate()
src, cleanup, err := source.New(userInput)
@ -90,14 +96,9 @@ func powerUserExecWorker(userInput string) <-chan error {
SourceMetadata: src.Metadata,
ApplicationConfig: *appConfig,
}
tasks, err := powerUserTasks(src)
if err != nil {
errs <- err
return
}
for _, task := range tasks {
if err = task(&analysisResults); err != nil {
if err = task(&analysisResults, src); err != nil {
errs <- err
return
}

67
cmd/power_user_tasks.go
View File

@ -7,41 +7,36 @@ import (
"github.com/anchore/syft/syft/source"
)
type powerUserTask func(*poweruser.JSONDocumentConfig) error
type powerUserTask func(*poweruser.JSONDocumentConfig, source.Source) error
func powerUserTasks(src source.Source) ([]powerUserTask, error) {
func powerUserTasks() ([]powerUserTask, error) {
var tasks []powerUserTask
var err error
var task powerUserTask
task = catalogPackagesTask(src)
generators := []func() (powerUserTask, error){
catalogPackagesTask,
catalogFileMetadataTask,
catalogFileDigestTask,
}
for _, generator := range generators {
task, err := generator()
if err != nil {
return nil, err
}
if task != nil {
tasks = append(tasks, task)
}
task, err = catalogFileMetadataTask(src)
if err != nil {
return nil, err
} else if task != nil {
tasks = append(tasks, task)
}
task, err = catalogFileDigestTask(src)
if err != nil {
return nil, err
} else if task != nil {
tasks = append(tasks, task)
}
return tasks, nil
}
func catalogPackagesTask(src source.Source) powerUserTask {
func catalogPackagesTask() (powerUserTask, error) {
if !appConfig.Package.Cataloger.Enabled {
return nil
return nil, nil
}
task := func(results *poweruser.JSONDocumentConfig) error {
task := func(results *poweruser.JSONDocumentConfig, src source.Source) error {
packageCatalog, theDistro, err := syft.CatalogPackages(src, appConfig.Package.Cataloger.ScopeOpt)
if err != nil {
return err
@ -53,21 +48,23 @@ func catalogPackagesTask(src source.Source) powerUserTask {
return nil
}
return task
return task, nil
}
func catalogFileMetadataTask(src source.Source) (powerUserTask, error) {
func catalogFileMetadataTask() (powerUserTask, error) {
if !appConfig.FileMetadata.Cataloger.Enabled {
return nil, nil
}
metadataCataloger := file.NewMetadataCataloger()
task := func(results *poweruser.JSONDocumentConfig, src source.Source) error {
resolver, err := src.FileResolver(appConfig.FileMetadata.Cataloger.ScopeOpt)
if err != nil {
return nil, err
return err
}
task := func(results *poweruser.JSONDocumentConfig) error {
result, err := file.NewMetadataCataloger(resolver).Catalog()
result, err := metadataCataloger.Catalog(resolver)
if err != nil {
return err
}
@ -78,23 +75,23 @@ func catalogFileMetadataTask(src source.Source) (powerUserTask, error) {
return task, nil
}
func catalogFileDigestTask(src source.Source) (powerUserTask, error) {
func catalogFileDigestTask() (powerUserTask, error) {
if !appConfig.FileMetadata.Cataloger.Enabled {
return nil, nil
}
digestsCataloger, err := file.NewDigestsCataloger(appConfig.FileMetadata.Digests)
if err != nil {
return nil, err
}
task := func(results *poweruser.JSONDocumentConfig, src source.Source) error {
resolver, err := src.FileResolver(appConfig.FileMetadata.Cataloger.ScopeOpt)
if err != nil {
return nil, err
return err
}
cataloger, err := file.NewDigestsCataloger(resolver, appConfig.FileMetadata.Digests)
if err != nil {
return nil, err
}
task := func(results *poweruser.JSONDocumentConfig) error {
result, err := cataloger.Catalog()
result, err := digestsCataloger.Catalog(resolver)
if err != nil {
return err
}