Skip to content

Commit f35ec73

Browse files
tri-adamcclerget
authored andcommitted
chore: bump golangci-lint to v1.62
Fix revive lint (redefinition of the built-in type any), and add iface linter. Signed-off-by: Dave Dykstra <[email protected]>
1 parent 3234fa8 commit f35ec73

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Install Lint
5555
uses: golangci/golangci-lint-action@v2
5656
with:
57-
version: v1.61
57+
version: v1.62
5858
skip-pkg-cache: true
5959
skip-build-cache: true
6060

.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ linters:
3333
- gosimple
3434
- govet
3535
- grouper
36+
- iface
3637
- ineffassign
3738
- interfacebloat
3839
- intrange

pkg/integrity/verify.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Apptainer a Series of LF Projects LLC.
33
// For website terms of use, trademark policy, privacy policy and other
44
// project policies see https://lfprojects.org/policies
5-
// Copyright (c) 2020-2023, Sylabs Inc. All rights reserved.
5+
// Copyright (c) 2020-2024, Sylabs Inc. All rights reserved.
66
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
77
// distributed with the sources of this project regarding your rights to use or distribute this
88
// software.
@@ -542,9 +542,9 @@ func NewVerifier(f *sif.FileImage, opts ...VerifierOpt) (*Verifier, error) {
542542
}
543543

544544
// fingerprints returns a sorted list of unique fingerprints of entities participating in the
545-
// verification tasks in v. If any is true, entities involved in at least one task are included.
546-
// Otherwise, only entities participatinging in all tasks are included.
547-
func (v *Verifier) fingerprints(any bool) ([][]byte, error) {
545+
// verification tasks in v. If anyTask is true, entities involved in at least one task are
546+
// included. Otherwise, only entities participatinging in all tasks are included.
547+
func (v *Verifier) fingerprints(anyTask bool) ([][]byte, error) {
548548
m := make(map[string]int)
549549

550550
// Build up a map containing fingerprints, and the number of tasks they are participating in.
@@ -567,7 +567,7 @@ func (v *Verifier) fingerprints(any bool) ([][]byte, error) {
567567
// Build up list of fingerprints.
568568
var fps [][]byte
569569
for fp, n := range m {
570-
if any || len(v.tasks) == n {
570+
if anyTask || len(v.tasks) == n {
571571
b, err := hex.DecodeString(fp)
572572
if err != nil {
573573
panic(err)

0 commit comments

Comments
 (0)