golangci-lint: update to v1.64.6 and fix linting issues

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>

Author: vdemeester

.github/workflows/ci.yaml

@@ -45,7 +45,7 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837  # v6.5.0
       with:
-        version: v1.62.2
+        version: v1.64.6
         args: --timeout=10m
     - name: yamllint
       run: |

cmd/entrypoint/runner_test.go

@@ -49,11 +49,7 @@ func TestRealRunnerSignalForwarding(t *testing.T) {
 }
 
 func TestRealRunnerStdoutAndStderrPaths(t *testing.T) {
-	tmp, err := os.MkdirTemp("", "")
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	defer os.RemoveAll(tmp)
+	tmp := t.TempDir()
 
 	expectedString := "hello world"
 	rr := realRunner{
@@ -112,11 +108,7 @@ func TestRealRunnerStdoutAndStderrPaths(t *testing.T) {
 }
 
 func TestRealRunnerStdoutAndStderrSamePath(t *testing.T) {
-	tmp, err := os.MkdirTemp("", "")
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	defer os.RemoveAll(tmp)
+	tmp := t.TempDir()
 
 	path := filepath.Join(tmp, "logs")
 	expectedString := "hello world"
@@ -138,11 +130,7 @@ func TestRealRunnerStdoutAndStderrSamePath(t *testing.T) {
 }
 
 func TestRealRunnerStdoutPathWithSignal(t *testing.T) {
-	tmp, err := os.MkdirTemp("", "")
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	defer os.RemoveAll(tmp)
+	tmp := t.TempDir()
 
 	path := filepath.Join(tmp, "stdout")
 	rr := realRunner{

cmd/entrypoint/subcommands/decode_script_test.go

@@ -30,8 +30,8 @@ func TestDecodeScript(t *testing.T) {
 	decoded := `#!/usr/bin/env sh
 echo "Hello World!"
 `
-	mode := os.FileMode(0600)
-	expectedPermissions := os.FileMode(0600)
+	mode := os.FileMode(0o600)
+	expectedPermissions := os.FileMode(0o600)
 
 	tmp := t.TempDir()
 	src := filepath.Join(tmp, "script.txt")
@@ -84,7 +84,7 @@ func TestDecodeScriptInvalidBase64(t *testing.T) {
 	invalidData := []byte("!")
 	expectedError := base64.CorruptInputError(0)
 
-	src, err := os.CreateTemp("", "decode-script-test-*")
+	src, err := os.CreateTemp(t.TempDir(), "decode-script-test-*")
 	if err != nil {
 		t.Fatalf("error creating temp file: %v", err)
 	}

cmd/entrypoint/waiter_test.go

@@ -33,7 +33,7 @@ func TestRealWaiterWaitMissingFile(t *testing.T) {
 	// Create a temp file and then immediately delete it to get
 	// a legitimate tmp path and ensure the file doesnt exist
 	// prior to testing Wait().
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -61,7 +61,7 @@ func TestRealWaiterWaitMissingFile(t *testing.T) {
 }
 
 func TestRealWaiterWaitWithFile(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -85,7 +85,7 @@ func TestRealWaiterWaitWithFile(t *testing.T) {
 }
 
 func TestRealWaiterWaitMissingContent(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -112,7 +112,7 @@ func TestRealWaiterWaitMissingContent(t *testing.T) {
 }
 
 func TestRealWaiterWaitWithContent(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -126,7 +126,7 @@ func TestRealWaiterWaitWithContent(t *testing.T) {
 		}
 		close(doneCh)
 	}()
-	if err := os.WriteFile(tmp.Name(), []byte("😺"), 0700); err != nil {
+	if err := os.WriteFile(tmp.Name(), []byte("😺"), 0o700); err != nil {
 		t.Errorf("error writing content to temp file: %v", err)
 	}
 	delay := time.NewTimer(2 * testWaitPollingInterval)
@@ -139,7 +139,7 @@ func TestRealWaiterWaitWithContent(t *testing.T) {
 }
 
 func TestRealWaiterWaitWithErrorWaitfile(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -170,7 +170,7 @@ func TestRealWaiterWaitWithErrorWaitfile(t *testing.T) {
 }
 
 func TestRealWaiterWaitWithBreakpointOnFailure(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -196,7 +196,7 @@ func TestRealWaiterWaitWithBreakpointOnFailure(t *testing.T) {
 }
 
 func TestRealWaiterWaitWithContextCanceled(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -224,7 +224,7 @@ func TestRealWaiterWaitWithContextCanceled(t *testing.T) {
 }
 
 func TestRealWaiterWaitWithTimeout(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -252,7 +252,7 @@ func TestRealWaiterWaitWithTimeout(t *testing.T) {
 }
 
 func TestRealWaiterWaitContextWithBreakpointOnFailure(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -278,7 +278,7 @@ func TestRealWaiterWaitContextWithBreakpointOnFailure(t *testing.T) {
 }
 
 func TestRealWaiterWaitContextWithErrorWaitfile(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -309,7 +309,7 @@ func TestRealWaiterWaitContextWithErrorWaitfile(t *testing.T) {
 }
 
 func TestRealWaiterWaitContextWithContent(t *testing.T) {
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}
@@ -323,7 +323,7 @@ func TestRealWaiterWaitContextWithContent(t *testing.T) {
 		}
 		close(doneCh)
 	}()
-	if err := os.WriteFile(tmp.Name(), []byte("😺"), 0700); err != nil {
+	if err := os.WriteFile(tmp.Name(), []byte("😺"), 0o700); err != nil {
 		t.Errorf("error writing content to temp file: %v", err)
 	}
 	delay := time.NewTimer(2 * testWaitPollingInterval)
@@ -339,7 +339,7 @@ func TestRealWaiterWaitContextMissingFile(t *testing.T) {
 	// Create a temp file and then immediately delete it to get
 	// a legitimate tmp path and ensure the file doesnt exist
 	// prior to testing Wait().
-	tmp, err := os.CreateTemp("", "real_waiter_test_file")
+	tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
 	if err != nil {
 		t.Errorf("error creating temp file: %v", err)
 	}

pkg/apis/pipeline/v1/matrix_types.go

@@ -16,10 +16,10 @@ package v1
 import (
 	"context"
 	"fmt"
+	"maps"
 	"sort"
 
 	"github.com/tektoncd/pipeline/pkg/apis/config"
-	"golang.org/x/exp/maps"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/utils/strings/slices"
 	"knative.dev/pkg/apis"

pkg/apis/pipeline/v1/task_validation.go

@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
+	"slices"
 	"strings"
 	"time"
 
@@ -32,7 +33,6 @@ import (
 	"github.com/tektoncd/pipeline/pkg/internal/resultref"
 	"github.com/tektoncd/pipeline/pkg/substitution"
 
-	"golang.org/x/exp/slices"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -317,9 +317,11 @@ func errorIfStepResultReferenceinField(value, fieldName string) (errs *apis.Fiel
 func stepArtifactReferenceExists(src string) bool {
 	return len(artifactref.StepArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$("+artifactref.StepArtifactPathPattern+")")
 }
+
 func taskArtifactReferenceExists(src string) bool {
 	return len(artifactref.TaskArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$("+artifactref.TaskArtifactPathPattern+")")
 }
+
 func errorIfStepArtifactReferencedInField(value, fieldName string) (errs *apis.FieldError) {
 	if stepArtifactReferenceExists(value) {
 		errs = errs.Also(&apis.FieldError{

pkg/apis/pipeline/v1beta1/matrix_types.go

@@ -16,10 +16,10 @@ package v1beta1
 import (
 	"context"
 	"fmt"
+	"maps"
 	"sort"
 
 	"github.com/tektoncd/pipeline/pkg/apis/config"
-	"golang.org/x/exp/maps"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/utils/strings/slices"
 	"knative.dev/pkg/apis"

pkg/apis/pipeline/v1beta1/task_validation.go

@@ -22,6 +22,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
+	"slices"
 	"strings"
 	"time"
 
@@ -33,7 +34,6 @@ import (
 	"github.com/tektoncd/pipeline/pkg/internal/resultref"
 	"github.com/tektoncd/pipeline/pkg/substitution"
 
-	"golang.org/x/exp/slices"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"