chore(deps): update tools to latest versions (#3121)

* chore(deps): update tools to latest versions

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: update code to reflect new linter settings for error messages

Signed-off-by: Christopher Phillips <[email protected]>

---------

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Christopher Phillips <[email protected]>
Co-authored-by: spiffcs <[email protected]>

.binny.yaml

@@ -26,7 +26,7 @@ tools:
   # used for linting
   - name: golangci-lint
     version:
-      want: v1.59.1
+      want: v1.60.1
     method: github-release
     with:
       repo: golangci/golangci-lint
@@ -58,7 +58,7 @@ tools:
   # used to release all artifacts
   - name: goreleaser
     version:
-      want: v2.1.0
+      want: v2.2.0
     method: github-release
     with:
       repo: goreleaser/goreleaser

cmd/syft/internal/commands/scan.go

@@ -161,7 +161,7 @@ func validateArgs(cmd *cobra.Command, args []string, error string) error {
 		if err := cmd.Help(); err != nil {
 			return fmt.Errorf("unable to display help: %w", err)
 		}
-		return fmt.Errorf(error)
+		return fmt.Errorf("%v", error)
 	}
 
 	return cobra.MaximumNArgs(1)(cmd, args)

internal/cache/error_resolver.go

@@ -34,7 +34,7 @@ func (r *errorResolver[T]) Resolve(key string, resolver resolverFunc[T]) (T, err
 		return v.Value, err
 	}
 	if v.Error != "" {
-		return v.Value, fmt.Errorf(v.Error)
+		return v.Value, fmt.Errorf("failed to resolve cache: %s", v.Error)
 	}
 	return v.Value, nil
 }

syft/internal/packagemetadata/discover_type_names.go

@@ -78,7 +78,8 @@ func findMetadataDefinitionNames(paths ...string) ([]string, error) {
 	// note: 35 is a point-in-time gut check. This number could be updated if new metadata definitions are added, but is not required.
 	// it is really intended to catch any major issues with the generation process that would generate, say, 0 definitions.
 	if len(strNames) < 35 {
-		return nil, fmt.Errorf("not enough metadata definitions found (discovered: " + fmt.Sprintf("%d", len(strNames)) + ")")
+		msg := fmt.Sprintf("not enough metadata definitions found (discovered %d)", len(strNames))
+		return nil, fmt.Errorf("%v", msg)
 	}
 
 	return strNames, nil

syft/internal/sourcemetadata/discover_type_names.go

@@ -68,7 +68,8 @@ func findMetadataDefinitionNames(paths ...string) ([]string, error) {
 	// note: 3 is a point-in-time gut check. This number could be updated if new metadata definitions are added, but is not required.
 	// it is really intended to catch any major issues with the generation process that would generate, say, 0 definitions.
 	if len(strNames) < 3 {
-		return nil, fmt.Errorf("not enough metadata definitions found (discovered: " + fmt.Sprintf("%d", len(strNames)) + ")")
+		msg := fmt.Sprintf("not enough metadata definitions found (discovered %d)", len(strNames))
+		return nil, fmt.Errorf("%v", msg)
 	}
 
 	return strNames, nil

syft/pkg/cataloger/cpp/parse_conanfile.go

@@ -24,7 +24,7 @@ func parseConanfile(_ context.Context, _ file.Resolver, _ *generic.Environment,
 	for {
 		line, err := r.ReadString('\n')
 		switch {
-		case errors.Is(io.EOF, err):
+		case errors.Is(err, io.EOF):
 			return pkgs, nil, nil
 		case err != nil:
 			return nil, nil, fmt.Errorf("failed to parse conanfile.txt file: %w", err)

syft/pkg/cataloger/cpp/parse_conaninfo.go

@@ -99,7 +99,7 @@ func parseConaninfo(_ context.Context, _ file.Resolver, _ *generic.Environment,
 	for {
 		line, err := r.ReadString('\n')
 		switch {
-		case errors.Is(io.EOF, err):
+		case errors.Is(err, io.EOF):
 			mainPackage := newConaninfoPackage(
 				mainMetadata,
 				reader.Location.WithAnnotation(pkg.EvidenceAnnotationKey, pkg.PrimaryEvidenceAnnotation),

syft/pkg/cataloger/elixir/parse_mix_lock.go

@@ -28,7 +28,7 @@ func parseMixLock(_ context.Context, _ file.Resolver, _ *generic.Environment, re
 	for {
 		line, err := r.ReadString('\n')
 		switch {
-		case errors.Is(io.EOF, err):
+		case errors.Is(err, io.EOF):
 			return packages, nil, nil
 		case err != nil:
 			return nil, nil, fmt.Errorf("failed to parse mix.lock file: %w", err)

syft/pkg/cataloger/haskell/parse_cabal_freeze.go

@@ -23,7 +23,7 @@ func parseCabalFreeze(_ context.Context, _ file.Resolver, _ *generic.Environment
 	for {
 		line, err := r.ReadString('\n')
 		switch {
-		case errors.Is(io.EOF, err):
+		case errors.Is(err, io.EOF):
 			return pkgs, nil, nil
 		case err != nil:
 			return nil, nil, fmt.Errorf("failed to parse cabal.project.freeze file: %w", err)