oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-02-12 10:36:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: stop emitting bus events on go mod events (#2673)

Browse Source 
Previously, the TUI would hang when scanning directories with lots of go
packages, possibly because this path was spamming the TUI with too
many events. Since checking on a particular go module is fast, don't
show TUI events for each one.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
This commit is contained in:
William Murphy 2024-02-28 14:14:46 -05:00 committed by GitHub
parent acc473fc30
commit 63171b55dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
syft/pkg/cataloger/golang/licenses.go
View File

@ -20,10 +20,8 @@ import (
"github.com/go-git/go-git/v5/storage/memory" "github.com/go-git/go-git/v5/storage/memory"
"github.com/scylladb/go-set/strset" "github.com/scylladb/go-set/strset"
"github.com/anchore/syft/internal/bus"
"github.com/anchore/syft/internal/licenses" "github.com/anchore/syft/internal/licenses"
"github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/log"
"github.com/anchore/syft/syft/event/monitor"
"github.com/anchore/syft/syft/file" "github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/internal/fileresolver" "github.com/anchore/syft/syft/internal/fileresolver"
"github.com/anchore/syft/syft/pkg" "github.com/anchore/syft/syft/pkg"
@ -120,17 +118,7 @@ func (c *goLicenses) getLicensesFromRemote(moduleName, moduleVersion string) ([]
proxies := remotesForModule(c.opts.Proxies, c.opts.NoProxy, moduleName) proxies := remotesForModule(c.opts.Proxies, c.opts.NoProxy, moduleName)
prog := bus.StartCatalogerTask(monitor.GenericTask{ fsys, err := getModule(proxies, moduleName, moduleVersion)
Title: monitor.Title{
Default: "Download go mod",
WhileRunning: "Downloading go mod",
OnSuccess: "Downloaded go mod",
},
HideOnSuccess: true,
ParentID: c.catalogerName,
}, -1, "")
fsys, err := getModule(prog, proxies, moduleName, moduleVersion)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -213,19 +201,18 @@ func processCaps(s string) string {
}) })
} }
func getModule(progress *monitor.CatalogerTaskProgress, proxies []string, moduleName, moduleVersion string) (fsys fs.FS, err error) { func getModule(proxies []string, moduleName, moduleVersion string) (fsys fs.FS, err error) {
for _, proxy := range proxies { for _, proxy := range proxies {
u, _ := url.Parse(proxy) u, _ := url.Parse(proxy)
if proxy == "direct" { if proxy == "direct" {
fsys, err = getModuleRepository(progress, moduleName, moduleVersion) fsys, err = getModuleRepository(moduleName, moduleVersion)
continue continue
} }
switch u.Scheme { switch u.Scheme {
case "https", "http": case "https", "http":
fsys, err = getModuleProxy(progress, proxy, moduleName, moduleVersion) fsys, err = getModuleProxy(proxy, moduleName, moduleVersion)
case "file": case "file":
p := filepath.Join(u.Path, moduleName, "@v", moduleVersion) p := filepath.Join(u.Path, moduleName, "@v", moduleVersion)
progress.AtomicStage.Set(fmt.Sprintf("file: %s", p))
fsys = os.DirFS(p) fsys = os.DirFS(p)
} }
if fsys != nil { if fsys != nil {
@ -235,9 +222,8 @@ func getModule(progress *monitor.CatalogerTaskProgress, proxies []string, module
return return
} }
func getModuleProxy(progress *monitor.CatalogerTaskProgress, proxy string, moduleName string, moduleVersion string) (out fs.FS, _ error) { func getModuleProxy(proxy string, moduleName string, moduleVersion string) (out fs.FS, _ error) {
u := fmt.Sprintf("%s/%s/@v/%s.zip", proxy, moduleName, moduleVersion) u := fmt.Sprintf("%s/%s/@v/%s.zip", proxy, moduleName, moduleVersion)
progress.AtomicStage.Set(u)
// get the module zip // get the module zip
resp, err := http.Get(u) //nolint:gosec resp, err := http.Get(u) //nolint:gosec
@ -248,7 +234,6 @@ func getModuleProxy(progress *monitor.CatalogerTaskProgress, proxy string, modul
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
u = fmt.Sprintf("%s/%s/@v/%s.zip", proxy, strings.ToLower(moduleName), moduleVersion) u = fmt.Sprintf("%s/%s/@v/%s.zip", proxy, strings.ToLower(moduleName), moduleVersion)
progress.AtomicStage.Set(u)
// try lowercasing it; some packages have mixed casing that really messes up the proxy // try lowercasing it; some packages have mixed casing that really messes up the proxy
resp, err = http.Get(u) //nolint:gosec resp, err = http.Get(u) //nolint:gosec
@ -291,15 +276,13 @@ func findVersionPath(f fs.FS, dir string) string {
return "" return ""
} }
func getModuleRepository(progress *monitor.CatalogerTaskProgress, moduleName string, moduleVersion string) (fs.FS, error) { func getModuleRepository(moduleName string, moduleVersion string) (fs.FS, error) {
repoName := moduleName repoName := moduleName
parts := strings.Split(moduleName, "/") parts := strings.Split(moduleName, "/")
if len(parts) > 2 { if len(parts) > 2 {
repoName = fmt.Sprintf("%s/%s/%s", parts[0], parts[1], parts[2]) repoName = fmt.Sprintf("%s/%s/%s", parts[0], parts[1], parts[2])
} }
progress.AtomicStage.Set(fmt.Sprintf("git: %s", repoName))
f := memfs.New() f := memfs.New()
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
_, err := git.Clone(memory.NewStorage(), f, &git.CloneOptions{ _, err := git.Clone(memory.NewStorage(), f, &git.CloneOptions{