diff --git a/internal/task/package_tasks.go b/internal/task/package_tasks.go index bea0c0182..b3c4be036 100644 --- a/internal/task/package_tasks.go +++ b/internal/task/package_tasks.go @@ -115,6 +115,6 @@ func DefaultPackageTaskFactories() PackageTaskFactories { pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, pkgcataloging.InstalledTag, pkgcataloging.ImageTag, "binary"), newSimplePackageTaskFactory(githubactions.NewActionUsageCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, "github", "github-actions"), newSimplePackageTaskFactory(githubactions.NewWorkflowUsageCataloger, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, "github", "github-actions"), - newSimplePackageTaskFactory(sbomCataloger.NewCataloger, pkgcataloging.ImageTag, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, pkgcataloging.ImageTag, "sbom"), // note: not evidence of installed packages + newSimplePackageTaskFactory(sbomCataloger.NewCataloger, pkgcataloging.ImageTag, pkgcataloging.DeclaredTag, pkgcataloging.DirectoryTag, "sbom"), // note: not evidence of installed packages } } diff --git a/syft/pkg/cataloger/java/graalvm_native_image_cataloger.go b/syft/pkg/cataloger/java/graalvm_native_image_cataloger.go index 096bdd6b5..2f39f8883 100644 --- a/syft/pkg/cataloger/java/graalvm_native_image_cataloger.go +++ b/syft/pkg/cataloger/java/graalvm_native_image_cataloger.go @@ -101,7 +101,7 @@ const nativeImageMissingSymbolsError = "one or more symbols are missing from the const nativeImageInvalidIndexError = "parsing the executable file generated an invalid index" const nativeImageMissingExportedDataDirectoryError = "exported data directory is missing" -// newNativeImageCataloger returns a new Native Image cataloger object. +// NewNativeImageCataloger returns a new Native Image cataloger object. func NewNativeImageCataloger() pkg.Cataloger { return &NativeImageCataloger{} } diff --git a/syft/pkg/cataloger/ruby/parse_gemspec.go b/syft/pkg/cataloger/ruby/parse_gemspec.go index 59874df18..f792d9a9b 100644 --- a/syft/pkg/cataloger/ruby/parse_gemspec.go +++ b/syft/pkg/cataloger/ruby/parse_gemspec.go @@ -64,7 +64,7 @@ func processList(s string) []string { return results } -// parseGemFileLockEntries parses the gemfile.lock file and returns the packages and relationships found. +// parseGemSpecEntries parses the gemspec file and returns the packages and relationships found. func parseGemSpecEntries(_ file.Resolver, _ *generic.Environment, reader file.LocationReadCloser) ([]pkg.Package, []artifact.Relationship, error) { var pkgs []pkg.Package var fields = make(map[string]interface{}) @@ -113,7 +113,7 @@ func parseGemSpecEntries(_ file.Resolver, _ *generic.Environment, reader file.Lo return pkgs, nil, nil } -// renderUtf8 takes any string escaped string sub-sections from the ruby string and replaces those sections with the UTF8 runes. +// renderUtf8 takes any string escaped string subsections from the ruby string and replaces those sections with the UTF8 runes. func renderUtf8(s string) string { fullReplacement := unicodePattern.ReplaceAllStringFunc(s, func(unicodeSection string) string { var replacement string diff --git a/syft/pkg/cataloger/swift/cataloger.go b/syft/pkg/cataloger/swift/cataloger.go index fc5f417fc..6f2eb05c0 100644 --- a/syft/pkg/cataloger/swift/cataloger.go +++ b/syft/pkg/cataloger/swift/cataloger.go @@ -8,6 +8,7 @@ import ( "github.com/anchore/syft/syft/pkg/cataloger/generic" ) +// NewSwiftPackageManagerCataloger returns a new Swift package manager cataloger object. func NewSwiftPackageManagerCataloger() pkg.Cataloger { return generic.NewCataloger("swift-package-manager-cataloger"). WithParserByGlobs(parsePackageResolved, "**/Package.resolved", "**/.package.resolved")