* fixed linter manually

Author: maranqz

.golangci.yml

@@ -20,17 +20,22 @@ linters:
         - tr
         - tx
         - t
-        - xtx
+        - xTx
+        - xTr
         - sp
         - in
         - s
+        - xs
         - oo
+        - fn
       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:
@@ -166,8 +171,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).