linter fixes

Author: vladyslav2

.golangci.yml

@@ -14,7 +14,6 @@ skip-files:
 linters:
   enable-all: true
   disable:
-    - fatcontext
     - nlreturn
     - wrapcheck
     - tagliatelle

context/keys/keys.go

@@ -6,7 +6,10 @@ import (
 	"strings"
 )
 
-type ContextKey rune
+type (
+	ContextKey rune
+	ContextStr string
+)
 
 const (
 	CtxTraceID ContextKey = iota
@@ -17,8 +20,8 @@ const (
 	LogInfo
 	RequestLogID
 
-	RequestIDStr = "X-Request-Id"
-	IPAddressStr = "IP-Address"
+	RequestIDStr ContextStr = "X-Request-Id"
+	IPAddressStr ContextStr = "IP-Address"
 )
 
 func GetAsString(ctx context.Context, key any) string {

db/conn.go

@@ -21,6 +21,7 @@ func NewConn(ctx context.Context) *pgx.Conn {
 
 // NewConnFromConfig is constructor for *pgx.Conn
 func NewConnFromConfig(ctx context.Context, pgConfig *pgx.ConnConfig) *pgx.Conn {
+	//nolint:contextcheck
 	logger := logger.NewComponentLogger(context.TODO(), pkgName)
 
 	return newConn(ctx, pgConfig, logger)

db/db.go

@@ -1,3 +1,4 @@
+//nolint:gochecknoglobals
 package db
 
 import (

db/dbtests/db_fixture.go

@@ -9,6 +9,10 @@ import (
 	"github.com/webdevelop-pro/go-common/db"
 )
 
+type contextKey string
+
+const dbKey contextKey = "db"
+
 type Fixture struct {
 	table    string
 	filePath string
@@ -71,7 +75,7 @@ func (f FixturesManager) CleanAndApply() error {
 }
 
 func (f FixturesManager) SetCTX(ctx context.Context) context.Context {
-	return context.WithValue(ctx, "db", f.db)
+	return context.WithValue(ctx, dbKey, f.db)
 }
 
 func (f FixturesManager) Clean(table string) error {

db/dbtests/tests.go

@@ -18,7 +18,8 @@ const (
 )
 
 func getDBPool(t tests.TestContext) *db.DB {
-	return t.Ctx.Value("db").(*db.DB)
+	//nolint:forcetypeassert
+	return t.Ctx.Value(dbKey).(*db.DB)
 }
 
 func RawSQL(query string) tests.SomeAction {

db/pool.go

@@ -1,4 +1,3 @@
-//nolint:gochecknoglobals
 package db
 
 import (

docker/go.mod

@@ -76,7 +76,18 @@ install)
   ;;
 
 lint)
-  golangci-lint -c .golangci.yml run $2 $3
+  dirlist=`ls`
+  for ddir in $dirlist[@]
+  do
+    if [ -d $ddir ]
+    then
+      if [ -f "$ddir/go.mod" ]; then
+        cd $ddir
+        golangci-lint -c ../.golangci.yml run --fix $2 $3
+        cd ../
+      fi
+    fi
+  done
   ;;
 
 test)

docker/go.sum

@@ -20,19 +20,19 @@ type Request struct {
 	Method, Path       string
 	Body               []byte
 	Headers            map[string]string
-	Ctx                context.Context
 }
 
 // CreateDefaultRequest default json request
-func CreateDefaultRequest(req Request) (*http.Request, error) {
+func CreateDefaultRequest(ctx context.Context, req Request) (*http.Request, error) {
 	if req.Port != "" {
 		req.Host = net.JoinHostPort(req.Host, req.Port)
 	}
 	if req.Scheme == "" {
 		req.Scheme = "http"
 	}
 
-	res, err := http.NewRequest(
+	res, err := http.NewRequestWithContext(
+		ctx,
 		req.Method,
 		fmt.Sprintf("%s://%s%s", req.Scheme, req.Host, req.Path),
 		bytes.NewBuffer((req.Body)),
@@ -41,7 +41,6 @@ func CreateDefaultRequest(req Request) (*http.Request, error) {
 		return res, errors.Wrapf(err, "cannot create new request")
 	}
 
-	res = res.WithContext(req.Ctx)
 	res.Header.Add("Content-Type", "application/json")
 
 	for key, value := range req.Headers {

make.sh

@@ -7,7 +7,12 @@ import (
 	"github.com/webdevelop-pro/go-common/tests"
 )
 
+type contextKey string
+
+const ctxKey contextKey = "db"
+
 func getClient(t tests.TestContext) *Client {
+	//nolint:forcetypeassert
 	return t.Ctx.Value(pkgName).(*Client)
 }
 
@@ -18,12 +23,14 @@ func SendPubSubEvent(topic string, body any, attr map[string]string) tests.SomeA
 	}
 }
 
+/*
 func CheckIfMsgRead(topic string, body any) tests.SomeAction {
 	return func(t tests.TestContext) error {
 		// _, err := getClient(t).PublishToTopic(context.Background(), topic, body, attr)
 		return nil
 	}
 }
+*/
 
 type Fixture struct {
 	topic        string
@@ -66,7 +73,7 @@ func (pubSubF FixturesManager) CleanAndApply() error {
 }
 
 func (pubSubF FixturesManager) SetCTX(ctx context.Context) context.Context {
-	return context.WithValue(ctx, "pubsub", pubSubF.client)
+	return context.WithValue(ctx, ctxKey, pubSubF.client)
 }
 
 func (pubSubF FixturesManager) Clean(topic string, subscription string) error {

misc/httputils/httputils.go

@@ -9,7 +9,6 @@ import (
 // BadRequest shortcut to return http.StatusBadRequest with custom error and msg
 func BadRequest(err error, msg string) Error {
 	if err == nil {
-		//nolint:goerr113
 		err = errors.New("")
 	}
 	finalMsg := map[string][]string{"__error__": {msg}}
@@ -26,7 +25,6 @@ func BadRequest(err error, msg string) Error {
 // NotFound shortcut to return http.StatusNotFound with custom error and msg
 func NotFound(err error, msg string) Error {
 	if err == nil {
-		//nolint:goerr113
 		err = errors.New("")
 	}
 	finalMsg := map[string][]string{"__error__": {msg}}
@@ -43,7 +41,6 @@ func NotFound(err error, msg string) Error {
 // NotFound shortcut to return http.StatusNotFound with custom error and msg
 func InternalError(err error, msg string) Error {
 	if err == nil {
-		//nolint:goerr113
 		err = errors.New("")
 	}
 	finalMsg := map[string][]string{"__error__": {msg}}

queue/pclient/tests.go

@@ -10,8 +10,8 @@ func InitHandlerGroups(srv *HTTPServer, rg route.ConfiguratorIn) {
 		srv.InitRoutes(group)
 	}
 }
-
 func NewHandlerGroups(groups ...any) fx.Option {
+	//nolint:prealloc
 	var annotates []any
 
 	for _, group := range groups {

response/http.go

@@ -11,12 +11,11 @@ import (
 	"github.com/webdevelop-pro/go-common/configurator"
 	"github.com/webdevelop-pro/go-common/context/keys"
 	"github.com/webdevelop-pro/go-common/logger"
-	"github.com/webdevelop-pro/go-common/validator"
-	"go.uber.org/fx"
-
 	"github.com/webdevelop-pro/go-common/server/healthcheck"
 	"github.com/webdevelop-pro/go-common/server/middleware"
 	"github.com/webdevelop-pro/go-common/server/route"
+	"github.com/webdevelop-pro/go-common/validator"
+	"go.uber.org/fx"
 )
 
 const component = "http_server"
@@ -27,6 +26,7 @@ type HTTPServer struct {
 	config *Config
 }
 
+
 func InitAndRun() fx.Option {
 	return fx.Module(component,
 		// Init http server
@@ -41,6 +41,7 @@ func InitAndRun() fx.Option {
 		),
 	)
 }
+
 func (s *HTTPServer) InitRoutes(rg route.Configurator) {
 	for _, r := range rg.GetRoutes() {
 		//nolint:gosec,scopelint

server/handler.go

@@ -12,6 +12,7 @@ func SetIPAddress(next echo.HandlerFunc) echo.HandlerFunc {
 		ip := keys.GetIPAddress(c.Request().Header)
 		c.Set(keys.IPAddressStr, ip)
 
+		//nolint:golint
 		ctx := context.WithValue(c.Request().Context(), keys.IPAddressStr, ip)
 		c.SetRequest(c.Request().WithContext(ctx))
 		return next(c)