Update golangci-lint to 1.59.x and fix linting

This mainly removing the need to copy variable in a for loop to capture rang as it is now "fixed" in go 1.22+. > The copy of the 'for' variable "td" can be deleted (Go 1.22+) (copyloopvar) This also fixes some fatcontext issues, for loop range, … Signed-off-by: Vincent Demeester <[email protected]>
tektoncd · Jun 10, 2024 · 47f940a · 47f940a
1 parent 274035d
commit 47f940a
Show file tree

Hide file tree

Showing 45 changed files with 679 additions and 616 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -85,12 +85,13 @@ linters:
   - gocyclo
   - godot
   - godox
-  - goerr113
+  - err113
   - gofumpt
   - gomnd
   - gomoddirectives
   - ireturn
   - lll
+  - mnd
   - nestif
   - nlreturn
   - nonamedreturns

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ TESTPKGS = $(shell env GO111MODULE=on $(GO) list -f \
 BIN      = $(CURDIR)/.bin
 WOKE 	?= go run -modfile go.mod github.com/get-woke/woke
 
-GOLANGCI_VERSION = v1.57.2
+GOLANGCI_VERSION = v1.59.1
 WOKE_VERSION     = v0.19.0
 
 GO           = go

diff --git a/internal/sidecarlogresults/sidecarlogresults.go b/internal/sidecarlogresults/sidecarlogresults.go
@@ -37,8 +37,10 @@ import (
 )
 
 // ErrSizeExceeded indicates that the result exceeded its maximum allowed size
-var ErrSizeExceeded = errors.New("results size exceeds configured limit")
-var stepDir = pipeline.StepsDir
+var (
+	ErrSizeExceeded = errors.New("results size exceeds configured limit")
+	stepDir         = pipeline.StepsDir
+)
 
 type SidecarLogResultType string
 
@@ -146,8 +148,6 @@ func LookForResults(w io.Writer, runDir string, resultsDir string, resultNames [
 	results := make(chan SidecarLogResult)
 	g := new(errgroup.Group)
 	for _, resultFile := range resultNames {
-		resultFile := resultFile
-
 		g.Go(func() error {
 			newResult, err := readResults(resultsDir, resultFile, "", taskResultType)
 			if err != nil {
@@ -162,10 +162,7 @@ func LookForResults(w io.Writer, runDir string, resultsDir string, resultNames [
 	}
 
 	for sName, sresults := range stepResults {
-		sresults := sresults
-		sName := sName
 		for _, resultName := range sresults {
-			resultName := resultName
 			stepResultsDir := filepath.Join(stepResultsDir, sName, "results")
 
 			g.Go(func() error {

diff --git a/pkg/apis/config/feature_flags_test.go b/pkg/apis/config/feature_flags_test.go
@@ -410,7 +410,7 @@ func TestIsSpireEnabled(t *testing.T) {
 			Data: tc.configmap,
 		}
 		store.OnConfigChanged(featureflags)
-		ctx = store.ToContext(ctx)
+		ctx := store.ToContext(ctx)
 		got := config.IsSpireEnabled(ctx)
 
 		if tc.want != got {

diff --git a/pkg/apis/pipeline/v1/merge.go b/pkg/apis/pipeline/v1/merge.go
@@ -81,7 +81,6 @@ func MergeStepsWithSpecs(steps []Step, overrides []TaskRunStepSpec) ([]Step, err
 		stepNameToOverride[o.Name] = o
 	}
 	for i, s := range steps {
-		s := s
 		o, found := stepNameToOverride[s.Name]
 		if !found {
 			continue
@@ -108,7 +107,6 @@ func MergeSidecarsWithSpecs(sidecars []Sidecar, overrides []TaskRunSidecarSpec)
 		sidecarNameToOverride[o.Name] = o
 	}
 	for i, s := range sidecars {
-		s := s
 		o, found := sidecarNameToOverride[s.Name]
 		if !found {
 			continue

diff --git a/pkg/apis/pipeline/v1/param_types_test.go b/pkg/apis/pipeline/v1/param_types_test.go
@@ -308,7 +308,6 @@ type ParamValuesHolder struct {
 	AOrS v1.ParamValue `json:"val"`
 }
 
-//nolint:musttag
 func TestParamValues_UnmarshalJSON(t *testing.T) {
 	cases := []struct {
 		input  map[string]interface{}
@@ -399,7 +398,6 @@ func TestParamValues_UnmarshalJSON_Directly(t *testing.T) {
 	}
 }
 
-//nolint:musttag
 func TestParamValues_UnmarshalJSON_Error(t *testing.T) {
 	cases := []struct {
 		desc  string
@@ -417,7 +415,6 @@ func TestParamValues_UnmarshalJSON_Error(t *testing.T) {
 	}
 }
 
-//nolint:musttag
 func TestParamValues_MarshalJSON(t *testing.T) {
 	cases := []struct {
 		input  v1.ParamValue