* fixed linter manually

Author: maranqz

.golangci.yml

@@ -20,17 +20,23 @@ linters:
         - tr
         - tx
         - t
-        - xtx
+        - xTx
+        - xTr
         - sp
         - in
         - s
+        - xs
         - oo
+        - fn
+        - ok
       ignore-decls:
         - wg sync.WaitGroup
         - wg *sync.WaitGroup
         - db *gorm.DB
         - db redis.UniversalClient
-        - m Manager
+        - db *sql.DB
+        - m *Manager
+        - m trm.Manager
     wsl_v5:
       default: all
       disable:
@@ -92,6 +98,16 @@ linters:
           - wsl_v5
         text: 'missing whitespace above this line'
 
+      - path: 'trm/trm/context/'
+        linters:
+          - revive
+        text: 'var-naming: avoid package names that conflict with Go standard library package names'
+
+      - path: 'trm/trm/internal/.+\.go'
+        linters:
+          - revive
+        text: 'var-naming: avoid meaningless package names'
+
       - path: '_test\.go'
         linters:
           - revive
@@ -121,6 +137,16 @@ linters:
           - ireturn
         source: '\) Begin\(ctx'
 
+      - path: '(.+/)?xsettings\.go'
+        linters:
+          - ireturn
+        source: 'func DefaultXSettings\('
+
+      - path: '(.+/)?xsettings\.go'
+        linters:
+          - ireturn
+        source: 'func NewXSettings\('
+
       - path: '(.+/)?settings\.go'
         linters:
           - ireturn
@@ -130,6 +156,18 @@ linters:
           - gochecknoglobals
         source: 'DefaultCtxGetter'
 
+
+      - path: 'trm/trm/drivers/mock'
+        text: ' package has more than one godoc ("mock")'
+        linters:
+          - godoclint
+
+      - path: '_test\.go'
+        source: 'do: func\('
+        text: 'test helper function should start from t.Helper()'
+        linters:
+          - thelper
+
       - path: '_test\.go'
         source: 'prepare: func\('
         text: 'test helper function should start from t.Helper()'
@@ -166,8 +204,14 @@ linters:
 formatters:
   enable:
     - gofmt
+    - gci
     - gofumpt
     - goimports
+    - golines
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/avito-tech/go-transaction-manager/trm/v2
 
   exclusions:
     paths:

Makefile

@@ -23,6 +23,9 @@ fmt:
 lint:
 	cd sh && sh ./lint.sh
 
+lint-with-fix:
+	cd sh && sh ./lint.sh --fix
+
 lint.verbose:
 	cd sh && sh ./lint.sh -v
 

drivers/goredis8/context.go

@@ -3,10 +3,9 @@ package goredis8
 import (
 	"context"
 
-	"github.com/go-redis/redis/v8"
-
 	"github.com/avito-tech/go-transaction-manager/trm/v2"
 	trmcontext "github.com/avito-tech/go-transaction-manager/trm/v2/context"
+	"github.com/go-redis/redis/v8"
 )
 
 // DefaultCtxGetter is the CtxGetter with settings.DefaultCtxKey.

drivers/goredis8/factory.go

@@ -3,9 +3,8 @@ package goredis8
 import (
 	"context"
 
-	"github.com/go-redis/redis/v8"
-
 	"github.com/avito-tech/go-transaction-manager/trm/v2"
+	"github.com/go-redis/redis/v8"
 )
 
 // NewDefaultFactory creates default trm.Transaction(redis.UniversalClient).