diff --git a/.golangci.yml b/.golangci.yml index f4d15ad36..a3ebf9dce 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -74,10 +74,6 @@ linters-settings: issues: exclude-rules: - # ignore errcheck for code under a /test folder - - path: "test/*" - linters: - - errcheck # ignore errcheck for flags.Parse (it is expected that we flag.ExitOnError) # ignore response.WriteError as it always returns the err it was passed - source: "flags.Parse|response.WriteError" diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go b/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go index b257a21af..5fc1704d8 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/onsi/gomega" + "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/storage/names" @@ -35,22 +36,31 @@ func TestGeneratePatches( // Server side apply does not work with the fake client, hack around it by pre-creating empty Secrets // https://github.com/kubernetes-sigs/controller-runtime/issues/2341 - fakeClient.Create( - context.Background(), - newTestSecret(validSecretName, request.Namespace), + require.NoError( + t, + fakeClient.Create( + context.Background(), + newTestSecret(validSecretName, request.Namespace), + ), ) - fakeClient.Create( - context.Background(), - newEmptySecret( - request.KubeadmControlPlaneTemplateRequestObjectName+"-registry-config", - request.Namespace, + require.NoError( + t, + fakeClient.Create( + context.Background(), + newEmptySecret( + request.KubeadmControlPlaneTemplateRequestObjectName+"-registry-config", + request.Namespace, + ), ), ) - fakeClient.Create( - context.Background(), - newEmptySecret( - request.KubeadmConfigTemplateRequestObjectName+"-registry-config", - request.Namespace, + require.NoError( + t, + fakeClient.Create( + context.Background(), + newEmptySecret( + request.KubeadmConfigTemplateRequestObjectName+"-registry-config", + request.Namespace, + ), ), )