Merge pull request #127733 from mmorel-35/testifylint/clean-up

fix: clean up testifylint configuration in golangci-lint
kubernetes · Sep 29, 2024 · 1bbe775 · 1bbe775
2 parents 93f82d2 + 0d2ad0e
commit 1bbe775
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/hack/golangci-hints.yaml b/hack/golangci-hints.yaml
@@ -185,5 +185,3 @@ linters-settings: # please keep this alphabetized
       - "all"
   testifylint:
     enable-all: true
-    disable:  # TODO: remove each disabled rule and fix it
-      - require-error
diff --git a/hack/golangci.yaml b/hack/golangci.yaml
@@ -239,11 +239,6 @@ linters-settings: # please keep this alphabetized
   testifylint:
     enable-all: true
     disable:  # TODO: remove each disabled rule and fix it
-      - compares
-      - error-is-as
-      - error-nil
-      - expected-actual
       - float-compare
       - go-require
-      - nil-compare
       - require-error
diff --git a/hack/golangci.yaml.in b/hack/golangci.yaml.in
@@ -210,14 +210,11 @@ linters-settings: # please keep this alphabetized
   {{- end}}
   testifylint:
     enable-all: true
+    {{- if not .Hints }}
     disable:  # TODO: remove each disabled rule and fix it
-    {{- if .Base}}
-      - compares
-      - error-is-as
-      - error-nil
-      - expected-actual
+      {{- if .Base }}
       - float-compare
       - go-require
-      - nil-compare
-    {{- end}}
+      {{- end}}
       - require-error
+    {{- end}}