Skip to content

Commit 47a7cc4

Browse files
committed
chore: adapt server go1.20
1 parent 867752d commit 47a7cc4

7 files changed

Lines changed: 38 additions & 66 deletions

File tree

go.mod

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ go 1.20
55
require (
66
filippo.io/age v1.1.1
77
github.com/chainreactors/logs v0.0.0-20241115105204-6132e39f5261
8-
github.com/chainreactors/mals v0.0.0-20250108111740-7701bd16eae5
8+
github.com/chainreactors/mals v0.0.0-20250113101555-63f07ba66262
99
github.com/chainreactors/tui v0.0.0-20241231072248-d5b3664065c4
1010
github.com/chainreactors/utils v0.0.0-20241209140746-65867d2f78b2
1111
github.com/charmbracelet/bubbletea v0.27.1
1212
github.com/charmbracelet/glamour v0.8.0
1313
github.com/charmbracelet/lipgloss v0.13.0
14-
github.com/docker/docker v27.3.1+incompatible
1514
github.com/evertras/bubble-table v0.17.1
1615
github.com/gofrs/uuid v4.4.0+incompatible
1716
github.com/golang/snappy v0.0.4
@@ -33,14 +32,22 @@ require (
3332
github.com/wabzsy/gonut v1.0.0
3433
github.com/yuin/gopher-lua v1.1.1
3534
golang.org/x/crypto v0.28.0
36-
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
3735
golang.org/x/text v0.19.0
38-
google.golang.org/grpc v1.57.2
39-
google.golang.org/protobuf v1.36.1
4036
gopkg.in/yaml.v3 v3.0.1
4137
gorm.io/gorm v1.25.4
4238
)
4339

40+
// compatibility
41+
42+
require (
43+
github.com/docker/distribution v2.8.2+incompatible // indirect
44+
github.com/docker/docker v24.0.9+incompatible
45+
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
46+
google.golang.org/grpc v1.57.2
47+
google.golang.org/protobuf v1.34.1
48+
49+
)
50+
4451
require (
4552
al.essio.dev/pkg/shellescape v1.5.1 // indirect
4653
dario.cat/mergo v1.0.0 // indirect
@@ -61,23 +68,18 @@ require (
6168
github.com/charmbracelet/x/term v0.1.1 // indirect
6269
github.com/charmbracelet/x/windows v0.1.0 // indirect
6370
github.com/cjoudrey/gluahttp v0.0.0-20201111170219-25003d9adfa9 // indirect
64-
github.com/containerd/log v0.1.0 // indirect
6571
github.com/davecgh/go-spew v1.1.1 // indirect
66-
github.com/distribution/reference v0.6.0 // indirect
6772
github.com/dlclark/regexp2 v1.11.0 // indirect
6873
github.com/docker/go-connections v0.5.0 // indirect
6974
github.com/docker/go-units v0.5.0 // indirect
7075
github.com/dustin/go-humanize v1.0.1 // indirect
7176
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
7277
github.com/fatih/color v1.16.0 // indirect
73-
github.com/felixge/httpsnoop v1.0.4 // indirect
7478
github.com/frankban/quicktest v1.14.6 // indirect
7579
github.com/go-dedup/megophone v0.0.0-20170830025436-f01be21026f5 // indirect
7680
github.com/go-dedup/simhash v0.0.0-20170904020510-9ecaca7b509c // indirect
7781
github.com/go-dedup/text v0.0.0-20170907015346-8bb1b95e3cb7 // indirect
7882
github.com/go-lark/lark v1.14.1 // indirect
79-
github.com/go-logr/logr v1.4.2 // indirect
80-
github.com/go-logr/stdr v1.2.2 // indirect
8183
github.com/go-sql-driver/mysql v1.8.1 // indirect
8284
github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
8385
github.com/goccy/go-yaml v1.12.0 // indirect
@@ -98,7 +100,6 @@ require (
98100
github.com/mattn/go-sqlite3 v1.14.24 // indirect
99101
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
100102
github.com/mitchellh/mapstructure v1.5.0 // indirect
101-
github.com/moby/docker-image-spec v1.3.1 // indirect
102103
github.com/moby/term v0.5.0 // indirect
103104
github.com/montanaflynn/stats v0.7.1 // indirect
104105
github.com/morikuni/aec v1.0.0 // indirect
@@ -125,12 +126,6 @@ require (
125126
github.com/yuin/gluamapper v0.0.0-20150323120927-d836955830e7 // indirect
126127
github.com/yuin/goldmark v1.7.4 // indirect
127128
github.com/yuin/goldmark-emoji v1.0.3 // indirect
128-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
129-
go.opentelemetry.io/otel v1.31.0 // indirect
130-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 // indirect
131-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
132-
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
133-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
134129
golang.org/x/net v0.30.0 // indirect
135130
golang.org/x/sync v0.10.0 // indirect
136131
golang.org/x/sys v0.26.0 // indirect
@@ -144,6 +139,7 @@ require (
144139
)
145140

146141
replace (
142+
//github.com/docker/distribution => github.com/docker/distribution v2.6.2+incompatible
147143
github.com/reeflective/console => ./external/console
148144
github.com/reeflective/readline => ./external/readline
149145
github.com/rsteube/carapace => ./external/carapace

go.sum

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ github.com/blinkbean/dingtalk v1.1.3 h1:MbidFZYom7DTFHD/YIs+eaI7kRy52kmWE/sy0xjo
2626
github.com/blinkbean/dingtalk v1.1.3/go.mod h1:9BaLuGSBqY3vT5hstValh48DbsKO7vaHaJnG9pXwbto=
2727
github.com/cbroglie/mustache v1.4.0 h1:Azg0dVhxTml5me+7PsZ7WPrQq1Gkf3WApcHMjMprYoU=
2828
github.com/cbroglie/mustache v1.4.0/go.mod h1:SS1FTIghy0sjse4DUVGV1k/40B1qE1XkD9DtDsHo9iM=
29-
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
3029
github.com/chainreactors/files v0.0.0-20231102192550-a652458cee26/go.mod h1:/Xa9YXhjBlaC33JTD6ZTJFig6pcplak2IDcovf42/6A=
3130
github.com/chainreactors/files v0.0.0-20240716182835-7884ee1e77f0 h1:cU3sGEODXZsUZGBXfnz0nyxF6+37vA+ZGDx6L/FKN4o=
3231
github.com/chainreactors/files v0.0.0-20240716182835-7884ee1e77f0/go.mod h1:NSxGNMRWryAyrDzZpVwmujI22wbGw6c52bQOd5zEvyU=
3332
github.com/chainreactors/logs v0.0.0-20241115105204-6132e39f5261 h1:gcRLCAF4ANvltkdh7cnLFCNrogwl0Qh8oNaYrKHMyz4=
3433
github.com/chainreactors/logs v0.0.0-20241115105204-6132e39f5261/go.mod h1:6Mv6W70JrtL6VClulZhmMRZnoYpcTahcDTKLMNEjK0o=
35-
github.com/chainreactors/mals v0.0.0-20250108111740-7701bd16eae5 h1:V6ZapihNk36R+c48SYKJWhqBfVKwquqUqJcKY0chTUM=
36-
github.com/chainreactors/mals v0.0.0-20250108111740-7701bd16eae5/go.mod h1:/dYh9T/vQ2zarhZmlGdch/ZTgXD/s/t3jOqoHYoiRLE=
34+
github.com/chainreactors/mals v0.0.0-20250113101555-63f07ba66262 h1:+Vf9oFzm8+rMsnac1ZiBJW+G3F/BjOVsiNxURPDTnX8=
35+
github.com/chainreactors/mals v0.0.0-20250113101555-63f07ba66262/go.mod h1:r/dAAqtQJZTo47CgWtdDvpSjPQHg881rcwBY2p9BEOY=
3736
github.com/chainreactors/tui v0.0.0-20241231072248-d5b3664065c4 h1:TbIyZG5p55WfskSXt5Te4oibuXhWbrQ94+CB5hC9D7U=
3837
github.com/chainreactors/tui v0.0.0-20241231072248-d5b3664065c4/go.mod h1:+J5acoMNk5wLy6hhBYQMAchOS11wIhoEU9cVDV629eo=
3938
github.com/chainreactors/utils v0.0.0-20240716182459-e85f2b01ee16/go.mod h1:LajXuvESQwP+qCMAvlcoSXppQCjuLlBrnQpu9XQ1HtU=
@@ -63,19 +62,17 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
6362
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
6463
github.com/cjoudrey/gluahttp v0.0.0-20201111170219-25003d9adfa9 h1:rdWOzitWlNYeUsXmz+IQfa9NkGEq3gA/qQ3mOEqBU6o=
6564
github.com/cjoudrey/gluahttp v0.0.0-20201111170219-25003d9adfa9/go.mod h1:X97UjDTXp+7bayQSFZk2hPvCTmTZIicUjZQRtkwgAKY=
66-
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
67-
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
6865
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
6966
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
7067
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7168
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7269
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
73-
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
74-
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
7570
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
7671
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
77-
github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
78-
github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
72+
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
73+
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
74+
github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
75+
github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
7976
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
8077
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
8178
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -88,8 +85,6 @@ github.com/evertras/bubble-table v0.17.1 h1:HJwq3iQrZulXDE93ZcqJNiUVQCBbN4IJ2CkB
8885
github.com/evertras/bubble-table v0.17.1/go.mod h1:ifHujS1YxwnYSOgcR2+m3GnJ84f7CVU/4kUOxUCjEbQ=
8986
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
9087
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
91-
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
92-
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
9388
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
9489
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
9590
github.com/go-dedup/megophone v0.0.0-20170830025436-f01be21026f5 h1:4U+x+EB1P66zwYgTjxWXSOT8vF+651Ksr1lojiCZnT8=
@@ -100,11 +95,6 @@ github.com/go-dedup/text v0.0.0-20170907015346-8bb1b95e3cb7 h1:11wFcswN+37U+Byjx
10095
github.com/go-dedup/text v0.0.0-20170907015346-8bb1b95e3cb7/go.mod h1:wSsK4VOECOSfSYTzkBFw+iGY7wj59e7X96ABtNj9aCQ=
10196
github.com/go-lark/lark v1.14.1 h1:qWYQTk6wLwf/08u8WbdNAHNmfqavdOvmsENlQ+Cb8aY=
10297
github.com/go-lark/lark v1.14.1/go.mod h1:6ltbSztPZRT6IaO9ZIQyVaY5pVp/KeMizDYtfZkU+vM=
103-
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
104-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
105-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
106-
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
107-
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
10898
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
10999
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
110100
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
@@ -127,7 +117,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
127117
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
128118
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
129119
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
130-
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
131120
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
132121
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
133122
github.com/gookit/config/v2 v2.2.5 h1:RECbYYbtherywmzn3LNeu9NA5ZqhD7MSKEMsJ7l+MpU=
@@ -137,7 +126,6 @@ github.com/gookit/goutil v0.6.15/go.mod h1:qdKdYEHQdEtyH+4fNdQNZfJHhI0jUZzHxQVAV
137126
github.com/gookit/ini/v2 v2.2.3 h1:nSbN+x9OfQPcMObTFP+XuHt8ev6ndv/fWWqxFhPMu2E=
138127
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
139128
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
140-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
141129
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
142130
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
143131
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -185,8 +173,6 @@ github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwX
185173
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
186174
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
187175
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
188-
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
189-
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
190176
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
191177
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
192178
github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
@@ -232,7 +218,7 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
232218
github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f h1:MvTmaQdww/z0Q4wrYjDSCcZ78NoftLQyHBSLW/Cx79Y=
233219
github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
234220
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
235-
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
221+
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
236222
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
237223
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
238224
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -277,20 +263,6 @@ github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod h1:gqRgreBU
277263
github.com/yuin/gopher-lua v0.0.0-20210529063254-f4c35e4016d9/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
278264
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
279265
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
280-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
281-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
282-
go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
283-
go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
284-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY=
285-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 h1:kvWMtSUNVylLVrOE4WLUmBtgziYoCIYUNSpTYtMzVJI=
286-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0/go.mod h1:SExUrRYIXhDgEKG4tkiQovd2HTaELiHUsuK08s5Nqx4=
287-
go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=
288-
go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY=
289-
go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk=
290-
go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0=
291-
go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys=
292-
go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A=
293-
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
294266
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
295267
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
296268
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -340,16 +312,14 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
340312
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
341313
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
342314
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
343-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
344-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM=
345315
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=
346316
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
347317
google.golang.org/grpc v1.57.2 h1:uw37EN34aMFFXB2QPW7Tq6tdTbind1GpRxw5aOX3a5k=
348318
google.golang.org/grpc v1.57.2/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
349319
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
350320
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
351-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
352-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
321+
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
322+
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
353323
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
354324
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
355325
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

server/internal/build/build.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bufio"
55
"context"
66
"fmt"
7+
"github.com/docker/docker/api/types"
78
"io"
89
"math/rand"
910
"os"
@@ -99,7 +100,7 @@ func BuildBeacon(cli *client.Client, req *clientpb.Generate) error {
99100
return err
100101
}
101102

102-
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
103+
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
103104
logs.Log.Errorf("Error starting container: %v", err)
104105
}
105106
sendContaninerCtrlMsg(false, containerName, req)
@@ -145,7 +146,7 @@ func BuildBind(cli *client.Client, req *clientpb.Generate) error {
145146
return err
146147
}
147148

148-
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
149+
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
149150
logs.Log.Errorf("Error starting container: %v", err)
150151
}
151152

@@ -196,7 +197,7 @@ func BuildPrelude(cli *client.Client, req *clientpb.Generate) error {
196197
return err
197198
}
198199

199-
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
200+
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
200201
logs.Log.Errorf("Error starting container: %v", err)
201202
}
202203

@@ -244,7 +245,7 @@ func BuildPulse(cli *client.Client, req *clientpb.Generate) error {
244245
return err
245246
}
246247

247-
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
248+
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
248249
logs.Log.Errorf("Error starting container: %v", err)
249250
}
250251

@@ -295,7 +296,7 @@ func BuildModules(cli *client.Client, req *clientpb.Generate) error {
295296
return err
296297
}
297298

298-
if err := cli.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
299+
if err := cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil {
299300
logs.Log.Errorf("Error starting container: %v", err)
300301
}
301302

@@ -430,7 +431,7 @@ func MaleficSRDI(src, dst, platform, arch, funcName, dataPath string) ([]byte, e
430431
}
431432

432433
func catchLogs(cli *client.Client, containerID, name string) error {
433-
logOptions := container.LogsOptions{
434+
logOptions := types.ContainerLogsOptions{
434435
ShowStdout: true,
435436
ShowStderr: true,
436437
Follow: true,

server/internal/core/session.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ func RecoverSession(sess *clientpb.Session) (*Session, error) {
137137
if err != nil {
138138
return nil, err
139139
}
140-
tid = max(tid, uint32(logID))
140+
if uint32(logID) > tid {
141+
tid = uint32(logID)
142+
}
141143
}
142144
s.Taskseq = tid
143145
for _, task := range tasks {

server/listener/listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func NewListener(clientConf *mtls.ClientConfig, cfg *configs.ListenerConfig) err
3333
return err
3434
}
3535
serverAddress := listenerCfg.Address()
36-
conn, err := grpc.NewClient(serverAddress, options...)
36+
conn, err := grpc.Dial(serverAddress, options...)
3737
if err != nil {
3838
return err
3939
}

server/root/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func NewRootClient(addr string) (*RootClient, error) {
2626
if err != nil {
2727
return nil, err
2828
}
29-
conn, err := grpc.NewClient(addr, options...)
29+
conn, err := grpc.Dial(addr, options...)
3030
if err != nil {
3131
return nil, err
3232
}

0 commit comments

Comments
 (0)