chore: upgrade go to v1.19 (#104)

* chore: upgrade go to v1.19

* chore: upgrade golangci-lint to v3.6.0

* chore: setup golangci-lint by using go install

* test: fix unit test

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.16
+ go-version: 1.19
 
  - name: Run GoReleaser
  uses: goreleaser/goreleaser-action@v4

.github/workflows/test.yml

@@ -20,23 +20,21 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v4
  with:
- go-version: '1.16'
+ go-version: '1.19'
 
  - name: Checkout code
  uses: actions/checkout@v3
 
  - name: Setup golangci-lint
- uses: golangci/golangci-lint-action@v3.4.0
- with:
- version: v1.43.0
- args: --verbose
+ run: |
+ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0
 
  test:
  needs: lint
  strategy:
  matrix:
  os: [ubuntu-latest, macos-latest]
- go: ['1.16', '1.17', '1.18']
+ go: ['1.19']
  name: Test ${{ matrix.os }} @ Go ${{ matrix.go }}
  runs-on: ${{ matrix.os }}
  env:

.golangci.yml

@@ -3,6 +3,7 @@
 
 # options for analysis running
 run:
+ go: '1.18'
  # default concurrency is a available CPU number
  concurrency: 4
 
@@ -263,7 +264,10 @@ issues:
 
  # Excluding configuration per-path, per-linter, per-text and per-source
  exclude-rules:
- # Exclude some linters from running on tests files.
+ - path: .
+ linters:
+ - typecheck
+ # Exclude some linters from running on tests files.
  - path: _test\.go
  linters:
  - gocyclo

Makefile

@@ -13,8 +13,8 @@ ldflags="-w -X ${versionDir}.gitTag=${gitTag} -X ${versionDir}.buildDate=${build
 PROJECT_NAME := "github.com/go-eagle/eagle"
 PKG := "$(PROJECT_NAME)"
 GO_VERSION=$(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
-PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
-GO_FILES := $(shell find . -name '*.go' | grep -v /vendor/ | grep -v _test.go)
+PKG_LIST := $(shell go list ${PKG}/... | grep -v examples | grep -v pkg)
+GO_FILES := $(shell find . -name '*.go' | grep -v _test.go)
 
 # init environment variables
 export PATH := $(shell go env GOPATH)/bin:$(PATH)
@@ -61,7 +61,7 @@ lint:
 .PHONY: test
 # make test
 test:
- @go test -short ${PKG_LIST} | grep -v examples
+ @go test -short ${PKG_LIST}
 
 .PHONY: vet
 # make vet
@@ -71,8 +71,12 @@ vet:
 .PHONY: cover
 # make cover
 cover:
- @go tool cover -html=coverage.txt
- @go test -short -coverprofile coverage.txt -covermode=atomic ${PKG_LIST} 
+ @go test -short -coverprofile coverage.txt -covermode=atomic ${PKG_LIST}
+
+.PHONY: view-cover
+# make view-cover preview coverage
+view-cover:
+ go tool cover -html=coverage.txt
 
 .PHONY: docker
 # make docker 生成docker镜像

go.mod

@@ -1,38 +1,26 @@
 module github.com/go-eagle/eagle
 
-go 1.16
+go 1.19
 
 require (
  github.com/1024casts/gorm-opentelemetry v1.0.1-0.20210805144709-183269b54068
- github.com/DATA-DOG/go-sqlmock v1.4.1
- github.com/HdrHistogram/hdrhistogram-go v1.0.1 // indirect
  github.com/Shopify/sarama v1.19.0
- github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
  github.com/alicebob/miniredis/v2 v2.15.1
  github.com/cenkalti/backoff/v4 v4.1.3
  github.com/dgraph-io/ristretto v0.0.3
- github.com/eapache/go-resiliency v1.1.0 // indirect
- github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
- github.com/eapache/queue v1.1.0 // indirect
  github.com/elastic/go-elasticsearch/v7 v7.17.10
  github.com/foolin/gin-template v0.0.0-20190415034731-41efedfb393b
- github.com/frankban/quicktest v1.7.2 // indirect
  github.com/fsnotify/fsnotify v1.5.1
  github.com/gin-contrib/cors v1.3.1
  github.com/gin-contrib/pprof v1.3.0
  github.com/gin-contrib/static v0.0.0-20200916080430-d45d9a37d28e
  github.com/gin-gonic/gin v1.9.0
  github.com/go-kratos/aegis v0.1.1
  github.com/go-mail/mail v2.3.1+incompatible
- github.com/go-openapi/jsonreference v0.19.6 // indirect
- github.com/go-openapi/spec v0.20.3 // indirect
- github.com/go-openapi/swag v0.19.15 // indirect
  github.com/go-playground/locales v0.14.1
  github.com/go-playground/universal-translator v0.18.1
  github.com/go-playground/validator/v10 v10.11.2
- github.com/go-redis/redis/v8 v8.11.2
  github.com/go-sql-driver/mysql v1.5.0
- github.com/go-test/deep v1.0.6
  github.com/golang-jwt/jwt/v4 v4.4.2
  github.com/golang/protobuf v1.5.2
  github.com/golang/snappy v0.0.3
@@ -42,34 +30,22 @@ require (
  github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
  github.com/hashicorp/consul/api v1.11.0
  github.com/hibiken/asynq v0.23.0
- github.com/jinzhu/gorm v1.9.16
- github.com/jonboulle/clockwork v0.1.0 // indirect
  github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
- github.com/lestrrat-go/strftime v1.0.5 // indirect
- github.com/lib/pq v1.3.0 // indirect
- github.com/mailru/easyjson v0.7.7 // indirect
- github.com/mattn/go-sqlite3 v1.14.15 // indirect
  github.com/nacos-group/nacos-sdk-go v1.1.1
- github.com/nats-io/nats-server/v2 v2.9.0 // indirect
  github.com/nats-io/nats.go v1.16.1-0.20220906180156-a1017eec10b0
  github.com/opentracing/opentracing-go v1.2.0
- github.com/pierrec/lz4 v2.5.1+incompatible // indirect
  github.com/pkg/errors v0.9.1
  github.com/prometheus/client_golang v1.11.0
  github.com/qiniu/api.v7 v0.0.0-20190520053455-bea02cd22bf4
  github.com/rabbitmq/amqp091-go v1.8.1
- github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
  github.com/redis/go-redis/extra/redisotel/v9 v9.0.5
  github.com/redis/go-redis/v9 v9.0.5
  github.com/robfig/cron/v3 v3.0.1
- github.com/spaolacci/murmur3 v1.1.0 // indirect
- github.com/spf13/afero v1.8.0 // indirect
  github.com/spf13/cast v1.4.1
  github.com/spf13/pflag v1.0.5
  github.com/spf13/viper v1.10.0
  github.com/stretchr/testify v1.8.3
  github.com/swaggo/gin-swagger v1.2.0
- github.com/swaggo/swag v1.7.0 // indirect
  github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
  github.com/toolkits/net v0.0.0-20160910085801-3f39ab6fe3ce
  github.com/uber/jaeger-client-go v2.25.0+incompatible
@@ -92,11 +68,124 @@ require (
  go.uber.org/zap v1.17.0
  golang.org/x/crypto v0.5.0
  golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
- google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
  google.golang.org/grpc v1.43.0
  google.golang.org/protobuf v1.28.1
- gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
- gopkg.in/mail.v2 v2.3.1 // indirect
  gorm.io/driver/mysql v1.0.4
  gorm.io/gorm v1.20.12
 )
+
+require (
+ github.com/HdrHistogram/hdrhistogram-go v1.0.1 // indirect
+ github.com/KyleBanks/depth v1.2.1 // indirect
+ github.com/PuerkitoBio/purell v1.1.1 // indirect
+ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+ github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
+ github.com/StackExchange/wmi v1.2.1 // indirect
+ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
+ github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 // indirect
+ github.com/armon/go-metrics v0.3.10 // indirect
+ github.com/aws/aws-sdk-go v1.34.28 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/buger/jsonparser v1.1.1 // indirect
+ github.com/bytedance/sonic v1.8.0 // indirect
+ github.com/cespare/xxhash v1.1.0 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+ github.com/coreos/go-semver v0.3.0 // indirect
+ github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+ github.com/eapache/go-resiliency v1.1.0 // indirect
+ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+ github.com/eapache/queue v1.1.0 // indirect
+ github.com/fatih/color v1.13.0 // indirect
+ github.com/felixge/httpsnoop v1.0.3 // indirect
+ github.com/frankban/quicktest v1.7.2 // indirect
+ github.com/gin-contrib/sse v0.1.0 // indirect
+ github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
+ github.com/go-logr/stdr v1.2.2 // indirect
+ github.com/go-ole/go-ole v1.2.5 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.19.6 // indirect
+ github.com/go-openapi/spec v0.20.3 // indirect
+ github.com/go-openapi/swag v0.19.15 // indirect
+ github.com/go-redis/redis/v8 v8.11.2 // indirect
+ github.com/go-stack/stack v1.8.0 // indirect
+ github.com/goccy/go-json v0.10.0 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/gorilla/securecookie v1.1.1 // indirect
+ github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+ github.com/hashicorp/go-hclog v1.0.0 // indirect
+ github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+ github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+ github.com/hashicorp/golang-lru v0.5.4 // indirect
+ github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/hashicorp/serf v0.9.6 // indirect
+ github.com/jinzhu/inflection v1.0.0 // indirect
+ github.com/jinzhu/now v1.1.1 // indirect
+ github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/jonboulle/clockwork v0.1.0 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/klauspost/compress v1.15.9 // indirect
+ github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+ github.com/leodido/go-urn v1.2.1 // indirect
+ github.com/lestrrat-go/strftime v1.0.5 // indirect
+ github.com/magiconair/properties v1.8.5 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/mattn/go-colorable v0.1.12 // indirect
+ github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-sqlite3 v1.14.15 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/mapstructure v1.4.3 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/nats-io/nats-server/v2 v2.9.0 // indirect
+ github.com/nats-io/nkeys v0.3.0 // indirect
+ github.com/nats-io/nuid v1.0.1 // indirect
+ github.com/pelletier/go-toml v1.9.4 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+ github.com/pierrec/lz4 v2.5.1+incompatible // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/prometheus/client_model v0.2.0 // indirect
+ github.com/prometheus/common v0.26.0 // indirect
+ github.com/prometheus/procfs v0.6.0 // indirect
+ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
+ github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
+ github.com/shirou/gopsutil/v3 v3.21.8 // indirect
+ github.com/spaolacci/murmur3 v1.1.0 // indirect
+ github.com/spf13/afero v1.8.0 // indirect
+ github.com/spf13/jwalterweatherman v1.1.0 // indirect
+ github.com/subosito/gotenv v1.2.0 // indirect
+ github.com/swaggo/swag v1.7.0 // indirect
+ github.com/tklauser/go-sysconf v0.3.9 // indirect
+ github.com/tklauser/numcpus v0.3.0 // indirect
+ github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+ github.com/ugorji/go/codec v1.2.9 // indirect
+ github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+ github.com/xdg-go/scram v1.0.2 // indirect
+ github.com/xdg-go/stringprep v1.0.2 // indirect
+ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
+ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
+ go.etcd.io/etcd/api/v3 v3.5.1 // indirect
+ go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
+ go.opentelemetry.io/otel/metric v1.16.0 // indirect
+ go.uber.org/atomic v1.7.0 // indirect
+ go.uber.org/multierr v1.6.0 // indirect
+ golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
+ golang.org/x/net v0.7.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/text v0.7.0 // indirect
+ golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
+ golang.org/x/tools v0.1.12 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
+ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+ gopkg.in/ini.v1 v1.66.2 // indirect
+ gopkg.in/mail.v2 v2.3.1 // indirect
+ gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+)