Merge pull request #87 from cryptopay-dev/B2B-6196-Bump-go-version-to-1.21

[B2B-6196] Bump Go version to 1.21

Author: madatsci

.github/workflows/ci.yml

@@ -5,21 +5,21 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Run golangci-lint
         uses: reviewdog/action-golangci-lint@v1
         with:
           github_token: ${{ secrets.github_token }}
   test:
     runs-on: ubuntu-latest
-    container: golang:1.14-alpine
+    container: golang:1.21-alpine3.18
     services:
       redis:
         image: redis
     steps:
       - name: Install common dependencies
         run: apk add --no-cache gcc libc-dev
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: go test -v ./...
         env:
           REDIS_ADDR: redis:6379

Makefile

@@ -1,3 +1,7 @@
 .PHONY:test
 test:
-	go test -v ./...
+	go test -v ./...
+
+.PHONY: lint
+lint:
+	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:latest golangci-lint run -v

clients/pg.go

@@ -9,16 +9,22 @@ import (
 	"github.com/spf13/viper"
 )
 
-type dbQueryHook struct {
-	logger *logrus.Entry
-}
+type (
+	dbQueryHook struct {
+		logger *logrus.Entry
+	}
+
+	ctxKey int
+)
+
+const ctxRequestStartKey ctxKey = 1 + iota
 
 func (d dbQueryHook) BeforeQuery(ctx context.Context, event *pg.QueryEvent) (context.Context, error) {
-	return context.WithValue(ctx, "start_time", time.Now()), nil
+	return context.WithValue(ctx, ctxRequestStartKey, time.Now()), nil
 }
 
 func (d dbQueryHook) AfterQuery(ctx context.Context, event *pg.QueryEvent) error {
-	st, ok := ctx.Value("start_time").(time.Time)
+	st, ok := ctx.Value(ctxRequestStartKey).(time.Time)
 	if !ok {
 		return nil
 	}

go.mod

@@ -1,6 +1,6 @@
 module github.com/cryptopay-dev/narada
 
-go 1.17
+go 1.21
 
 require (
 	github.com/bsm/redislock v0.7.1

go.sum

@@ -75,7 +75,6 @@ github.com/bsm/gomega v1.13.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATs
 github.com/bsm/redislock v0.7.1 h1:nBMm91MRuGOOSlHZNEF0+HpiaH1i8QpSALrF/q7b/Es=
 github.com/bsm/redislock v0.7.1/go.mod h1:TSF3xUotaocycoHjVAp535/bET+ZmvrtcyNrXc0Whm8=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
@@ -98,7 +97,6 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -411,7 +409,6 @@ github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

lock/redis_test.go

@@ -13,6 +13,10 @@ import (
 var redisAddr = os.Getenv("REDIS_ADDR")
 
 func TestNewRedisLocker(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode")
+	}
+
 	cfg := viper.New()
 	cfg.Set("redis.addr", redisAddr)
 	redis, err := clients.NewRedis(cfg)

logger.go

@@ -2,7 +2,7 @@ package narada
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -52,7 +52,7 @@ func NewLogger(config *viper.Viper) (*logrus.Logger, error) {
 
 func NewNopLogger() *logrus.Logger {
 	logger := logrus.New()
-	logger.Out = ioutil.Discard
+	logger.Out = io.Discard
 
 	return logger
 }

logger_hooks_test.go

@@ -2,7 +2,7 @@ package narada
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -53,12 +53,6 @@ func TestNewLogrusSlackHook(t *testing.T) {
 	})
 
 	t.Run("Sending message to Slack", func(t *testing.T) {
-		//hwe, err := ioutil.ReadFile("./fixtures/slack/hook_with_error.json")
-		//assert.NoError(t, err)
-
-		//hwm, err := ioutil.ReadFile("./fixtures/slack/hook_with_message.json")
-		//assert.NoError(t, err)
-
 		t.Run("With error attached", func(t *testing.T) {
 			defer gock.Off()
 			done := make(chan bool, 1)
@@ -83,7 +77,7 @@ func TestNewLogrusSlackHook(t *testing.T) {
 			cfg.Set("app.name", "default")
 
 			logger := logrus.New()
-			logger.Out = ioutil.Discard
+			logger.Out = io.Discard
 
 			hook := NewLogrusSlackHook(cfg)
 			logger.AddHook(hook)
@@ -121,7 +115,7 @@ func TestNewLogrusSlackHook(t *testing.T) {
 			cfg.Set("app.name", "default")
 
 			logger := logrus.New()
-			logger.Out = ioutil.Discard
+			logger.Out = io.Discard
 
 			hook := NewLogrusSlackHook(cfg)
 			logger.AddHook(hook)

slack.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 )
@@ -70,7 +70,7 @@ func (c *SlackClient) SendMessage(msg *SlackMessage) error {
 	defer resp.Body.Close()
 
 	if resp.StatusCode != 200 {
-		t, _ := ioutil.ReadAll(resp.Body)
+		t, _ := io.ReadAll(resp.Body)
 		return &SlackError{resp.StatusCode, string(t)}
 	}
 

slack_test.go

@@ -1,7 +1,7 @@
 package narada
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -12,7 +12,7 @@ func TestNewClient(t *testing.T) {
 	gock.Clean()
 
 	// Reading fixture
-	buf, err := ioutil.ReadFile("./fixtures/slack/request.json")
+	buf, err := os.ReadFile("./fixtures/slack/request.json")
 	assert.NoError(t, err)
 
 	t.Run("Errors", func(t *testing.T) {