diff --git a/syft/format/internal/backfill.go b/syft/format/internal/backfill.go index 7bfa0aa2b..b8cc66f9f 100644 --- a/syft/format/internal/backfill.go +++ b/syft/format/internal/backfill.go @@ -23,7 +23,7 @@ func Backfill(p *pkg.Package) { purl, err := packageurl.FromString(p.PURL) 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 } diff --git a/syft/format/syftjson/model/package.go b/syft/format/syftjson/model/package.go index bd0af3dc5..8c06a1584 100644 --- a/syft/format/syftjson/model/package.go +++ b/syft/format/syftjson/model/package.go @@ -59,7 +59,7 @@ func newModelLicensesFromValues(licenses []string) (ml []License) { for _, v := range licenses { expression, err := license.ParseExpression(v) 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{ Value: v, diff --git a/syft/internal/fileresolver/deferred.go b/syft/internal/fileresolver/deferred.go index df5cfd055..2441158e9 100644 --- a/syft/internal/fileresolver/deferred.go +++ b/syft/internal/fileresolver/deferred.go @@ -43,7 +43,7 @@ func (d *Deferred) FileContentsByLocation(location file.Location) (io.ReadCloser func (d *Deferred) HasPath(s string) bool { r, err := d.getResolver() if err != nil { - log.Debug("unable to get resolver: %v", err) + log.Debugf("unable to get resolver: %v", err) return false } 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 { r, err := d.getResolver() if err != nil { - log.Debug("unable to get resolver: %v", err) + log.Debugf("unable to get resolver: %v", err) return nil } return r.AllLocations(ctx) diff --git a/syft/pkg/cataloger/dotnet/parse_packages_lock.go b/syft/pkg/cataloger/dotnet/parse_packages_lock.go index 069d898c7..97bb4df86 100644 --- a/syft/pkg/cataloger/dotnet/parse_packages_lock.go +++ b/syft/pkg/cataloger/dotnet/parse_packages_lock.go @@ -80,7 +80,7 @@ func parseDotnetPackagesLock(_ context.Context, _ file.Resolver, _ *generic.Envi for depNameVersion, dep := range allDependencies { parentPkg, ok := pkgMap[depNameVersion] 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 } @@ -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 cpkg, ok := findPkgByName(childDepName, pkgMap) 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 } diff --git a/syft/pkg/cataloger/golang/licenses.go b/syft/pkg/cataloger/golang/licenses.go index 4adcef374..48294378b 100644 --- a/syft/pkg/cataloger/golang/licenses.go +++ b/syft/pkg/cataloger/golang/licenses.go @@ -60,7 +60,7 @@ func newGoLicenseResolver(catalogerName string, opts CatalogerConfig) goLicenseR if vendorDir == "" { wd, err := os.Getwd() 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 { vendorDir = filepath.Join(wd, "vendor") } diff --git a/syft/pkg/cataloger/java/parse_pom_xml.go b/syft/pkg/cataloger/java/parse_pom_xml.go index dc4922774..2fead9fe5 100644 --- a/syft/pkg/cataloger/java/parse_pom_xml.go +++ b/syft/pkg/cataloger/java/parse_pom_xml.go @@ -100,7 +100,7 @@ func newPackageFromMavenPom(ctx context.Context, r *maven.Resolver, pom *maven.P if err != nil { // 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 - log.Trace("unable to resolve parent due to: %v", err) + log.Tracef("unable to resolve parent due to: %v", err) } var javaPomParent *pkg.JavaPomParent diff --git a/syft/pkg/cataloger/kernel/cataloger.go b/syft/pkg/cataloger/kernel/cataloger.go index 877e9819b..2be082ab0 100644 --- a/syft/pkg/cataloger/kernel/cataloger.go +++ b/syft/pkg/cataloger/kernel/cataloger.go @@ -94,7 +94,7 @@ func createKernelToModuleRelationships(kernelPackages, modulePackages []pkg.Pack for idx, p := range modulePackages { m, ok := p.Metadata.(pkg.LinuxKernelModule) 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 } modulesByKernelVersion[m.KernelVersion] = append(modulesByKernelVersion[m.KernelVersion], &modulePackages[idx]) diff --git a/syft/pkg/cataloger/python/parse_poetry_lock.go b/syft/pkg/cataloger/python/parse_poetry_lock.go index e7ba52e3e..48b4a5afa 100644 --- a/syft/pkg/cataloger/python/parse_poetry_lock.go +++ b/syft/pkg/cataloger/python/parse_poetry_lock.go @@ -85,7 +85,7 @@ func poetryLockPackages(reader file.LocationReadCloser) ([]pkg.Package, error) { case md.PrimitiveDecode(du, &multiObj) == nil: dependencies[pkgName] = append(dependencies[pkgName], multiObj...) 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