chore: enable testifylint golangci-lint linter

Signed-off-by: Alex Szakaly <alex.szakaly@gmail.com>
alex1989hu · May 8, 2024 · 7e31108 · 7e31108
1 parent a02118f
commit 7e31108
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -113,6 +113,8 @@ linters-settings:
     simple: true
     range-loops: true
     for-loops: true
+  testifylint:
+    enable-all: true
   thelper:
     test:
       first: true
@@ -163,6 +165,7 @@ linters:
     - revive
     - staticcheck
     - stylecheck
+    - testifylint
     - testpackage
     - thelper
     - tparallel

diff --git a/controller/certificatesigningrequest/controller_test.go b/controller/certificatesigningrequest/controller_test.go
@@ -30,6 +30,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	certificatesv1 "k8s.io/api/certificates/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -202,7 +203,7 @@ func TestReconcileClientGetError(t *testing.T) {
 	req := reconcile.Request{NamespacedName: types.NamespacedName{}}
 	res, err := signingReconciler.Reconcile(context.TODO(), req)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), errMockGet.Error())
 	assert.Equal(t, reconcile.Result{}, res)
 
@@ -222,7 +223,7 @@ func TestReconcileClientGetNotFoundError(t *testing.T) {
 	req := reconcile.Request{NamespacedName: types.NamespacedName{}}
 	res, err := signingReconciler.Reconcile(context.TODO(), req)
 
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, reconcile.Result{}, res)
 
 	mockClient.AssertExpectations(t)
@@ -354,7 +355,7 @@ func TestReconcileSwitchCasesNegativePath(t *testing.T) {
 
 			res, err := r.Reconcile(context.TODO(), req)
 
-			assert.Nil(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, reconcile.Result{}, res)
 		})
 	}
@@ -414,7 +415,7 @@ func TestReconcileValidCSR(t *testing.T) {
 
 	res, err := r.Reconcile(context.TODO(), req)
 
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, reconcile.Result{}, res)
 	assert.Len(t, fakeEventRecorder.Events, 1)
 }
@@ -470,7 +471,7 @@ func TestReconcileParseCSRError(t *testing.T) {
 
 	res, err := r.Reconcile(context.TODO(), req)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "PEM Block")
 	assert.Equal(t, reconcile.Result{}, res)
 	assert.Len(t, fakeEventRecorder.Events, 1)
@@ -520,7 +521,7 @@ func TestReconcileRecognizeError(t *testing.T) {
 
 	res, err := r.Reconcile(context.TODO(), req)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "x509 Common Name")
 	assert.Equal(t, reconcile.Result{}, res)
 	assert.Len(t, fakeEventRecorder.Events, 1)
@@ -570,7 +571,7 @@ func TestReconcileAuthorizationError(t *testing.T) {
 
 	res, err := r.Reconcile(context.TODO(), req)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), errAuthorization.Error())
 	assert.Equal(t, reconcile.Result{}, res)
 	assert.Len(t, fakeEventRecorder.Events, 1)
@@ -627,7 +628,7 @@ func TestReconcileAuthorizationDenied(t *testing.T) {
 
 	res, err := r.Reconcile(context.TODO(), req)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), "Subject Access Review")
 	assert.Equal(t, reconcile.Result{}, res)
 	assert.Len(t, fakeEventRecorder.Events, 1)
@@ -692,7 +693,7 @@ func TestReconcileUpdateApprovalError(t *testing.T) {
 
 	res, err := r.Reconcile(context.TODO(), req)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Contains(t, err.Error(), errApprovalUpdate.Error())
 	assert.Equal(t, reconcile.Result{}, res)
 	assert.Len(t, fakeEventRecorder.Events, 1)

diff --git a/controller/certificatesigningrequest/helper_test.go b/controller/certificatesigningrequest/helper_test.go
@@ -19,13 +19,13 @@ package certificatesigningrequest
 import (
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"errors"
 	"fmt"
 	"net"
 	"net/url"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	certificatesv1 "k8s.io/api/certificates/v1"
 )
 
@@ -50,9 +50,9 @@ func TestParseCSR(t *testing.T) {
 
 	csr, err := parseCSR(nil)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Nil(t, csr)
-	assert.True(t, errors.Is(err, errNotCertificateRequest))
+	assert.ErrorIs(t, err, errNotCertificateRequest)
 }
 
 func TestParseCSRMissingBlock(t *testing.T) {
@@ -64,7 +64,7 @@ func TestParseCSRMissingBlock(t *testing.T) {
 `)
 	csr, err := parseCSR(pemCSR)
 
-	assert.NotNil(t, err)
+	require.Error(t, err)
 	assert.Nil(t, csr)
 	assert.Contains(t, err.Error(), "during parsing of Certificate Signing Request")
 }
@@ -74,7 +74,7 @@ func TestParseCSRValidInput(t *testing.T) {
 
 	csr, err := parseCSR(generatePEMEncodedCSR(t))
 
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	assert.NotNil(t, csr)
 }
 
@@ -260,7 +260,7 @@ func TestIsRequestConformInvalidSigningRequest(t *testing.T) {
 
 		t.Run(fmt.Sprint(table.expectedError), func(t *testing.T) {
 			t.Parallel()
-			assert.True(t, errors.Is(isRequestConform(TestLogger, table.csr, &table.x509cr), table.expectedError))
+			assert.ErrorIs(t, isRequestConform(TestLogger, table.csr, &table.x509cr), table.expectedError)
 		})
 	}
 }