Skip to content

Commit a782ff7

Browse files
pojntfxpojntfx
committed
chore: Bump dependencies and upgrade major versions
Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>
1 parent c4ce918 commit a782ff7

File tree

14 files changed

+261
-267
lines changed

14 files changed

+261
-267
lines changed

‎cmd/r3map-benchmark-direct-mount/main.go‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import (
1717

1818
"github.com/cespare/xxhash/v2"
1919
"github.com/gocql/gocql"
20-
"github.com/minio/minio-go"
20+
minio "github.com/minio/minio-go/v7"
21+
"github.com/minio/minio-go/v7/pkg/credentials"
2122
"github.com/pojntfx/go-nbd/pkg/backend"
2223
"github.com/pojntfx/go-nbd/pkg/client"
2324
"github.com/pojntfx/panrpc/go/pkg/rpc"
@@ -144,7 +145,7 @@ func main() {
144145

145146
ctx,
146147

147-
&rpc.Options{
148+
&rpc.RegistryHooks{
148149
OnClientConnect: func(remoteID string) {
149150
ready <- struct{}{}
150151
},
@@ -180,6 +181,8 @@ func main() {
180181
func(data json.RawMessage, v any) error {
181182
return json.Unmarshal([]byte(data), v)
182183
},
184+
185+
&rpc.LinkHooks{},
183186
); err != nil {
184187
if !utils.IsClosedErr(err) {
185188
panic(err)
@@ -252,20 +255,26 @@ func main() {
252255
panic(errMissingPassword)
253256
}
254257

255-
client, err := minio.New(u.Host, user.Username(), pw, u.Scheme == "https")
258+
client, err := minio.New(
259+
u.Host,
260+
&minio.Options{
261+
Creds: credentials.NewStaticV4(user.Username(), pw, ""),
262+
Secure: u.Scheme == "https",
263+
},
264+
)
256265
if err != nil {
257266
panic(err)
258267
}
259268

260269
bucketName := u.Query().Get("bucket")
261270

262-
bucketExists, err := client.BucketExists(bucketName)
271+
bucketExists, err := client.BucketExists(ctx, bucketName)
263272
if err != nil {
264273
panic(err)
265274
}
266275

267276
if !bucketExists {
268-
if err := client.MakeBucket(bucketName, ""); err != nil {
277+
if err := client.MakeBucket(ctx, bucketName, minio.MakeBucketOptions{}); err != nil {
269278
panic(err)
270279
}
271280
}

‎cmd/r3map-benchmark-managed-mount/main.go‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import (
1717

1818
"github.com/cespare/xxhash/v2"
1919
"github.com/gocql/gocql"
20-
"github.com/minio/minio-go"
20+
minio "github.com/minio/minio-go/v7"
21+
"github.com/minio/minio-go/v7/pkg/credentials"
2122
"github.com/pojntfx/go-nbd/pkg/backend"
2223
"github.com/pojntfx/go-nbd/pkg/client"
2324
"github.com/pojntfx/panrpc/go/pkg/rpc"
@@ -168,7 +169,7 @@ func main() {
168169

169170
ctx,
170171

171-
&rpc.Options{
172+
&rpc.RegistryHooks{
172173
OnClientConnect: func(remoteID string) {
173174
ready <- struct{}{}
174175
},
@@ -204,6 +205,8 @@ func main() {
204205
func(data json.RawMessage, v any) error {
205206
return json.Unmarshal([]byte(data), v)
206207
},
208+
209+
&rpc.LinkHooks{},
207210
); err != nil {
208211
if !utils.IsClosedErr(err) {
209212
panic(err)
@@ -348,20 +351,26 @@ func main() {
348351
panic(errMissingPassword)
349352
}
350353

351-
client, err := minio.New(u.Host, user.Username(), pw, u.Scheme == "https")
354+
client, err := minio.New(
355+
u.Host,
356+
&minio.Options{
357+
Creds: credentials.NewStaticV4(user.Username(), pw, ""),
358+
Secure: u.Scheme == "https",
359+
},
360+
)
352361
if err != nil {
353362
panic(err)
354363
}
355364

356365
bucketName := u.Query().Get("bucket")
357366

358-
bucketExists, err := client.BucketExists(bucketName)
367+
bucketExists, err := client.BucketExists(ctx, bucketName)
359368
if err != nil {
360369
panic(err)
361370
}
362371

363372
if !bucketExists {
364-
if err := client.MakeBucket(bucketName, ""); err != nil {
373+
if err := client.MakeBucket(ctx, bucketName, minio.MakeBucketOptions{}); err != nil {
365374
panic(err)
366375
}
367376
}

‎cmd/r3map-benchmark-migration-server/main.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func main() {
264264

265265
ctx,
266266

267-
&rpc.Options{
267+
&rpc.RegistryHooks{
268268
OnClientConnect: func(remoteID string) {
269269
clients++
270270

@@ -330,6 +330,8 @@ func main() {
330330
func(data json.RawMessage, v any) error {
331331
return json.Unmarshal([]byte(data), v)
332332
},
333+
334+
&rpc.LinkHooks{},
333335
); err != nil {
334336
panic(err)
335337
}

‎cmd/r3map-benchmark-migration/main.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ func main() {
222222

223223
ctx,
224224

225-
&rpc.Options{
225+
&rpc.RegistryHooks{
226226
OnClientConnect: func(remoteID string) {
227227
ready <- struct{}{}
228228
},
@@ -252,6 +252,8 @@ func main() {
252252
func(data json.RawMessage, v any) error {
253253
return json.Unmarshal([]byte(data), v)
254254
},
255+
256+
&rpc.LinkHooks{},
255257
); err != nil {
256258
if !utils.IsClosedErr(err) {
257259
seederErrs <- err

‎cmd/r3map-benchmark-mount-server/main.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func main() {
150150

151151
ctx,
152152

153-
&rpc.Options{
153+
&rpc.RegistryHooks{
154154
OnClientConnect: func(remoteID string) {
155155
clients++
156156

@@ -216,6 +216,8 @@ func main() {
216216
func(data json.RawMessage, v any) error {
217217
return json.Unmarshal([]byte(data), v)
218218
},
219+
220+
&rpc.LinkHooks{},
219221
); err != nil {
220222
panic(err)
221223
}

‎go.mod‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,51 @@
11
module github.com/pojntfx/r3map
22

3-
go 1.20
3+
go 1.21.4
4+
5+
toolchain go1.22.5
6+
7+
replace github.com/gocql/gocql => github.com/scylladb/gocql v1.14.2
48

59
require (
6-
github.com/cespare/xxhash/v2 v2.2.0
10+
github.com/cespare/xxhash/v2 v2.3.0
711
github.com/edsrzf/mmap-go v1.1.0
8-
github.com/gocql/gocql v1.4.0
9-
github.com/loopholelabs/frisbee-go v0.7.1
10-
github.com/loopholelabs/polyglot-go v0.5.1
11-
github.com/minio/minio-go v6.0.14+incompatible
12+
github.com/gocql/gocql v1.6.0
13+
github.com/loopholelabs/frisbee-go v0.8.1
14+
github.com/loopholelabs/polyglot/v2 v2.0.1
15+
github.com/minio/minio-go/v7 v7.0.74
1216
github.com/pojntfx/go-nbd v0.3.2
13-
github.com/pojntfx/panrpc/go v0.0.0-20240122224243-a88b51e450d4
14-
github.com/redis/go-redis/v9 v9.2.1
15-
github.com/rs/zerolog v1.30.0
16-
github.com/schollz/progressbar/v3 v3.13.1
17-
google.golang.org/grpc v1.57.0
18-
google.golang.org/protobuf v1.31.0
17+
github.com/pojntfx/panrpc/go v0.0.0-20240727035459-583758c47d9f
18+
github.com/redis/go-redis/v9 v9.6.1
19+
github.com/rs/zerolog v1.33.0
20+
github.com/schollz/progressbar/v3 v3.14.5
21+
google.golang.org/grpc v1.65.0
22+
google.golang.org/protobuf v1.34.2
1923
)
2024

2125
require (
2226
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
27+
github.com/dustin/go-humanize v1.0.1 // indirect
2328
github.com/go-ini/ini v1.67.0 // indirect
24-
github.com/golang/protobuf v1.5.3 // indirect
29+
github.com/goccy/go-json v0.10.3 // indirect
2530
github.com/golang/snappy v0.0.4 // indirect
26-
github.com/google/uuid v1.3.0 // indirect
31+
github.com/google/uuid v1.6.0 // indirect
2732
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
28-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
33+
github.com/klauspost/compress v1.17.9 // indirect
34+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
2935
github.com/loopholelabs/common v0.4.9 // indirect
3036
github.com/mattn/go-colorable v0.1.13 // indirect
31-
github.com/mattn/go-isatty v0.0.19 // indirect
32-
github.com/mattn/go-runewidth v0.0.15 // indirect
37+
github.com/mattn/go-isatty v0.0.20 // indirect
38+
github.com/minio/md5-simd v1.1.2 // indirect
3339
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
34-
github.com/mitchellh/go-homedir v1.1.0 // indirect
3540
github.com/pilebones/go-udev v0.9.0 // indirect
36-
github.com/pkg/errors v0.9.1 // indirect
37-
github.com/rivo/uniseg v0.4.4 // indirect
41+
github.com/rivo/uniseg v0.4.7 // indirect
42+
github.com/rs/xid v1.5.0 // indirect
3843
go.uber.org/atomic v1.11.0 // indirect
39-
go.uber.org/goleak v1.2.1 // indirect
40-
golang.org/x/crypto v0.12.0 // indirect
41-
golang.org/x/net v0.14.0 // indirect
42-
golang.org/x/sys v0.11.0 // indirect
43-
golang.org/x/term v0.11.0 // indirect
44-
golang.org/x/text v0.12.0 // indirect
45-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
44+
golang.org/x/crypto v0.25.0 // indirect
45+
golang.org/x/net v0.27.0 // indirect
46+
golang.org/x/sys v0.22.0 // indirect
47+
golang.org/x/term v0.22.0 // indirect
48+
golang.org/x/text v0.16.0 // indirect
49+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
4650
gopkg.in/inf.v0 v0.9.1 // indirect
4751
)
48-
49-
replace github.com/gocql/gocql => github.com/scylladb/gocql v1.10.0

0 commit comments

Comments
 (0)