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

catalog controller uses scope to determine file resolvers

Browse Source 
Signed-off-by: Alfredo Deza <adeza@anchore.com>
This commit is contained in:
Alfredo Deza 2020-06-29 11:44:03 -04:00
parent faf21a67a6
commit 507a6b69cb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgbom/cataloger/controller.go
View File

@ -29,7 +29,7 @@ func Catalogers() []string {
return c return c
} }
func Catalog(s scope.Scope) (*pkg.Catalog, error) { func Catalog(s scope.FileContentResolver) (*pkg.Catalog, error) {
return controllerInstance.catalog(s) return controllerInstance.catalog(s)
} }
@ -71,7 +71,7 @@ func (c *controller) trackCataloger() (*progress.Manual, *progress.Manual) {
return &filesProcessed, &packagesDiscovered return &filesProcessed, &packagesDiscovered
} }
func (c *controller) catalog(s scope.Scope) (*pkg.Catalog, error) { func (c *controller) catalog(s scope.FileContentResolver) (*pkg.Catalog, error) {
catalog := pkg.NewCatalog() catalog := pkg.NewCatalog()
fileSelection := make([]file.Reference, 0) fileSelection := make([]file.Reference, 0)
@ -79,13 +79,13 @@ func (c *controller) catalog(s scope.Scope) (*pkg.Catalog, error) {
// ask catalogers for files to extract from the image tar // ask catalogers for files to extract from the image tar
for _, a := range c.catalogers { for _, a := range c.catalogers {
fileSelection = append(fileSelection, a.SelectFiles(&s)...) fileSelection = append(fileSelection, a.SelectFiles(s)...)
log.Debugf("cataloger '%s' selected '%d' files", a.Name(), len(fileSelection)) log.Debugf("cataloger '%s' selected '%d' files", a.Name(), len(fileSelection))
filesProcessed.N += int64(len(fileSelection)) filesProcessed.N += int64(len(fileSelection))
} }
// fetch contents for requested selection by catalogers // fetch contents for requested selection by catalogers
contents, err := s.Image.MultipleFileContentsByRef(fileSelection...) contents, err := s.MultipleFileContentsByRef(fileSelection...)
if err != nil { if err != nil {
return nil, err return nil, err
} }