Update golangci-lint config (#2772)

FerretDB · Jun 2, 2023 · 40fa532 · 40fa532
1 parent c60534b
commit 40fa532
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/.golangci-new.yml b/.golangci-new.yml
@@ -17,7 +17,7 @@ linters-settings:
   revive:
     ignore-generated-header: true
     severity: warning
-    # TODO enable-all-rules: true
+    # TODO enable-all-rules: true https://github.com/FerretDB/FerretDB/issues/2748
     rules:
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
       - name: exported
@@ -62,8 +62,9 @@ linters:
     - unused
     - whitespace
 
-    # TODO configure and enable one by one
+    # TODO https://github.com/FerretDB/FerretDB/issues/2748
     - bidichk
+    - bodyclose
     - containedctx
     - contextcheck
     - cyclop
@@ -110,6 +111,8 @@ linters:
     - prealloc
     - predeclared
     - promlinter
+    - rowserrcheck
+    - sqlclosecheck
     - stylecheck
     - tagliatelle
     - tenv
@@ -120,13 +123,8 @@ linters:
     - unparam
     - varcheck
     - varnamelen
-    - wrapcheck
-
-    # TODO https://github.com/golangci/golangci-lint/issues/2649
-    - bodyclose
-    - rowserrcheck
-    - sqlclosecheck
     - wastedassign
+    - wrapcheck
 
     # deprecated
     - golint

diff --git a/.golangci.yml b/.golangci.yml
@@ -84,6 +84,8 @@ linters-settings:
         alias: dto
       - pkg: github.com/jackc/pgx-zap
         alias: zapadapter
+      - pkg: modernc.org/sqlite/lib
+        alias: sqlitelib
   # ineffassign
   lll:
     line-length: 130

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -393,10 +393,6 @@ tasks:
       - go vet -vettool=./bin/checkswitch{{exeExt}} ./...
       - bin/task{{exeExt}} -d integration integration-lint
       - bin/task{{exeExt}} -d tools tools-lint
-    sources:
-      - "**/*.go"
-      - "**/go.mod"
-      - "**/*.yml"
 
   security:
     desc: "Run security scanners"

diff --git a/integration/Taskfile.yml b/integration/Taskfile.yml
@@ -45,10 +45,6 @@ tasks:
       - ../bin/go-consistent{{exeExt}} -pedantic ./...
       - ../bin/go-sumtype{{exeExt}} ./...
       - go vet -vettool=../bin/checkswitch{{exeExt}} ./...
-    sources:
-      - "**/*.go"
-      - "../**/go.mod"
-      - "../**/*.yml"
 
   integration-security:
     cmds:

diff --git a/tools/Taskfile.yml b/tools/Taskfile.yml
@@ -16,7 +16,3 @@ tasks:
       - ../bin/golangci-lint{{exeExt}} run --config=../.golangci-new.yml ./checkdocs/... ./checkswitch/...
       - ../bin/go-consistent{{exeExt}} -pedantic ./checkdocs/... ./checkswitch/...
       - go vet -vettool=../bin/checkswitch{{exeExt}} ./checkdocs/... ./checkswitch/...
-    sources:
-      - "**/*.go"
-      - "../**/go.mod"
-      - "../**/*.yml"