From 4c365de5b029460ef1d7596fa8698632c25405c1 Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <matthieu.morel35@gmail.com>
Date: Tue, 31 Dec 2024 07:54:08 +0100
Subject: [PATCH] chore: enable testifylint linter

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
---
 .golangci.yml                    |  8 ++++++++
 exec/exec_test.go                |  4 ++--
 file/file_test.go                |  6 +++---
 grpc/http/forwarders_test.go     | 14 +++++++-------
 kubeclientmetrics/metric_test.go |  2 +-
 time/time_test.go                |  6 +++---
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 2446e07f6..6c7014945 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,6 +5,14 @@ run:
 issues:
   exclude-dirs:
     - vendor
+linters:
+  enable:
+    - testifylint
 linters-settings:
   goimports:
     local-prefixes: github.com/argoproj/pkg
+  testifylint:
+    enable-all: true
+    disable:
+      - float-compare
+      - require-error
diff --git a/exec/exec_test.go b/exec/exec_test.go
index 987fe861a..613f94cc1 100644
--- a/exec/exec_test.go
+++ b/exec/exec_test.go
@@ -41,7 +41,7 @@ func TestRunCommandTimeout(t *testing.T) {
 	defer log.SetLevel(log.InfoLevel)
 
 	output, err := RunCommand("sh", CmdOpts{Timeout: 500 * time.Millisecond}, "-c", "echo hello world && echo my-error >&2 && sleep 2")
-	assert.Equal(t, output, "hello world")
+	assert.Equal(t, "hello world", output)
 	assert.EqualError(t, err, "`sh -c echo hello world && echo my-error >&2 && sleep 2` failed timeout after 500ms")
 
 	assert.Len(t, hook.Entries, 3)
@@ -125,7 +125,7 @@ func TestRunInDir(t *testing.T) {
 	cmd := exec.Command("pwd")
 	cmd.Dir = "/"
 	message, err := RunCommandExt(cmd, CmdOpts{})
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, "/", message)
 }
 
diff --git a/file/file_test.go b/file/file_test.go
index c661aa6e7..30e411cf5 100644
--- a/file/file_test.go
+++ b/file/file_test.go
@@ -20,15 +20,15 @@ func TestIsDirectory(t *testing.T) {
 	testDir := filepath.Dir(filename)
 
 	isDir, err := IsDirectory(testDir)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.True(t, isDir)
 
 	isDir, err = IsDirectory(filename)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.False(t, isDir)
 
 	isDir, err = IsDirectory("doesnt-exist")
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 	assert.False(t, isDir)
 }
 
diff --git a/grpc/http/forwarders_test.go b/grpc/http/forwarders_test.go
index 40a6a603e..cf5462b89 100644
--- a/grpc/http/forwarders_test.go
+++ b/grpc/http/forwarders_test.go
@@ -40,8 +40,8 @@ func TestMarshalerIncludeFields(t *testing.T) {
 
 	out, err := m.Marshal(testVal)
 
-	assert.Nil(t, err)
-	assert.Equal(t, `{"metadata":{"name":"test"},"spec":{"source":{"path":"test_path"}}}`, string(out))
+	assert.NoError(t, err)
+	assert.JSONEq(t, `{"metadata":{"name":"test"},"spec":{"source":{"path":"test_path"}}}`, string(out))
 }
 
 func TestMarshalerExcludeFields(t *testing.T) {
@@ -51,8 +51,8 @@ func TestMarshalerExcludeFields(t *testing.T) {
 
 	out, err := m.Marshal(testVal)
 
-	assert.Nil(t, err)
-	assert.Equal(t, `{"metadata":{},"spec":{"source":{"path":"test_path"}},"status":{"message":"Failed"}}`, string(out))
+	assert.NoError(t, err)
+	assert.JSONEq(t, `{"metadata":{},"spec":{"source":{"path":"test_path"}},"status":{"message":"Failed"}}`, string(out))
 }
 
 func TestMarshalerSSE(t *testing.T) {
@@ -60,7 +60,7 @@ func TestMarshalerSSE(t *testing.T) {
 
 	out, err := m.Marshal(testVal)
 
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, `data: {"metadata":{"name":"test"},"spec":{"source":{"path":"test_path"}},"status":{"message":"Failed"}} 
 
 `, string(out))
@@ -89,7 +89,7 @@ func TestFlushSuccess(t *testing.T) {
 	f := flusher{w: bufio.NewWriter(&buf)}
 	flush(&f)
 
-	assert.Equal(t, true, flushed)
+	assert.True(t, flushed)
 }
 
 func TestFlushFailed(t *testing.T) {
@@ -98,5 +98,5 @@ func TestFlushFailed(t *testing.T) {
 	f := flusher{}
 	flush(&f)
 
-	assert.Equal(t, false, flushed)
+	assert.False(t, flushed)
 }
diff --git a/kubeclientmetrics/metric_test.go b/kubeclientmetrics/metric_test.go
index 31c7187b5..228d95ae9 100644
--- a/kubeclientmetrics/metric_test.go
+++ b/kubeclientmetrics/metric_test.go
@@ -23,7 +23,7 @@ type fakeWrapper struct {
 func (f fakeWrapper) RoundTrip(r *http.Request) (*http.Response, error) {
 	resp := httptest.NewRecorder()
 	resp.Code = 201
-	assert.Equal(f.t, f.currentCount, f.expectedCount)
+	assert.Equal(f.t, f.expectedCount, f.currentCount)
 	return resp.Result(), nil
 }
 
diff --git a/time/time_test.go b/time/time_test.go
index 3509ce98f..aea47ea2e 100644
--- a/time/time_test.go
+++ b/time/time_test.go
@@ -24,17 +24,17 @@ func TestParseDuration(t *testing.T) {
 	}
 	for _, data := range testdata {
 		dur, err := ParseDuration(data.duration)
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.Equal(t, dur.Nanoseconds(), data.xVal.Nanoseconds())
 	}
 	_, err := ParseDuration("1z")
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }
 
 // TestParseSince tests parsing of since strings
 func TestParseSince(t *testing.T) {
 	oneDayAgo, err := ParseSince("1d")
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	yesterday := time.Now().UTC().Add(-24 * time.Hour)
 	assert.Equal(t, yesterday.Minute(), oneDayAgo.Minute())
 }