diff --git a/.github/workflows/pr-linter-check.yml b/.github/workflows/pr-linter-check.yml index 429b7b169e..11c1d17bba 100644 --- a/.github/workflows/pr-linter-check.yml +++ b/.github/workflows/pr-linter-check.yml @@ -15,5 +15,5 @@ jobs: - name: Linter check uses: golangci/golangci-lint-action@v6 with: - version: v1.57.2 + version: v1.61.0 args: --verbose diff --git a/.golangci.yaml b/.golangci.yaml index 4c414b8439..fabd863a4a 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -238,7 +238,6 @@ linters-settings: testifylint: # TODO: enable them all disable: - - go-require - float-compare - require-error enable-all: true diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index fb72a5290c..28d05d8c5f 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -94,7 +94,7 @@ RUN ARCH=$(go env GOARCH) && \ chmod +x /usr/bin/goreleaser # get golangci-lint -RUN curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2 +RUN curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0 # install kubectl RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/$(go env GOARCH)/kubectl diff --git a/pkg/backup/actions/csi/pvc_action_test.go b/pkg/backup/actions/csi/pvc_action_test.go index 59da6145f4..ce701ba41d 100644 --- a/pkg/backup/actions/csi/pvc_action_test.go +++ b/pkg/backup/actions/csi/pvc_action_test.go @@ -27,6 +27,7 @@ import ( snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1" v1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1" "github.com/sirupsen/logrus" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" @@ -176,7 +177,7 @@ func TestExecute(t *testing.T) { err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 10*time.Second, true, func(ctx context.Context) (bool, error) { err = pvcBIA.crClient.List(ctx, &vsList, &crclient.ListOptions{Namespace: tc.pvc.Namespace}) - require.NoError(t, err) + assert.NoError(t, err) if err != nil || len(vsList.Items) == 0 { //lint:ignore nilerr reason return false, nil // ignore @@ -184,7 +185,7 @@ func TestExecute(t *testing.T) { return true, nil }) - require.NoError(t, err) + assert.NoError(t, err) vscName := "testVSC" readyToUse := true vsList.Items[0].Status = &v1.VolumeSnapshotStatus{ @@ -192,12 +193,12 @@ func TestExecute(t *testing.T) { ReadyToUse: &readyToUse, } err = pvcBIA.crClient.Update(context.Background(), &vsList.Items[0]) - require.NoError(t, err) + assert.NoError(t, err) handleName := "testHandle" vsc := builder.ForVolumeSnapshotContent("testVSC").Status(&snapshotv1api.VolumeSnapshotContentStatus{SnapshotHandle: &handleName}).Result() err = pvcBIA.crClient.Create(context.Background(), vsc) - require.NoError(t, err) + assert.NoError(t, err) }() } diff --git a/pkg/cmd/cli/backup/logs_test.go b/pkg/cmd/cli/backup/logs_test.go index 2d6ee828ed..6daf5ae308 100644 --- a/pkg/cmd/cli/backup/logs_test.go +++ b/pkg/cmd/cli/backup/logs_test.go @@ -136,7 +136,7 @@ func TestNewLogsCommand(t *testing.T) { done := make(chan bool) go func() { err = l.Run(c, f) - require.Error(t, err) + assert.Error(t, err) }() select {