Skip to content

Commit ad41edb

Browse files
psergeepsergee
committed
cd: update go and some package versions
The previously used version of go and some packages had a number of known security issues. It is time for an upgrade.
1 parent 9e8aaa3 commit ad41edb

File tree

7 files changed

+44
-12
lines changed

7 files changed

+44
-12
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- '*'
1010

1111
env:
12-
GO_VERSION: '>=1.20.10'
12+
GO_VERSION: '>=1.21.5'
1313
GORELEASER_VERSION: v0.146.0
1414

1515
jobs:

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77

88
env:
9-
GO_VERSION: '>=1.20.10'
9+
GO_VERSION: '>=1.21.5'
1010
PYTHON_VERSION: '3.x'
1111

1212
jobs:

‎cli/docker/build.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func waitBuildOutput(resp types.ImageBuildResponse, showOutput bool) error {
156156
func BuildImage(opts BuildOpts) error {
157157
var err error
158158

159-
cli, err := client.NewClientWithOpts()
159+
cli, err := client.NewClientWithOpts(client.WithAPIVersionNegotiation())
160160
if err != nil {
161161
return err
162162
}

‎cli/docker/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func init() {
1717
}
1818

1919
func getServerVersion() (string, error) {
20-
cli, err := client.NewClientWithOpts()
20+
cli, err := client.NewClientWithOpts(client.WithAPIVersionNegotiation())
2121
if err != nil {
2222
return "", err
2323
}

‎cli/docker/run.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"github.com/apex/log"
1212
"github.com/tarantool/cartridge-cli/cli/common"
1313

14-
"github.com/docker/docker/api/types"
1514
"github.com/docker/docker/api/types/container"
1615
"github.com/docker/docker/client"
1716
)
@@ -38,7 +37,7 @@ func waitForContainer(cli *client.Client, containerID string, showOutput bool) e
3837
var out io.Writer
3938

4039
ctx := context.Background()
41-
logsReader, err := cli.ContainerLogs(ctx, containerID, types.ContainerLogsOptions{
40+
logsReader, err := cli.ContainerLogs(ctx, containerID, container.LogsOptions{
4241
ShowStdout: true,
4342
Follow: true,
4443
})
@@ -111,7 +110,7 @@ func waitForContainer(cli *client.Client, containerID string, showOutput bool) e
111110
}
112111

113112
func RunContainer(opts RunOpts) error {
114-
cli, err := client.NewClientWithOpts()
113+
cli, err := client.NewClientWithOpts(client.WithAPIVersionNegotiation())
115114
if err != nil {
116115
return err
117116
}
@@ -148,15 +147,15 @@ func RunContainer(opts RunOpts) error {
148147
}
149148

150149
log.Infof("Remove container...")
151-
err := cli.ContainerRemove(ctx, containerID, types.ContainerRemoveOptions{
150+
err := cli.ContainerRemove(ctx, containerID, container.RemoveOptions{
152151
RemoveVolumes: true,
153152
})
154153
if err != nil {
155154
log.Warnf("Failed to remove container: %s", err)
156155
}
157156
}()
158157

159-
if err := cli.ContainerStart(ctx, containerID, types.ContainerStartOptions{}); err != nil {
158+
if err := cli.ContainerStart(ctx, containerID, container.StartOptions{}); err != nil {
160159
return fmt.Errorf("Failed to start container: %s", err)
161160
}
162161

‎go.mod‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/briandowns/spinner v1.11.1
1212
github.com/c-bata/go-prompt v0.2.5
1313
github.com/dave/jennifer v1.4.1
14-
github.com/docker/docker v24.0.7+incompatible
14+
github.com/docker/docker v26.0.0+incompatible
1515
github.com/fatih/color v1.7.0
1616
github.com/fatih/structs v1.1.0
1717
github.com/hashicorp/go-version v1.2.0
@@ -26,7 +26,7 @@ require (
2626
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
2727
github.com/spf13/cobra v1.0.1-0.20200815144417-81e0311edd0b
2828
github.com/spf13/pflag v1.0.5
29-
github.com/stretchr/testify v1.7.0
29+
github.com/stretchr/testify v1.8.4
3030
github.com/vmihailenco/msgpack/v5 v5.1.0
3131
github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb
3232
gopkg.in/yaml.v2 v2.4.0
@@ -36,18 +36,23 @@ require (
3636
github.com/Microsoft/go-winio v0.5.2 // indirect
3737
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
3838
github.com/davecgh/go-spew v1.1.1 // indirect
39+
github.com/distribution/reference v0.6.0 // indirect
3940
github.com/docker/distribution v2.8.2+incompatible // indirect
4041
github.com/docker/go-connections v0.4.0 // indirect
4142
github.com/docker/go-units v0.4.0 // indirect
43+
github.com/felixge/httpsnoop v1.0.4 // indirect
4244
github.com/fsnotify/fsnotify v1.4.9 // indirect
45+
github.com/go-logr/logr v1.4.1 // indirect
46+
github.com/go-logr/stdr v1.2.2 // indirect
4347
github.com/go-ole/go-ole v1.2.5 // indirect
4448
github.com/gogo/protobuf v1.3.2 // indirect
45-
github.com/google/go-cmp v0.5.6 // indirect
49+
github.com/google/go-cmp v0.6.0 // indirect
4650
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4751
github.com/kr/text v0.2.0 // indirect
4852
github.com/mattn/go-colorable v0.1.7 // indirect
4953
github.com/mattn/go-runewidth v0.0.9 // indirect
5054
github.com/mattn/go-tty v0.0.3 // indirect
55+
github.com/moby/docker-image-spec v1.3.1 // indirect
5156
github.com/moby/term v0.0.0-20221105221325-4eb28fa6025c // indirect
5257
github.com/morikuni/aec v1.0.0 // indirect
5358
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
@@ -58,6 +63,10 @@ require (
5863
github.com/tklauser/go-sysconf v0.3.4 // indirect
5964
github.com/tklauser/numcpus v0.2.1 // indirect
6065
github.com/vmihailenco/tagparser v0.1.2 // indirect
66+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
67+
go.opentelemetry.io/otel v1.24.0 // indirect
68+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
69+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
6170
golang.org/x/net v0.17.0 // indirect
6271
golang.org/x/sys v0.13.0 // indirect
6372
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

‎go.sum‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpT
3434
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3535
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3636
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
37+
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
38+
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
3739
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
3840
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
3941
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
4042
github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
43+
github.com/docker/docker v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU=
44+
github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
4145
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
4246
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
4347
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -46,10 +50,17 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
4650
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
4751
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
4852
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
53+
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
54+
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
4955
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
5056
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
5157
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
5258
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
59+
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
60+
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
61+
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
62+
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
63+
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
5364
github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
5465
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
5566
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -60,6 +71,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
6071
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
6172
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
6273
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
74+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
6375
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6476
github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
6577
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
@@ -97,6 +109,8 @@ github.com/mattn/go-tty v0.0.3/go.mod h1:ihxohKRERHTVzN+aSVRwACLCeqIoZAWpoICkkvr
97109
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
98110
github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
99111
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
112+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
113+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
100114
github.com/moby/term v0.0.0-20221105221325-4eb28fa6025c h1:RC8WMpjonrBfyAh6VN/POIPtYD5tRAq0qMqCRjQNK+g=
101115
github.com/moby/term v0.0.0-20221105221325-4eb28fa6025c/go.mod h1:9OcmHNQQUTbk4XCffrLgN1NEKc2mh5u++biHVrvHsSU=
102116
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -149,6 +163,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
149163
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
150164
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
151165
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
166+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
167+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
152168
github.com/tarantool/go-prompt v0.2.6-tarantool h1:/dYMRBuM5nE3mleka/mqJWPf8SrJ151U+OqDlTzvES0=
153169
github.com/tarantool/go-prompt v0.2.6-tarantool/go.mod h1:8enZKIgoGFEQu2XPBK79TguJG2XF3SR4QU2iYI28NSo=
154170
github.com/tj/assert v0.0.0-20171129193455-018094318fb0 h1:Rw8kxzWo1mr6FSaYXjQELRe88y2KdfynXdnK72rdjtA=
@@ -169,6 +185,14 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
169185
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
170186
github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
171187
github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
188+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
189+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
190+
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
191+
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
192+
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
193+
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
194+
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
195+
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
172196
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
173197
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
174198
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=

0 commit comments

Comments
 (0)