oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 08:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix some logging output (#3884)

Browse Source 
Signed-off-by: Weston Steimel <author@code.w.steimel.me.uk>
This commit is contained in:
Weston Steimel 2025-05-13 12:15:19 +00:00 committed by GitHub
parent 59b880f26a
commit de88b973f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syft/format/internal/backfill.go
View File

@ -23,7 +23,7 @@ func Backfill(p *pkg.Package) {
purl, err := packageurl.FromString(p.PURL) purl, err := packageurl.FromString(p.PURL)
if err != nil { if err != nil {
log.Debug("unable to parse purl: %s: %w", p.PURL, err) log.Debugf("unable to parse purl: %s: %w", p.PURL, err)
return return
} }

2
syft/format/syftjson/model/package.go
View File

@ -59,7 +59,7 @@ func newModelLicensesFromValues(licenses []string) (ml []License) {
for _, v := range licenses { for _, v := range licenses {
expression, err := license.ParseExpression(v) expression, err := license.ParseExpression(v)
if err != nil { if err != nil {
log.Trace("could not find valid spdx expression for %s: %w", v, err) log.Tracef("could not find valid spdx expression for %s: %w", v, err)
} }
ml = append(ml, License{ ml = append(ml, License{
Value: v, Value: v,

4
syft/internal/fileresolver/deferred.go
View File

@ -43,7 +43,7 @@ func (d *Deferred) FileContentsByLocation(location file.Location) (io.ReadCloser
func (d *Deferred) HasPath(s string) bool { func (d *Deferred) HasPath(s string) bool {
r, err := d.getResolver() r, err := d.getResolver()
if err != nil { if err != nil {
log.Debug("unable to get resolver: %v", err) log.Debugf("unable to get resolver: %v", err)
return false return false
} }
return r.HasPath(s) return r.HasPath(s)
@ -84,7 +84,7 @@ func (d *Deferred) RelativeFileByPath(location file.Location, path string) *file
func (d *Deferred) AllLocations(ctx context.Context) <-chan file.Location { func (d *Deferred) AllLocations(ctx context.Context) <-chan file.Location {
r, err := d.getResolver() r, err := d.getResolver()
if err != nil { if err != nil {
log.Debug("unable to get resolver: %v", err) log.Debugf("unable to get resolver: %v", err)
return nil return nil
} }
return r.AllLocations(ctx) return r.AllLocations(ctx)

4
syft/pkg/cataloger/dotnet/parse_packages_lock.go
View File

@ -80,7 +80,7 @@ func parseDotnetPackagesLock(_ context.Context, _ file.Resolver, _ *generic.Envi
for depNameVersion, dep := range allDependencies { for depNameVersion, dep := range allDependencies {
parentPkg, ok := pkgMap[depNameVersion] parentPkg, ok := pkgMap[depNameVersion]
if !ok { if !ok {
log.Debug("package \"%s\" not found in map of all pacakges", depNameVersion) log.Debugf("package \"%s\" not found in map of all pacakges", depNameVersion)
continue continue
} }
@ -93,7 +93,7 @@ func parseDotnetPackagesLock(_ context.Context, _ file.Resolver, _ *generic.Envi
// no exact match found, lets match on name only, lockfile will contain other version of pkg // no exact match found, lets match on name only, lockfile will contain other version of pkg
cpkg, ok := findPkgByName(childDepName, pkgMap) cpkg, ok := findPkgByName(childDepName, pkgMap)
if !ok { if !ok {
log.Debug("dependency \"%s\" of package \"%s\" not found in map of all packages", childDepNameVersion, depNameVersion) log.Debugf("dependency \"%s\" of package \"%s\" not found in map of all packages", childDepNameVersion, depNameVersion)
continue continue
} }

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

@ -60,7 +60,7 @@ func newGoLicenseResolver(catalogerName string, opts CatalogerConfig) goLicenseR
if vendorDir == "" { if vendorDir == "" {
wd, err := os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
log.Debug("unable to get CWD while resolving the local go vendor dir: %v", err) log.Debugf("unable to get CWD while resolving the local go vendor dir: %v", err)
} else { } else {
vendorDir = filepath.Join(wd, "vendor") vendorDir = filepath.Join(wd, "vendor")
} }

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

@ -100,7 +100,7 @@ func newPackageFromMavenPom(ctx context.Context, r *maven.Resolver, pom *maven.P
if err != nil { if err != nil {
// this is expected in many cases, there will be no network access and the maven resolver is unable to // this is expected in many cases, there will be no network access and the maven resolver is unable to
// look up information, so we can continue with what little information we have // look up information, so we can continue with what little information we have
log.Trace("unable to resolve parent due to: %v", err) log.Tracef("unable to resolve parent due to: %v", err)
} }
var javaPomParent *pkg.JavaPomParent var javaPomParent *pkg.JavaPomParent

2
syft/pkg/cataloger/kernel/cataloger.go
View File

@ -94,7 +94,7 @@ func createKernelToModuleRelationships(kernelPackages, modulePackages []pkg.Pack
for idx, p := range modulePackages { for idx, p := range modulePackages {
m, ok := p.Metadata.(pkg.LinuxKernelModule) m, ok := p.Metadata.(pkg.LinuxKernelModule)
if !ok { if !ok {
log.Debug("linux-kernel-module package found without metadata: %s@%s", p.Name, p.Version) log.Debugf("linux-kernel-module package found without metadata: %s@%s", p.Name, p.Version)
continue continue
} }
modulesByKernelVersion[m.KernelVersion] = append(modulesByKernelVersion[m.KernelVersion], &modulePackages[idx]) modulesByKernelVersion[m.KernelVersion] = append(modulesByKernelVersion[m.KernelVersion], &modulePackages[idx])

2
syft/pkg/cataloger/python/parse_poetry_lock.go
View File

@ -85,7 +85,7 @@ func poetryLockPackages(reader file.LocationReadCloser) ([]pkg.Package, error) {
case md.PrimitiveDecode(du, &multiObj) == nil: case md.PrimitiveDecode(du, &multiObj) == nil:
dependencies[pkgName] = append(dependencies[pkgName], multiObj...) dependencies[pkgName] = append(dependencies[pkgName], multiObj...)
default: default:
log.Trace("failed to decode poetry lock package dependencies for %s; skipping", pkgName) log.Tracef("failed to decode poetry lock package dependencies for %s; skipping", pkgName)
} }
} }
metadata.Packages[i].Dependencies = dependencies metadata.Packages[i].Dependencies = dependencies