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

Wire though maven-url to java config (#2291)

Browse Source 
Signed-off-by: Colm O hEigeartaigh <coheigea@apache.org>
This commit is contained in:
Colm O hEigeartaigh 2023-11-06 14:08:03 +00:00 committed by GitHub
parent 1470abaded
commit 9fa11f2339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syft/cli/options/catalog.go
View File

@ -141,7 +141,7 @@ func (cfg Catalog) ToCatalogerConfig() cataloger.Config {
}, },
Java: javaCataloger.DefaultCatalogerOpts(). Java: javaCataloger.DefaultCatalogerOpts().
WithUseNetwork(cfg.Java.UseNetwork). WithUseNetwork(cfg.Java.UseNetwork).
WithMavenCentralURL(cfg.Java.MavenURL). WithMavenURL(cfg.Java.MavenURL).
WithMaxParentRecursiveDepth(cfg.Java.MaxParentRecursiveDepth), WithMaxParentRecursiveDepth(cfg.Java.MaxParentRecursiveDepth),
Python: pythonCataloger.CatalogerConfig{ Python: pythonCataloger.CatalogerConfig{
GuessUnpinnedRequirements: cfg.Python.GuessUnpinnedRequirements, GuessUnpinnedRequirements: cfg.Python.GuessUnpinnedRequirements,

1
syft/pkg/cataloger/config.go
View File

@ -38,6 +38,7 @@ func (c Config) JavaConfig() java.Config {
SearchUnindexedArchives: c.Search.IncludeUnindexedArchives, SearchUnindexedArchives: c.Search.IncludeUnindexedArchives,
SearchIndexedArchives: c.Search.IncludeIndexedArchives, SearchIndexedArchives: c.Search.IncludeIndexedArchives,
UseNetwork: c.Java.UseNetwork, UseNetwork: c.Java.UseNetwork,
MavenBaseURL: c.Java.MavenURL,
MaxParentRecursiveDepth: c.Java.MaxParentRecursiveDepth, MaxParentRecursiveDepth: c.Java.MaxParentRecursiveDepth,
} }
} }

2
syft/pkg/cataloger/java/options.go
View File

@ -13,7 +13,7 @@ func (j CatalogerOpts) WithUseNetwork(input bool) CatalogerOpts {
return j return j
} }
func (j CatalogerOpts) WithMavenCentralURL(input string) CatalogerOpts { func (j CatalogerOpts) WithMavenURL(input string) CatalogerOpts {
if input != "" { if input != "" {
j.MavenURL = input j.MavenURL = input
} }