Skip to content

Commit 7b08ed4

Browse files
committed
chore: update dev tools, major dependencies and fix compatibility issues
1 parent bb47cba commit 7b08ed4

32 files changed

+174
-148
lines changed

.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: golang:1.19
1+
image: golang:1.23
22

33
include:
44
- template: Security/SAST.gitlab-ci.yml
@@ -36,7 +36,7 @@ build-binary:
3636
- make build-ee
3737

3838
.job_template: &build_image_definition
39-
image: docker:19
39+
image: docker:20
4040
stage: build-image
4141
artifacts:
4242
paths:

.golangci.yml

+32-24
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,49 @@ run:
22
timeout: 90s
33
issues-exit-code: 1
44
tests: true
5-
skip-dirs:
6-
- vendor
75
output:
8-
format: colored-line-number
6+
formats:
7+
- format: colored-line-number
98
print-issued-lines: true
109
print-linter-name: true
1110

1211
linters-settings:
1312
errcheck:
1413
check-type-assertions: false
1514
check-blank: false
16-
exclude: ./errcheck_excludes.txt
17-
15+
exclude-functions:
16+
- (*os.File).Close
17+
errorlint:
18+
errorf: true
19+
asserts: true
20+
comparison: true
1821
gofmt:
1922
simplify: true
23+
gofumpt:
24+
extra-rules: false
25+
gosimple:
26+
checks: [ "all" ]
2027
goimports:
21-
local-prefixes: gitlab.com/postgres-ai/database-lab
28+
local-prefixes: gitlab.com/postgres-ai/database-lab,gitlab.com/postgres-ai/joe
2229
dupl:
2330
threshold: 120
2431
goconst:
2532
min-len: 3
2633
min-occurrences: 5
27-
gomnd:
28-
settings:
29-
mnd:
30-
ignored-functions: strconv.Format*,os.*,strconv.Parse*,strings.SplitN,bytes.SplitN
3134
lll:
3235
line-length: 140
3336
tab-width: 1
37+
mnd:
38+
ignored-functions:
39+
- strconv.Format*
40+
- os.*
41+
- strconv.Parse*
42+
- strings.SplitN
43+
- bytes.SplitN
3444
revive:
35-
min-confidence: 0.8
45+
confidence: 0.8
3646
unused:
37-
check-exported: false
47+
exported-fields-are-used: false
3848
unparam:
3949
check-exported: false
4050
nakedret:
@@ -51,42 +61,37 @@ linters-settings:
5161
- hugeParam
5262
enabled-tags:
5363
- performance
54-
godot:
55-
scope: declarations
64+
disabled-tags:
65+
- experimental
5666

5767
linters:
5868
enable:
59-
- deadcode
60-
- depguard
6169
- dupl
6270
- errcheck
6371
- gochecknoinits
6472
- goconst
6573
- gocritic
6674
- goimports
67-
- gomnd
6875
- gosimple
6976
- govet
7077
- ineffassign
7178
- lll
72-
- megacheck
7379
- misspell
80+
- mnd
7481
- prealloc
7582
- revive
76-
- structcheck
83+
- staticcheck
7784
- stylecheck
7885
- unconvert
79-
- varcheck
8086
- unused
8187
- unparam
8288
- wsl
83-
- godot
8489
enable-all: false
8590
disable:
91+
- depguard
8692
- gosec
87-
- interfacer
8893
- gocyclo # currently unmaintained
89-
presets:
94+
#presets:
9095
fast: false
9196

9297
issues:
@@ -98,10 +103,13 @@ issues:
98103
- lll
99104
- errcheck
100105
- wsl
101-
- gomnd
106+
- mnd
107+
exclude-dirs:
108+
- vendor
102109

103110
exclude-use-default: false
104111
max-issues-per-linter: 0
105112
max-same-issues: 0
106113

114+
107115
new-from-rev: 33432c82a0a8d26108421b9be0a6aef4a8dbc1af

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ all: clean vet build
3030

3131
# Install the linter to $GOPATH/bin which is expected to be in $PATH
3232
install-lint:
33-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
33+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0
3434

3535
run-lint:
3636
golangci-lint run

cmd/joe/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/ilyakaznacheev/cleanenv"
2121
"github.com/pkg/errors"
2222

23-
"gitlab.com/postgres-ai/database-lab/v2/pkg/log"
23+
"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
2424

2525
"gitlab.com/postgres-ai/joe/features"
2626
"gitlab.com/postgres-ai/joe/pkg/bot"

go.mod

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module gitlab.com/postgres-ai/joe
22

3-
go 1.19
3+
go 1.23
44

55
require (
66
github.com/AlekSi/pointer v1.1.0
@@ -18,24 +18,24 @@ require (
1818
github.com/sethvargo/go-password v0.2.0
1919
github.com/slack-go/slack v0.14.0
2020
github.com/stretchr/testify v1.7.0
21-
gitlab.com/postgres-ai/database-lab/v2 v2.4.0
21+
gitlab.com/postgres-ai/database-lab/v3 v3.0.4
2222
)
2323

2424
require (
25-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
25+
github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795 // indirect
2626
github.com/BurntSushi/toml v0.3.1 // indirect
2727
github.com/Microsoft/go-winio v0.4.17 // indirect
2828
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
29-
github.com/containerd/containerd v1.5.2 // indirect
29+
github.com/containerd/containerd v1.5.9 // indirect
3030
github.com/davecgh/go-spew v1.1.1 // indirect
31-
github.com/docker/cli v0.0.0-20200721130541-80fd48bcb7e7 // indirect
32-
github.com/docker/distribution v2.7.1+incompatible // indirect
33-
github.com/docker/docker v20.10.5+incompatible // indirect
31+
github.com/docker/cli v20.10.13+incompatible // indirect
32+
github.com/docker/distribution v2.8.0+incompatible // indirect
33+
github.com/docker/docker v20.10.13+incompatible // indirect
3434
github.com/docker/go-connections v0.4.0 // indirect
3535
github.com/docker/go-units v0.4.0 // indirect
3636
github.com/go-ole/go-ole v1.2.4 // indirect
3737
github.com/gogo/protobuf v1.3.2 // indirect
38-
github.com/golang/protobuf v1.4.3 // indirect
38+
github.com/golang/protobuf v1.5.2 // indirect
3939
github.com/gorilla/websocket v1.5.3 // indirect
4040
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
4141
github.com/jackc/pgio v1.0.0 // indirect
@@ -45,23 +45,23 @@ require (
4545
github.com/jackc/puddle v1.1.2 // indirect
4646
github.com/joho/godotenv v1.3.0 // indirect
4747
github.com/mattn/go-runewidth v0.0.10 // indirect
48-
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
48+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
4949
github.com/morikuni/aec v1.0.0 // indirect
5050
github.com/opencontainers/go-digest v1.0.0 // indirect
51-
github.com/opencontainers/image-spec v1.0.1 // indirect
51+
github.com/opencontainers/image-spec v1.0.2 // indirect
5252
github.com/pmezard/go-difflib v1.0.0 // indirect
5353
github.com/rivo/uniseg v0.1.0 // indirect
5454
github.com/shirou/gopsutil v2.20.9+incompatible // indirect
55-
github.com/sirupsen/logrus v1.7.0 // indirect
56-
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
57-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
58-
golang.org/x/sys v0.0.0-20210324051608-47abb6519492 // indirect
59-
golang.org/x/text v0.3.4 // indirect
55+
github.com/sirupsen/logrus v1.8.1 // indirect
56+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
57+
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
58+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
59+
golang.org/x/text v0.3.7 // indirect
6060
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
61-
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
62-
google.golang.org/grpc v1.38.0 // indirect
63-
google.golang.org/protobuf v1.25.0 // indirect
61+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
62+
google.golang.org/grpc v1.43.0 // indirect
63+
google.golang.org/protobuf v1.27.1 // indirect
6464
gopkg.in/yaml.v2 v2.4.0 // indirect
65-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
65+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
6666
olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24 // indirect
6767
)

0 commit comments

Comments
 (0)