Skip to content

Commit 4da00cc

Browse files
committed
chore(tests): migrate v5 → v6 RR plugin imports
v5 plugins return *zap.Logger which doesn't satisfy v6 plugins' *slog.Logger-based interfaces; endure couldn't resolve init deps. Switch tests/ to all-v6 plugins; goridge/v3 and pool v1.1.3 indirects drop out via go mod tidy.
1 parent 52c37cb commit 4da00cc

3 files changed

Lines changed: 97 additions & 116 deletions

File tree

tests/go.mod

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,45 @@ toolchain go1.26.0
66

77
require (
88
github.com/roadrunner-server/api-go/v6 v6.0.0-beta.4
9-
github.com/roadrunner-server/config/v5 v5.1.9
9+
github.com/roadrunner-server/config/v6 v6.0.0-beta.3
1010
github.com/roadrunner-server/endure/v2 v2.6.2
1111
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.1
12-
github.com/roadrunner-server/http/v5 v5.3.0
13-
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.1
14-
github.com/roadrunner-server/logger/v5 v5.1.9
15-
github.com/roadrunner-server/memory/v5 v5.2.9
16-
github.com/roadrunner-server/rpc/v5 v5.1.9
17-
github.com/roadrunner-server/server/v5 v5.2.10
18-
github.com/roadrunner-server/status/v6 v6.0.0-beta.1
12+
github.com/roadrunner-server/http/v6 v6.0.0-beta.6
13+
github.com/roadrunner-server/jobs/v6 v6.0.0-beta.6
14+
github.com/roadrunner-server/logger/v6 v6.0.0-beta.3
15+
github.com/roadrunner-server/memory/v6 v6.0.0-beta.3
16+
github.com/roadrunner-server/rpc/v6 v6.0.0-beta.3
17+
github.com/roadrunner-server/server/v6 v6.0.0-beta.5
18+
github.com/roadrunner-server/status/v6 v6.0.0-beta.3
1919
github.com/stretchr/testify v1.11.1
2020
)
2121

2222
replace github.com/roadrunner-server/status/v6 => ../
2323

2424
require (
2525
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/caddyserver/certmagic v0.25.2 // indirect
26+
github.com/caddyserver/certmagic v0.25.3 // indirect
2727
github.com/caddyserver/zerossl v0.1.5 // indirect
2828
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2929
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
30-
github.com/fatih/color v1.18.0 // indirect
30+
github.com/fatih/color v1.19.0 // indirect
3131
github.com/felixge/httpsnoop v1.0.4 // indirect
32-
github.com/fsnotify/fsnotify v1.9.0 // indirect
32+
github.com/fsnotify/fsnotify v1.10.1 // indirect
3333
github.com/go-logr/logr v1.4.3 // indirect
3434
github.com/go-logr/stdr v1.2.2 // indirect
3535
github.com/go-ole/go-ole v1.3.0 // indirect
3636
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
37-
github.com/goccy/go-json v0.10.6 // indirect
3837
github.com/google/uuid v1.6.0 // indirect
3938
github.com/joho/godotenv v1.5.1 // indirect
4039
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
4140
github.com/libdns/libdns v1.1.1 // indirect
4241
github.com/mattn/go-colorable v0.1.14 // indirect
43-
github.com/mattn/go-isatty v0.0.20 // indirect
42+
github.com/mattn/go-isatty v0.0.22 // indirect
4443
github.com/mholt/acmez v1.2.0 // indirect
4544
github.com/mholt/acmez/v3 v3.1.6 // indirect
4645
github.com/miekg/dns v1.1.72 // indirect
4746
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
48-
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
47+
github.com/pelletier/go-toml/v2 v2.3.1 // indirect
4948
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5049
github.com/prometheus/client_golang v1.23.2 // indirect
5150
github.com/prometheus/client_model v0.6.2 // indirect
@@ -54,12 +53,10 @@ require (
5453
github.com/quic-go/qpack v0.6.0 // indirect
5554
github.com/quic-go/quic-go v0.59.0 // indirect
5655
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2 // indirect
57-
github.com/roadrunner-server/api/v4 v4.23.0 // indirect
5856
github.com/roadrunner-server/context v1.3.0 // indirect
5957
github.com/roadrunner-server/errors v1.5.0 // indirect
6058
github.com/roadrunner-server/events v1.0.1 // indirect
61-
github.com/roadrunner-server/goridge/v3 v3.8.3 // indirect
62-
github.com/roadrunner-server/pool v1.1.3 // indirect
59+
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1 // indirect
6360
github.com/roadrunner-server/priority_queue v1.0.6 // indirect
6461
github.com/roadrunner-server/tcplisten v1.5.2 // indirect
6562
github.com/sagikazarmark/locafero v0.12.0 // indirect
@@ -71,34 +68,31 @@ require (
7168
github.com/subosito/gotenv v1.6.0 // indirect
7269
github.com/tklauser/go-sysconf v0.3.16 // indirect
7370
github.com/tklauser/numcpus v0.11.0 // indirect
74-
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
75-
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
7671
github.com/yusufpapurcu/wmi v1.2.4 // indirect
7772
github.com/zeebo/assert v1.3.1 // indirect
7873
github.com/zeebo/blake3 v0.2.4 // indirect
7974
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
80-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
81-
go.opentelemetry.io/contrib/propagators/jaeger v1.42.0 // indirect
82-
go.opentelemetry.io/otel v1.42.0 // indirect
83-
go.opentelemetry.io/otel/metric v1.42.0 // indirect
84-
go.opentelemetry.io/otel/sdk v1.42.0 // indirect
85-
go.opentelemetry.io/otel/trace v1.42.0 // indirect
75+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
76+
go.opentelemetry.io/contrib/propagators/jaeger v1.43.0 // indirect
77+
go.opentelemetry.io/otel v1.43.0 // indirect
78+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
79+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
80+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
8681
go.uber.org/multierr v1.11.0 // indirect
8782
go.uber.org/zap v1.28.0 // indirect
8883
go.uber.org/zap/exp v0.3.0 // indirect
8984
go.yaml.in/yaml/v2 v2.4.4 // indirect
9085
go.yaml.in/yaml/v3 v3.0.4 // indirect
91-
golang.org/x/crypto v0.49.0 // indirect
92-
golang.org/x/mod v0.34.0 // indirect
93-
golang.org/x/net v0.52.0 // indirect
86+
golang.org/x/crypto v0.51.0 // indirect
87+
golang.org/x/mod v0.36.0 // indirect
88+
golang.org/x/net v0.54.0 // indirect
9489
golang.org/x/sync v0.20.0 // indirect
95-
golang.org/x/sys v0.42.0 // indirect
96-
golang.org/x/text v0.35.0 // indirect
97-
golang.org/x/tools v0.43.0 // indirect
98-
google.golang.org/genproto v0.0.0-20260311181403-84a4fc48630c // indirect
99-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
100-
google.golang.org/grpc v1.79.3 // indirect
90+
golang.org/x/sys v0.44.0 // indirect
91+
golang.org/x/text v0.37.0 // indirect
92+
golang.org/x/tools v0.45.0 // indirect
93+
google.golang.org/genproto v0.0.0-20260504160031-60b97b32f348 // indirect
94+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260504160031-60b97b32f348 // indirect
95+
google.golang.org/grpc v1.81.0 // indirect
10196
google.golang.org/protobuf v1.36.11 // indirect
102-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
10397
gopkg.in/yaml.v3 v3.0.1 // indirect
10498
)

0 commit comments

Comments
 (0)