Commit b35cb6c

committed

Merge branch 'deps-dblab-3' into 'master'

chore: update dev tools, major dependencies and fix compatibility issues See merge request postgres-ai/joe!194

2 parents b7bce26 + 7b08ed4 commit b35cb6cCopy full SHA for b35cb6c

File tree

32 files changed

+174

-148

lines changed

.gitlab-ci.yml
.golangci.yml
Makefile
cmd/joe
- main.go
go.mod
go.sum
pkg
- bot
  - bot.go
  - command
  - querier
    - sql.go
- connection
  - slackrtm
    - assistant.go
    - messenger.go
  - slacksm
    - assistant.go
  - slack
    - assistant.go
    - messenger.go
  - webui
    - assistant.go
    - verifier.go
- foreword
  - foreword.go
- pgexplain
  - pgexplain.go
- services
  - dblab
    - dblab.go
  - msgproc
  - platform
  - usermanager
    - user.go
- transmission/pgtransmission
  - transmitter.go
- util/operator
  - operator.go

32 files changed

+174

-148

lines changed

`‎.gitlab-ci.yml`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-image: golang:1.19`
	`1`	`+image: golang:1.23`
`2`	`2`
`3`	`3`	`include:`
`4`	`4`	`- template: Security/SAST.gitlab-ci.yml`
`@@ -36,7 +36,7 @@ build-binary:`
`36`	`36`	`- make build-ee`
`37`	`37`
`38`	`38`	`.job_template: &build_image_definition`
`39`		`- image: docker:19`
	`39`	`+ image: docker:20`
`40`	`40`	`stage: build-image`
`41`	`41`	`artifacts:`
`42`	`42`	`paths:`

`‎.golangci.yml`

Lines changed: 32 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,39 +2,49 @@ run:`
`2`	`2`	`timeout: 90s`
`3`	`3`	`issues-exit-code: 1`
`4`	`4`	`tests: true`
`5`		`- skip-dirs:`
`6`		`- - vendor`
`7`	`5`	`output:`
`8`		`- format: colored-line-number`
	`6`	`+ formats:`
	`7`	`+ - format: colored-line-number`
`9`	`8`	`print-issued-lines: true`
`10`	`9`	`print-linter-name: true`
`11`	`10`
`12`	`11`	`linters-settings:`
`13`	`12`	`errcheck:`
`14`	`13`	`check-type-assertions: false`
`15`	`14`	`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`
`18`	`21`	`gofmt:`
`19`	`22`	`simplify: true`
	`23`	`+ gofumpt:`
	`24`	`+ extra-rules: false`
	`25`	`+ gosimple:`
	`26`	`+ checks: [ "all" ]`
`20`	`27`	`goimports:`
`21`		`- local-prefixes: gitlab.com/postgres-ai/database-lab`
	`28`	`+ local-prefixes: gitlab.com/postgres-ai/database-lab,gitlab.com/postgres-ai/joe`
`22`	`29`	`dupl:`
`23`	`30`	`threshold: 120`
`24`	`31`	`goconst:`
`25`	`32`	`min-len: 3`
`26`	`33`	`min-occurrences: 5`
`27`		`- gomnd:`
`28`		`- settings:`
`29`		`- mnd:`
`30`		`- ignored-functions: strconv.Format,os.,strconv.Parse*,strings.SplitN,bytes.SplitN`
`31`	`34`	`lll:`
`32`	`35`	`line-length: 140`
`33`	`36`	`tab-width: 1`
	`37`	`+ mnd:`
	`38`	`+ ignored-functions:`
	`39`	`+ - strconv.Format*`
	`40`	`+ - os.*`
	`41`	`+ - strconv.Parse*`
	`42`	`+ - strings.SplitN`
	`43`	`+ - bytes.SplitN`
`34`	`44`	`revive:`
`35`		`- min-confidence: 0.8`
	`45`	`+ confidence: 0.8`
`36`	`46`	`unused:`
`37`		`- check-exported: false`
	`47`	`+ exported-fields-are-used: false`
`38`	`48`	`unparam:`
`39`	`49`	`check-exported: false`
`40`	`50`	`nakedret:`
`@@ -51,42 +61,37 @@ linters-settings:`
`51`	`61`	`- hugeParam`
`52`	`62`	`enabled-tags:`
`53`	`63`	`- performance`
`54`		`- godot:`
`55`		`- scope: declarations`
	`64`	`+ disabled-tags:`
	`65`	`+ - experimental`
`56`	`66`
`57`	`67`	`linters:`
`58`	`68`	`enable:`
`59`		`- - deadcode`
`60`		`- - depguard`
`61`	`69`	`- dupl`
`62`	`70`	`- errcheck`
`63`	`71`	`- gochecknoinits`
`64`	`72`	`- goconst`
`65`	`73`	`- gocritic`
`66`	`74`	`- goimports`
`67`		`- - gomnd`
`68`	`75`	`- gosimple`
`69`	`76`	`- govet`
`70`	`77`	`- ineffassign`
`71`	`78`	`- lll`
`72`		`- - megacheck`
`73`	`79`	`- misspell`
	`80`	`+ - mnd`
`74`	`81`	`- prealloc`
`75`	`82`	`- revive`
`76`		`- - structcheck`
	`83`	`+ - staticcheck`
`77`	`84`	`- stylecheck`
`78`	`85`	`- unconvert`
`79`		`- - varcheck`
`80`	`86`	`- unused`
`81`	`87`	`- unparam`
`82`	`88`	`- wsl`
`83`		`- - godot`
`84`	`89`	`enable-all: false`
`85`	`90`	`disable:`
	`91`	`+ - depguard`
`86`	`92`	`- gosec`
`87`		`- - interfacer`
`88`	`93`	`- gocyclo # currently unmaintained`
`89`		`- presets:`
	`94`	`+ #presets:`
`90`	`95`	`fast: false`
`91`	`96`
`92`	`97`	`issues:`
`@@ -98,10 +103,13 @@ issues:`
`98`	`103`	`- lll`
`99`	`104`	`- errcheck`
`100`	`105`	`- wsl`
`101`		`- - gomnd`
	`106`	`+ - mnd`
	`107`	`+ exclude-dirs:`
	`108`	`+ - vendor`
`102`	`109`
`103`	`110`	`exclude-use-default: false`
`104`	`111`	`max-issues-per-linter: 0`
`105`	`112`	`max-same-issues: 0`
`106`	`113`
	`114`	`+`
`107`	`115`	`new-from-rev: 33432c82a0a8d26108421b9be0a6aef4a8dbc1af`

`‎Makefile`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ all: clean vet build`
`30`	`30`
`31`	`31`	`# Install the linter to $GOPATH/bin which is expected to be in $PATH`
`32`	`32`	`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`
`34`	`34`
`35`	`35`	`run-lint:`
`36`	`36`	`golangci-lint run`

`‎cmd/joe/main.go`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"github.com/ilyakaznacheev/cleanenv"`
`21`	`21`	`"github.com/pkg/errors"`
`22`	`22`
`23`		`- "gitlab.com/postgres-ai/database-lab/v2/pkg/log"`
	`23`	`+ "gitlab.com/postgres-ai/database-lab/v3/pkg/log"`
`24`	`24`
`25`	`25`	`"gitlab.com/postgres-ai/joe/features"`
`26`	`26`	`"gitlab.com/postgres-ai/joe/pkg/bot"`

`‎go.mod`

Lines changed: 19 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`module gitlab.com/postgres-ai/joe`
`2`	`2`
`3`		`-go 1.19`
	`3`	`+go 1.23`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/AlekSi/pointer v1.1.0`
`@@ -18,24 +18,24 @@ require (`
`18`	`18`	`github.com/sethvargo/go-password v0.2.0`
`19`	`19`	`github.com/slack-go/slack v0.14.0`
`20`	`20`	`github.com/stretchr/testify v1.7.0`
`21`		`- gitlab.com/postgres-ai/database-lab/v2v2.4.0`
	`21`	`+ gitlab.com/postgres-ai/database-lab/v3v3.0.4`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`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`
`26`	`26`	`github.com/BurntSushi/toml v0.3.1 // indirect`
`27`	`27`	`github.com/Microsoft/go-winio v0.4.17 // indirect`
`28`	`28`	`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`
`30`	`30`	`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`
`34`	`34`	`github.com/docker/go-connections v0.4.0 // indirect`
`35`	`35`	`github.com/docker/go-units v0.4.0 // indirect`
`36`	`36`	`github.com/go-ole/go-ole v1.2.4 // indirect`
`37`	`37`	`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`
`39`	`39`	`github.com/gorilla/websocket v1.5.3 // indirect`
`40`	`40`	`github.com/jackc/chunkreader/v2 v2.0.1 // indirect`
`41`	`41`	`github.com/jackc/pgio v1.0.0 // indirect`
`@@ -45,23 +45,23 @@ require (`
`45`	`45`	`github.com/jackc/puddle v1.1.2 // indirect`
`46`	`46`	`github.com/joho/godotenv v1.3.0 // indirect`
`47`	`47`	`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`
`49`	`49`	`github.com/morikuni/aec v1.0.0 // indirect`
`50`	`50`	`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`
`52`	`52`	`github.com/pmezard/go-difflib v1.0.0 // indirect`
`53`	`53`	`github.com/rivo/uniseg v0.1.0 // indirect`
`54`	`54`	`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`
`60`	`60`	`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`
`64`	`64`	`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`
`66`	`66`	`olympos.io/encoding/edn v0.0.0-20200308123125-93e3b8dd0e24 // indirect`
`67`	`67`	`)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit b35cb6c

File tree

32 files changed

32 files changed

`‎.gitlab-ci.yml`

`‎.golangci.yml`

`‎Makefile`

`‎cmd/joe/main.go`

`‎go.mod`

0 commit comments