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

cataloger: use ** for glob patterns

Browse Source 
Signed-off-by: Alfredo Deza <adeza@anchore.com>
This commit is contained in:
Alfredo Deza 2020-07-20 15:55:32 -04:00
parent 03bbcfa08d
commit cea38fcba3
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgbom/cataloger/bundler/cataloger.go
View File

@ -13,7 +13,7 @@ type Cataloger struct {
func NewCataloger() *Cataloger { func NewCataloger() *Cataloger {
globParsers := map[string]common.ParserFn{ globParsers := map[string]common.ParserFn{
"*/Gemfile.lock": parseGemfileLockEntries, "**/Gemfile.lock": parseGemfileLockEntries,
} }
return &Cataloger{ return &Cataloger{

6
imgbom/cataloger/dpkg/cataloger.go
View File

@ -12,12 +12,12 @@ type Cataloger struct {
} }
func NewCataloger() *Cataloger { func NewCataloger() *Cataloger {
pathParsers := map[string]common.ParserFn{ globParsers := map[string]common.ParserFn{
"/var/lib/dpkg/status": parseDpkgStatus, "**/var/lib/dpkg/status": parseDpkgStatus,
} }
return &Cataloger{ return &Cataloger{
cataloger: common.NewGenericCataloger(pathParsers, nil), cataloger: common.NewGenericCataloger(nil, globParsers),
} }
} }

10
imgbom/cataloger/java/archive_parser.go
View File

@ -11,11 +11,11 @@ import (
) )
var archiveFormatGlobs = []string{ var archiveFormatGlobs = []string{
"*.jar", "**/*.jar",
"*.war", "**/*.war",
"*.ear", "**/*.ear",
"*.jpi", "**/*.jpi",
"*.hpi", "**/*.hpi",
} }
type archiveParser struct { type archiveParser struct {

4
imgbom/cataloger/python/cataloger.go
View File

@ -13,8 +13,8 @@ type Cataloger struct {
func NewCataloger() *Cataloger { func NewCataloger() *Cataloger {
globParsers := map[string]common.ParserFn{ globParsers := map[string]common.ParserFn{
"*egg-info/PKG-INFO": parseEggMetadata, "**/egg-info/PKG-INFO": parseEggMetadata,
"*dist-info/METADATA": parseWheelMetadata, "**/dist-info/METADATA": parseWheelMetadata,
} }
return &Cataloger{ return &Cataloger{

6
imgbom/cataloger/rpmdb/cataloger.go
View File

@ -12,12 +12,12 @@ type Cataloger struct {
} }
func NewCataloger() *Cataloger { func NewCataloger() *Cataloger {
pathParsers := map[string]common.ParserFn{ globParsers := map[string]common.ParserFn{
"/var/lib/rpm/Packages": parseRpmDB, "**/var/lib/rpm/Packages": parseRpmDB,
} }
return &Cataloger{ return &Cataloger{
cataloger: common.NewGenericCataloger(pathParsers, nil), cataloger: common.NewGenericCataloger(nil, globParsers),
} }
} }