chore: enable require-error from testifylint (argoproj#681)

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

.github/workflows/ci.yaml

@@ -26,4 +26,4 @@ jobs:
       - uses: codecov/codecov-action@a2f73fb6db51fcd2e0aa085dfb36dea90c5e3689 # v5.0.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }} #required
-          file: ./coverage.out
+          files: ./coverage.out

.golangci.yaml

@@ -120,6 +120,5 @@ linters-settings:
     enable-all: true
     disable:
       - go-require
-      - require-error
 run:
   timeout: 5m

pkg/cache/cluster_test.go

@@ -467,7 +467,7 @@ metadata:
 	_, err = cluster.GetManagedLiveObjs([]*unstructured.Unstructured{clusterLevelRes}, func(r *Resource) bool {
 		return len(r.OwnerRefs) == 0
 	})
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	otherNamespaceRes := strToUnstructured(`
 apiVersion: apps/v1
@@ -638,7 +638,7 @@ metadata:
 			managedObjs, err := cluster.GetManagedLiveObjs([]*unstructured.Unstructured{targetDeploy}, func(_ *Resource) bool {
 				return true
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, testCaseCopy.expectConvertToVersionCalled, convertToVersionWasCalled)
 			assert.Equal(t, testCaseCopy.expectGetResourceCalled, getResourceWasCalled)
 			assert.Equal(t, map[kube.ResourceKey]*unstructured.Unstructured{

pkg/cache/references_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -38,9 +39,7 @@ func Test_isStatefulSetChild(t *testing.T) {
 
 	// Create a new unstructured object from the JSON string
 	un, err := kube.ToUnstructured(statefulSet)
-	if err != nil {
-		t.Errorf("Failed to convert StatefulSet to unstructured: %v", err)
-	}
+	require.NoErrorf(t, err, "Failed to convert StatefulSet to unstructured: %v", err)
 
 	tests := []struct {
 		name      string

pkg/diff/diff_test.go

@@ -172,9 +172,7 @@ func TestDiff(t *testing.T) {
 func TestDiff_KnownTypeInvalidValue(t *testing.T) {
 	leftDep := newDeployment()
 	leftUn := mustToUnstructured(leftDep)
-	if !assert.NoError(t, unstructured.SetNestedField(leftUn.Object, "badValue", "spec", "revisionHistoryLimit")) {
-		return
-	}
+	require.NoError(t, unstructured.SetNestedField(leftUn.Object, "badValue", "spec", "revisionHistoryLimit"))
 
 	t.Run("NoDifference", func(t *testing.T) {
 		diffRes := diff(t, leftUn, leftUn, diffOptionsForTest()...)
@@ -188,9 +186,7 @@ func TestDiff_KnownTypeInvalidValue(t *testing.T) {
 
 	t.Run("HasDifference", func(t *testing.T) {
 		rightUn := leftUn.DeepCopy()
-		if !assert.NoError(t, unstructured.SetNestedField(rightUn.Object, "3", "spec", "revisionHistoryLimit")) {
-			return
-		}
+		require.NoError(t, unstructured.SetNestedField(rightUn.Object, "3", "spec", "revisionHistoryLimit"))
 
 		diffRes := diff(t, leftUn, rightUn, diffOptionsForTest()...)
 		assert.True(t, diffRes.Modified)
@@ -206,13 +202,13 @@ func TestDiffWithNils(t *testing.T) {
 	// This "difference" is checked at the comparator.
 	assert.False(t, diffRes.Modified)
 	diffRes, err := TwoWayDiff(nil, resource)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.False(t, diffRes.Modified)
 
 	diffRes = diff(t, resource, nil, diffOptionsForTest()...)
 	assert.True(t, diffRes.Modified)
 	diffRes, err = TwoWayDiff(resource, nil)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.True(t, diffRes.Modified)
 }
 
@@ -529,7 +525,7 @@ func TestDiffResourceWithInvalidField(t *testing.T) {
 	diffRes := diff(t, &leftUn, rightUn, diffOptionsForTest()...)
 	assert.True(t, diffRes.Modified)
 	ascii, err := printDiff(diffRes)
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Contains(t, ascii, "invalidKey")
 	if ascii != "" {
@@ -756,19 +752,12 @@ func TestUnsortedEndpoints(t *testing.T) {
 func buildGVKParser(t *testing.T) *managedfields.GvkParser {
 	t.Helper()
 	document := &openapi_v2.Document{}
-	err := proto.Unmarshal(testdata.OpenAPIV2Doc, document)
-	if err != nil {
-		t.Fatalf("error unmarshaling openapi doc: %s", err)
-	}
+	require.NoErrorf(t, proto.Unmarshal(testdata.OpenAPIV2Doc, document), "error unmarshaling openapi doc")
 	models, err := openapiproto.NewOpenAPIData(document)
-	if err != nil {
-		t.Fatalf("error building openapi data: %s", err)
-	}
+	require.NoErrorf(t, err, "error building openapi data: %s", err)
 
 	gvkParser, err := managedfields.NewGVKParser(models, false)
-	if err != nil {
-		t.Fatalf("error building gvkParser: %s", err)
-	}
+	require.NoErrorf(t, err, "error building gvkParser: %s", err)
 	return gvkParser
 }
 
@@ -1353,10 +1342,7 @@ func getLiveSecretJsonBytes() []byte {
 func bytesToUnstructured(t *testing.T, jsonBytes []byte) *unstructured.Unstructured {
 	t.Helper()
 	var jsonMap map[string]any
-	err := json.Unmarshal(jsonBytes, &jsonMap)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, json.Unmarshal(jsonBytes, &jsonMap))
 	return &unstructured.Unstructured{
 		Object: jsonMap,
 	}
@@ -1371,7 +1357,7 @@ func TestHideSecretDataHandleEmptySecret(t *testing.T) {
 	target, live, err := HideSecretData(targetSecret, liveSecret, nil)
 
 	// then
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.NotNil(t, target)
 	assert.NotNil(t, live)
 	assert.Nil(t, target.Object["data"])
@@ -1405,8 +1391,7 @@ metadata:
   name: my-sa
 `)
 	var un unstructured.Unstructured
-	err := yaml.Unmarshal(manifest, &un)
-	assert.NoError(t, err)
+	require.NoError(t, yaml.Unmarshal(manifest, &un))
 	newUn := remarshal(&un, applyOptions(diffOptionsForTest()))
 	_, ok := newUn.Object["imagePullSecrets"]
 	assert.False(t, ok)
@@ -1438,8 +1423,7 @@ spec:
         cpu: 0.2
 `)
 	un := unstructured.Unstructured{}
-	err := yaml.Unmarshal(manifest, &un)
-	require.NoError(t, err)
+	require.NoError(t, yaml.Unmarshal(manifest, &un))
 
 	testCases := []struct {
 		name        string
@@ -1521,20 +1505,14 @@ func diffOptionsForTest() []Option {
 func YamlToSvc(t *testing.T, y []byte) *corev1.Service {
 	t.Helper()
 	svc := corev1.Service{}
-	err := yaml.Unmarshal(y, &svc)
-	if err != nil {
-		t.Fatalf("error unmarshaling service bytes: %s", err)
-	}
+	require.NoErrorf(t, yaml.Unmarshal(y, &svc), "error unmarshaling service bytes")
 	return &svc
 }
 
 func YamlToDeploy(t *testing.T, y []byte) *appsv1.Deployment {
 	t.Helper()
 	deploy := appsv1.Deployment{}
-	err := yaml.Unmarshal(y, &deploy)
-	if err != nil {
-		t.Fatalf("error unmarshaling deployment bytes: %s", err)
-	}
+	require.NoErrorf(t, yaml.Unmarshal(y, &deploy), "error unmarshaling deployment bytes")
 	return &deploy
 }
 

pkg/sync/sync_context_test.go

@@ -233,9 +233,7 @@ func TestSyncCustomResources(t *testing.T) {
 				}
 			}
 
-			if tt.wantDryRun != !skipDryRun {
-				t.Errorf("dryRun = %v, want: %v", !skipDryRun, tt.wantDryRun)
-			}
+			assert.Equalf(t, tt.wantDryRun, !skipDryRun, "dryRun = %v, want: %v", !skipDryRun, tt.wantDryRun)
 		})
 	}
 }
@@ -1003,7 +1001,7 @@ func TestNamespaceAutoCreation(t *testing.T) {
 	namespace.SetName(testingutils.FakeArgoCDNamespace)
 
 	task, err := createNamespaceTask(syncCtx.namespace)
-	assert.NoError(t, err, "Failed creating test data: namespace task")
+	require.NoError(t, err, "Failed creating test data: namespace task")
 
 	// Namespace auto creation pre-sync task should not be there
 	// since there is namespace resource in syncCtx.resources
@@ -1457,9 +1455,8 @@ func Test_syncContext_liveObj(t *testing.T) {
 				resources: groupResources(tt.fields.compareResult),
 				hooks:     tt.fields.compareResult.Hooks,
 			}
-			if got := sc.liveObj(tt.args.obj); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("syncContext.liveObj() = %v, want %v", got, tt.want)
-			}
+			got := sc.liveObj(tt.args.obj)
+			assert.Truef(t, reflect.DeepEqual(got, tt.want), "syncContext.liveObj() = %v, want %v", got, tt.want)
 		})
 	}
 }

pkg/utils/kube/convert_test.go

@@ -6,6 +6,7 @@ import (
 	testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/yaml"
 )
@@ -76,7 +77,7 @@ func Test_convertToVersionWithScheme(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			obj := testingutils.UnstructuredFromFile("testdata/" + tt.file)
 			target, err := schema.ParseGroupVersion(tt.outputVersion)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			out, err := convertToVersionWithScheme(obj, target.Group, target.Version)
 			if assert.NoError(t, err) {
 				assert.NotNil(t, out)