Bump to go 1.22 and fixes

.github/workflows/codeql-analysis.yml

@@ -55,6 +55,10 @@ jobs:
 
     - name: Checkout repository
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - name: Setup go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.22.x'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.golangci.yml

@@ -1,5 +1,10 @@
 # Documentation: https://golangci-lint.run/usage/configuration/
+
 linters-settings:
+  gosec:
+    excludes:
+      - G601
+    exclude-generated: true
   errcheck:
     exclude-functions:
       - (*github.com/tektoncd/pipeline/vendor/go.uber.org/zap.SugaredLogger).Sync
@@ -80,12 +85,13 @@ linters:
   - gocyclo
   - godot
   - godox
-  - goerr113
+  - err113
   - gofumpt
   - gomnd
   - gomoddirectives
   - ireturn
   - lll
+  - mnd
   - nestif
   - nlreturn
   - nonamedreturns

Makefile

@@ -9,7 +9,8 @@ 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
+# Get golangci_version from tools/go.mod
+GOLANGCI_VERSION := $(shell cat tools/go.mod | grep golangci-lint | awk '{ print $$3 }')
 WOKE_VERSION     = v0.19.0
 
 GO           = go
@@ -164,9 +165,10 @@ $(BIN)/errcheck: PACKAGE=github.com/kisielk/errcheck
 errcheck: | $(ERRCHECK) ; $(info $(M) running errcheck…) ## Run errcheck
 	$Q $(ERRCHECK) ./...
 
-GOLANGCILINT = $(BIN)/golangci-lint
-$(BIN)/golangci-lint: ; $(info $(M) getting golangci-lint $(GOLANGCI_VERSION))
-	cd tools; GOBIN=$(BIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_VERSION)
+GOLANGCILINT = $(BIN)/golangci-lint-$(GOLANGCI_VERSION)
+$(BIN)/golangci-lint-$(GOLANGCI_VERSION): ; $(info $(M) getting golangci-lint $(GOLANGCI_VERSION))
+	cd tools; go mod download github.com/golangci/golangci-lint && go mod tidy 
+	cd tools; go build -o $(BIN)/golangci-lint-$(GOLANGCI_VERSION) github.com/golangci/golangci-lint/cmd/golangci-lint
 
 .PHONY: golangci-lint
 golangci-lint: | $(GOLANGCILINT) ; $(info $(M) running golangci-lint…) @ ## Run golangci-lint

go.mod

@@ -1,6 +1,6 @@
 module github.com/tektoncd/pipeline
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -37,14 +37,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
-//  TODO: Remove this once https://github.com/knative/pkg/issues/2759 is fixed
-replace (
-	k8s.io/api => k8s.io/api v0.29.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.29.2
-	k8s.io/client-go => k8s.io/client-go v0.29.2
-	k8s.io/code-generator => k8s.io/code-generator v0.29.2
-)
-
 require (
 	code.gitea.io/sdk/gitea v0.18.0
 	github.com/go-jose/go-jose/v3 v3.0.3

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 {

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 {

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

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