From 1f4a48c3c1b9700c614e45dd3c2481817b706aac Mon Sep 17 00:00:00 2001 From: "anchore-actions-token-generator[bot]" <102182147+anchore-actions-token-generator[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:18:47 -0500 Subject: [PATCH] chore(deps): update tools to latest versions (#3556) * chore(deps): update tools to latest versions Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: update build scripts with new architecture suffix Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> * chore: update suffix for new ppc64 arch Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> * chore(deps): update tools to latest versions Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * chore: lintfix Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> Co-authored-by: spiffcs <32073428+spiffcs@users.noreply.github.com> --- .binny.yaml | 2 +- syft/pkg/cataloger/erlang/parse_rebar_lock.go | 2 +- syft/pkg/cataloger/internal/cpegenerate/generate.go | 1 - syft/pkg/cataloger/java/internal/maven/resolver.go | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.binny.yaml b/.binny.yaml index 4ec7f0cb5..2431b1538 100644 --- a/.binny.yaml +++ b/.binny.yaml @@ -26,7 +26,7 @@ tools: # used for linting - name: golangci-lint version: - want: v1.62.2 + want: v1.63.1 method: github-release with: repo: golangci/golangci-lint diff --git a/syft/pkg/cataloger/erlang/parse_rebar_lock.go b/syft/pkg/cataloger/erlang/parse_rebar_lock.go index e77053419..98a33a629 100644 --- a/syft/pkg/cataloger/erlang/parse_rebar_lock.go +++ b/syft/pkg/cataloger/erlang/parse_rebar_lock.go @@ -13,7 +13,7 @@ import ( // parseRebarLock parses a rebar.lock and returns the discovered Elixir packages. // -//nolint:funlen + func parseRebarLock(_ context.Context, _ file.Resolver, _ *generic.Environment, reader file.LocationReadCloser) ([]pkg.Package, []artifact.Relationship, error) { doc, err := parseErlang(reader) if err != nil { diff --git a/syft/pkg/cataloger/internal/cpegenerate/generate.go b/syft/pkg/cataloger/internal/cpegenerate/generate.go index ef8701657..2c9f5175c 100644 --- a/syft/pkg/cataloger/internal/cpegenerate/generate.go +++ b/syft/pkg/cataloger/internal/cpegenerate/generate.go @@ -180,7 +180,6 @@ func candidateTargetSw(p pkg.Package) []string { return []string{cpe.Any} } -//nolint:funlen func candidateVendors(p pkg.Package) []string { // in ecosystems where the packaging metadata does not have a clear field to indicate a vendor (or a field that // could be interpreted indirectly as such) the project name tends to be a common stand in. Examples of this diff --git a/syft/pkg/cataloger/java/internal/maven/resolver.go b/syft/pkg/cataloger/java/internal/maven/resolver.go index ffc406b35..907fef314 100644 --- a/syft/pkg/cataloger/java/internal/maven/resolver.go +++ b/syft/pkg/cataloger/java/internal/maven/resolver.go @@ -501,7 +501,7 @@ func (r *Resolver) resolveParent(ctx context.Context, pom *Project, resolvingPro // resolveInheritedVersion attempts to find the version of a dependency (groupID, artifactID) by searching all parent poms and imported managed dependencies // -//nolint:gocognit,funlen +//nolint:gocognit func (r *Resolver) resolveInheritedVersion(ctx context.Context, pom *Project, groupID, artifactID string, resolutionContext ...*Project) (string, error) { if pom == nil { return "", fmt.Errorf("nil pom provided to findInheritedVersion")