Skip to content

Commit 395b653

Browse files
vdemeestervdemeester
committed
golangci-lint: update to v1.64.6 and fix linting issues
Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
1 parent 43c7247 commit 395b653

File tree

10 files changed

+244
-253
lines changed

10 files changed

+244
-253
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: golangci-lint
4646
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
4747
with:
48-
version: v1.62.2
48+
version: v1.64.6
4949
args: --timeout=10m
5050
- name: yamllint
5151
run: |

‎cmd/entrypoint/runner_test.go‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ func TestRealRunnerSignalForwarding(t *testing.T) {
4949
}
5050

5151
func TestRealRunnerStdoutAndStderrPaths(t *testing.T) {
52-
tmp, err := os.MkdirTemp("", "")
53-
if err != nil {
54-
t.Fatalf("Unexpected error: %v", err)
55-
}
56-
defer os.RemoveAll(tmp)
52+
tmp := t.TempDir()
5753

5854
expectedString := "hello world"
5955
rr := realRunner{
@@ -112,11 +108,7 @@ func TestRealRunnerStdoutAndStderrPaths(t *testing.T) {
112108
}
113109

114110
func TestRealRunnerStdoutAndStderrSamePath(t *testing.T) {
115-
tmp, err := os.MkdirTemp("", "")
116-
if err != nil {
117-
t.Fatalf("Unexpected error: %v", err)
118-
}
119-
defer os.RemoveAll(tmp)
111+
tmp := t.TempDir()
120112

121113
path := filepath.Join(tmp, "logs")
122114
expectedString := "hello world"
@@ -138,11 +130,7 @@ func TestRealRunnerStdoutAndStderrSamePath(t *testing.T) {
138130
}
139131

140132
func TestRealRunnerStdoutPathWithSignal(t *testing.T) {
141-
tmp, err := os.MkdirTemp("", "")
142-
if err != nil {
143-
t.Fatalf("Unexpected error: %v", err)
144-
}
145-
defer os.RemoveAll(tmp)
133+
tmp := t.TempDir()
146134

147135
path := filepath.Join(tmp, "stdout")
148136
rr := realRunner{

‎cmd/entrypoint/subcommands/decode_script_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func TestDecodeScript(t *testing.T) {
3030
decoded := `#!/usr/bin/env sh
3131
echo "Hello World!"
3232
`
33-
mode := os.FileMode(0600)
34-
expectedPermissions := os.FileMode(0600)
33+
mode := os.FileMode(0o600)
34+
expectedPermissions := os.FileMode(0o600)
3535

3636
tmp := t.TempDir()
3737
src := filepath.Join(tmp, "script.txt")
@@ -84,7 +84,7 @@ func TestDecodeScriptInvalidBase64(t *testing.T) {
8484
invalidData := []byte("!")
8585
expectedError := base64.CorruptInputError(0)
8686

87-
src, err := os.CreateTemp("", "decode-script-test-*")
87+
src, err := os.CreateTemp(t.TempDir(), "decode-script-test-*")
8888
if err != nil {
8989
t.Fatalf("error creating temp file: %v", err)
9090
}

‎cmd/entrypoint/waiter_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestRealWaiterWaitMissingFile(t *testing.T) {
3333
// Create a temp file and then immediately delete it to get
3434
// a legitimate tmp path and ensure the file doesnt exist
3535
// prior to testing Wait().
36-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
36+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
3737
if err != nil {
3838
t.Errorf("error creating temp file: %v", err)
3939
}
@@ -61,7 +61,7 @@ func TestRealWaiterWaitMissingFile(t *testing.T) {
6161
}
6262

6363
func TestRealWaiterWaitWithFile(t *testing.T) {
64-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
64+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
6565
if err != nil {
6666
t.Errorf("error creating temp file: %v", err)
6767
}
@@ -85,7 +85,7 @@ func TestRealWaiterWaitWithFile(t *testing.T) {
8585
}
8686

8787
func TestRealWaiterWaitMissingContent(t *testing.T) {
88-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
88+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
8989
if err != nil {
9090
t.Errorf("error creating temp file: %v", err)
9191
}
@@ -112,7 +112,7 @@ func TestRealWaiterWaitMissingContent(t *testing.T) {
112112
}
113113

114114
func TestRealWaiterWaitWithContent(t *testing.T) {
115-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
115+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
116116
if err != nil {
117117
t.Errorf("error creating temp file: %v", err)
118118
}
@@ -126,7 +126,7 @@ func TestRealWaiterWaitWithContent(t *testing.T) {
126126
}
127127
close(doneCh)
128128
}()
129-
if err := os.WriteFile(tmp.Name(), []byte("😺"), 0700); err != nil {
129+
if err := os.WriteFile(tmp.Name(), []byte("😺"), 0o700); err != nil {
130130
t.Errorf("error writing content to temp file: %v", err)
131131
}
132132
delay := time.NewTimer(2 * testWaitPollingInterval)
@@ -139,7 +139,7 @@ func TestRealWaiterWaitWithContent(t *testing.T) {
139139
}
140140

141141
func TestRealWaiterWaitWithErrorWaitfile(t *testing.T) {
142-
tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
142+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
143143
if err != nil {
144144
t.Errorf("error creating temp file: %v", err)
145145
}
@@ -170,7 +170,7 @@ func TestRealWaiterWaitWithErrorWaitfile(t *testing.T) {
170170
}
171171

172172
func TestRealWaiterWaitWithBreakpointOnFailure(t *testing.T) {
173-
tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
173+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
174174
if err != nil {
175175
t.Errorf("error creating temp file: %v", err)
176176
}
@@ -196,7 +196,7 @@ func TestRealWaiterWaitWithBreakpointOnFailure(t *testing.T) {
196196
}
197197

198198
func TestRealWaiterWaitWithContextCanceled(t *testing.T) {
199-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
199+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
200200
if err != nil {
201201
t.Errorf("error creating temp file: %v", err)
202202
}
@@ -224,7 +224,7 @@ func TestRealWaiterWaitWithContextCanceled(t *testing.T) {
224224
}
225225

226226
func TestRealWaiterWaitWithTimeout(t *testing.T) {
227-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
227+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
228228
if err != nil {
229229
t.Errorf("error creating temp file: %v", err)
230230
}
@@ -252,7 +252,7 @@ func TestRealWaiterWaitWithTimeout(t *testing.T) {
252252
}
253253

254254
func TestRealWaiterWaitContextWithBreakpointOnFailure(t *testing.T) {
255-
tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
255+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
256256
if err != nil {
257257
t.Errorf("error creating temp file: %v", err)
258258
}
@@ -278,7 +278,7 @@ func TestRealWaiterWaitContextWithBreakpointOnFailure(t *testing.T) {
278278
}
279279

280280
func TestRealWaiterWaitContextWithErrorWaitfile(t *testing.T) {
281-
tmp, err := os.CreateTemp("", "real_waiter_test_file*.err")
281+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file*.err")
282282
if err != nil {
283283
t.Errorf("error creating temp file: %v", err)
284284
}
@@ -309,7 +309,7 @@ func TestRealWaiterWaitContextWithErrorWaitfile(t *testing.T) {
309309
}
310310

311311
func TestRealWaiterWaitContextWithContent(t *testing.T) {
312-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
312+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
313313
if err != nil {
314314
t.Errorf("error creating temp file: %v", err)
315315
}
@@ -323,7 +323,7 @@ func TestRealWaiterWaitContextWithContent(t *testing.T) {
323323
}
324324
close(doneCh)
325325
}()
326-
if err := os.WriteFile(tmp.Name(), []byte("😺"), 0700); err != nil {
326+
if err := os.WriteFile(tmp.Name(), []byte("😺"), 0o700); err != nil {
327327
t.Errorf("error writing content to temp file: %v", err)
328328
}
329329
delay := time.NewTimer(2 * testWaitPollingInterval)
@@ -339,7 +339,7 @@ func TestRealWaiterWaitContextMissingFile(t *testing.T) {
339339
// Create a temp file and then immediately delete it to get
340340
// a legitimate tmp path and ensure the file doesnt exist
341341
// prior to testing Wait().
342-
tmp, err := os.CreateTemp("", "real_waiter_test_file")
342+
tmp, err := os.CreateTemp(t.TempDir(), "real_waiter_test_file")
343343
if err != nil {
344344
t.Errorf("error creating temp file: %v", err)
345345
}

‎pkg/apis/pipeline/v1/matrix_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ package v1
1616
import (
1717
"context"
1818
"fmt"
19+
"maps"
1920
"sort"
2021

2122
"github.com/tektoncd/pipeline/pkg/apis/config"
22-
"golang.org/x/exp/maps"
2323
"k8s.io/apimachinery/pkg/util/sets"
2424
"k8s.io/utils/strings/slices"
2525
"knative.dev/pkg/apis"

‎pkg/apis/pipeline/v1/task_validation.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323
"reflect"
2424
"regexp"
25+
"slices"
2526
"strings"
2627
"time"
2728

@@ -32,7 +33,6 @@ import (
3233
"github.com/tektoncd/pipeline/pkg/internal/resultref"
3334
"github.com/tektoncd/pipeline/pkg/substitution"
3435

35-
"golang.org/x/exp/slices"
3636
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
3737
corev1 "k8s.io/api/core/v1"
3838
"k8s.io/apimachinery/pkg/util/sets"
@@ -317,9 +317,11 @@ func errorIfStepResultReferenceinField(value, fieldName string) (errs *apis.Fiel
317317
func stepArtifactReferenceExists(src string) bool {
318318
return len(artifactref.StepArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$("+artifactref.StepArtifactPathPattern+")")
319319
}
320+
320321
func taskArtifactReferenceExists(src string) bool {
321322
return len(artifactref.TaskArtifactRegex.FindAllStringSubmatch(src, -1)) > 0 || strings.Contains(src, "$("+artifactref.TaskArtifactPathPattern+")")
322323
}
324+
323325
func errorIfStepArtifactReferencedInField(value, fieldName string) (errs *apis.FieldError) {
324326
if stepArtifactReferenceExists(value) {
325327
errs = errs.Also(&apis.FieldError{

‎pkg/apis/pipeline/v1beta1/matrix_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ package v1beta1
1616
import (
1717
"context"
1818
"fmt"
19+
"maps"
1920
"sort"
2021

2122
"github.com/tektoncd/pipeline/pkg/apis/config"
22-
"golang.org/x/exp/maps"
2323
"k8s.io/apimachinery/pkg/util/sets"
2424
"k8s.io/utils/strings/slices"
2525
"knative.dev/pkg/apis"

‎pkg/apis/pipeline/v1beta1/task_validation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323
"reflect"
2424
"regexp"
25+
"slices"
2526
"strings"
2627
"time"
2728

@@ -33,7 +34,6 @@ import (
3334
"github.com/tektoncd/pipeline/pkg/internal/resultref"
3435
"github.com/tektoncd/pipeline/pkg/substitution"
3536

36-
"golang.org/x/exp/slices"
3737
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
3838
corev1 "k8s.io/api/core/v1"
3939
"k8s.io/apimachinery/pkg/util/sets"

0 commit comments

Comments
 (0)