diff --git a/Makefile b/Makefile index 625265530..87314cf40 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ CHRONICLE_CMD = $(TEMP_DIR)/chronicle GLOW_CMD = $(TEMP_DIR)/glow # Tool versions ################################# -GOLANGCILINT_VERSION := v1.51.2 +GOLANGCILINT_VERSION := v1.52.0 GOSIMPORTS_VERSION := v0.3.8 BOUNCER_VERSION := v0.4.0 CHRONICLE_VERSION := v0.6.0 -GORELEASER_VERSION := v1.16.1 +GORELEASER_VERSION := v1.16.2 YAJSV_VERSION := v1.4.1 COSIGN_VERSION := v1.13.1 QUILL_VERSION := v0.2.0 diff --git a/cmd/syft/cli/attest/attest.go b/cmd/syft/cli/attest/attest.go index 699dc801d..69a63b2c5 100644 --- a/cmd/syft/cli/attest/attest.go +++ b/cmd/syft/cli/attest/attest.go @@ -27,7 +27,7 @@ import ( "github.com/anchore/syft/syft/source" ) -func Run(ctx context.Context, app *config.Application, args []string) error { +func Run(_ context.Context, app *config.Application, args []string) error { err := ValidateOutputOptions(app) if err != nil { return err diff --git a/cmd/syft/cli/options/attest.go b/cmd/syft/cli/options/attest.go index d436bea95..60d72191a 100644 --- a/cmd/syft/cli/options/attest.go +++ b/cmd/syft/cli/options/attest.go @@ -17,6 +17,7 @@ func (o AttestOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { return bindAttestConfigOptions(cmd.Flags(), v) } +//nolint:revive func bindAttestConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { if err := v.BindPFlag("attest.key", flags.Lookup("key")); err != nil { return err diff --git a/cmd/syft/cli/options/fulcio.go b/cmd/syft/cli/options/fulcio.go index 28a918910..b1dec9eb6 100644 --- a/cmd/syft/cli/options/fulcio.go +++ b/cmd/syft/cli/options/fulcio.go @@ -31,6 +31,7 @@ func (o *FulcioOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { return bindFulcioConfigOptions(cmd.Flags(), v) } +//nolint:revive func bindFulcioConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { if err := v.BindPFlag("attest.fulcio-url", flags.Lookup("fulcio-url")); err != nil { return err diff --git a/cmd/syft/cli/options/oidc.go b/cmd/syft/cli/options/oidc.go index ce1ea4817..580ecc176 100644 --- a/cmd/syft/cli/options/oidc.go +++ b/cmd/syft/cli/options/oidc.go @@ -31,6 +31,7 @@ func (o *OIDCOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { return bindOIDCConfigOptions(cmd.Flags(), v) } +//nolint:revive func bindOIDCConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { if err := v.BindPFlag("attest.oidc-issuer", flags.Lookup("oidc-issuer")); err != nil { return err diff --git a/cmd/syft/cli/options/packages.go b/cmd/syft/cli/options/packages.go index ec0331e4f..7ab3b1fc2 100644 --- a/cmd/syft/cli/options/packages.go +++ b/cmd/syft/cli/options/packages.go @@ -54,6 +54,7 @@ func (o *PackagesOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { return bindPackageConfigOptions(cmd.Flags(), v) } +//nolint:revive func bindPackageConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { // Formatting & Input options ////////////////////////////////////////////// diff --git a/cmd/syft/cli/options/rekor.go b/cmd/syft/cli/options/rekor.go index 668c06e4b..49539539c 100644 --- a/cmd/syft/cli/options/rekor.go +++ b/cmd/syft/cli/options/rekor.go @@ -22,6 +22,7 @@ func (o *RekorOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { return bindRekorConfigOptions(cmd.Flags(), v) } +//nolint:revive func bindRekorConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { // TODO: config re-design if err := v.BindPFlag("attest.rekor-url", flags.Lookup("rekor-url")); err != nil { diff --git a/cmd/syft/cli/options/root.go b/cmd/syft/cli/options/root.go index 176ec2aec..316fbff17 100644 --- a/cmd/syft/cli/options/root.go +++ b/cmd/syft/cli/options/root.go @@ -22,6 +22,7 @@ func (o *RootOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { return bindRootConfigOptions(cmd.PersistentFlags(), v) } +//nolint:revive func bindRootConfigOptions(flags *pflag.FlagSet, v *viper.Viper) error { if err := v.BindPFlag("config", flags.Lookup("config")); err != nil { return err diff --git a/cmd/syft/cli/options/version.go b/cmd/syft/cli/options/version.go index 71436a26c..a3ac49cf6 100644 --- a/cmd/syft/cli/options/version.go +++ b/cmd/syft/cli/options/version.go @@ -11,7 +11,7 @@ type VersionOptions struct { var _ Interface = (*VersionOptions)(nil) -func (o *VersionOptions) AddFlags(cmd *cobra.Command, v *viper.Viper) error { +func (o *VersionOptions) AddFlags(cmd *cobra.Command, _ *viper.Viper) error { cmd.Flags().StringVarP(&o.Output, "output", "o", "text", "format to show version information (available=[text, json])") return nil } diff --git a/cmd/syft/cli/packages/packages.go b/cmd/syft/cli/packages/packages.go index df95b169e..88fd707a7 100644 --- a/cmd/syft/cli/packages/packages.go +++ b/cmd/syft/cli/packages/packages.go @@ -23,7 +23,7 @@ import ( "github.com/anchore/syft/syft/source" ) -func Run(ctx context.Context, app *config.Application, args []string) error { +func Run(_ context.Context, app *config.Application, args []string) error { err := ValidateOutputOptions(app) if err != nil { return err diff --git a/cmd/syft/cli/version.go b/cmd/syft/cli/version.go index b644577ff..3235a813b 100644 --- a/cmd/syft/cli/version.go +++ b/cmd/syft/cli/version.go @@ -15,7 +15,7 @@ import ( "github.com/anchore/syft/internal/version" ) -func Version(v *viper.Viper, app *config.Application) *cobra.Command { +func Version(v *viper.Viper, _ *config.Application) *cobra.Command { o := &options.VersionOptions{} cmd := &cobra.Command{ Use: "version", diff --git a/internal/file/zip_file_traversal.go b/internal/file/zip_file_traversal.go index 9b8025419..b7338e5f5 100644 --- a/internal/file/zip_file_traversal.go +++ b/internal/file/zip_file_traversal.go @@ -161,10 +161,7 @@ func UnzipToDir(archivePath, targetDir string) error { return err } - if err = extractSingleFile(file, joinedPath, archivePath); err != nil { - return err - } - return nil + return extractSingleFile(file, joinedPath, archivePath) } return TraverseFilesInZip(archivePath, visitor) diff --git a/syft/cpe/cpe.go b/syft/cpe/cpe.go index b716eef55..410b802d7 100644 --- a/syft/cpe/cpe.go +++ b/syft/cpe/cpe.go @@ -106,9 +106,8 @@ func stripSlashes(s string) string { for i, c := range s { if c == '\\' && i+1 < len(s) && strings.ContainsRune(allowedCPEPunctuation, rune(s[i+1])) { continue - } else { - sb.WriteRune(c) } + sb.WriteRune(c) } return sb.String() } diff --git a/syft/pkg/cataloger/catalog.go b/syft/pkg/cataloger/catalog.go index ef129f425..f9d3e6990 100644 --- a/syft/pkg/cataloger/catalog.go +++ b/syft/pkg/cataloger/catalog.go @@ -105,7 +105,7 @@ func runCataloger(cataloger pkg.Cataloger, resolver source.FileResolver) (catalo // request. // //nolint:funlen -func Catalog(resolver source.FileResolver, release *linux.Release, parallelism int, catalogers ...pkg.Cataloger) (*pkg.Catalog, []artifact.Relationship, error) { +func Catalog(resolver source.FileResolver, _ *linux.Release, parallelism int, catalogers ...pkg.Cataloger) (*pkg.Catalog, []artifact.Relationship, error) { catalog := pkg.NewCatalog() var allRelationships []artifact.Relationship diff --git a/syft/pkg/cataloger/erlang/erlang_parser.go b/syft/pkg/cataloger/erlang/erlang_parser.go index 52bf763c4..048768cb5 100644 --- a/syft/pkg/cataloger/erlang/erlang_parser.go +++ b/syft/pkg/cataloger/erlang/erlang_parser.go @@ -82,11 +82,12 @@ func printError(data []byte, i int) string { if c == '\n' { prev = append(prev, curr.String()) curr.Reset() + if idx >= i { break - } else { - line++ } + + line++ char = 1 continue } diff --git a/syft/pkg/cataloger/javascript/parse_package_lock.go b/syft/pkg/cataloger/javascript/parse_package_lock.go index bfc8ff823..85574153f 100644 --- a/syft/pkg/cataloger/javascript/parse_package_lock.go +++ b/syft/pkg/cataloger/javascript/parse_package_lock.go @@ -104,9 +104,8 @@ func parsePackageLock(resolver source.FileResolver, _ *generic.Environment, read if name == "" { if pkgMeta.Name == "" { continue - } else { - name = pkgMeta.Name } + name = pkgMeta.Name } // handles alias names diff --git a/syft/source/mock_resolver.go b/syft/source/mock_resolver.go index aad47abd9..f0e95cc38 100644 --- a/syft/source/mock_resolver.go +++ b/syft/source/mock_resolver.go @@ -199,7 +199,7 @@ func (r MockResolver) FilesByBasename(filenames ...string) ([]Location, error) { return results, nil } -func (r MockResolver) FilesByBasenameGlob(globs ...string) ([]Location, error) { +func (r MockResolver) FilesByBasenameGlob(_ ...string) ([]Location, error) { // TODO implement me panic("implement me") }