Skip to content

Commit 7f2ab72

Browse files
committed
chore: migrate to /v6 module path, pool/v2, goridge/v4 for v6.0.0-beta.1 release
1 parent 5b41bc4 commit 7f2ab72

19 files changed

Lines changed: 56 additions & 45 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ vendor/
1818
.vscode
1919
.DS_Store
2020
**/composer.lock
21+
**/.claude/settings.local.json

.golangci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ linters:
3232
settings:
3333
dupl:
3434
threshold: 100
35-
goconst:
36-
min-len: 2
37-
min-occurrences: 3
3835
gocyclo:
3936
min-complexity: 15
4037
godot:

api/interfaces.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ package api
44
import (
55
"context"
66

7-
"github.com/roadrunner-server/pool/payload"
8-
"github.com/roadrunner-server/pool/pool"
9-
staticPool "github.com/roadrunner-server/pool/pool/static_pool"
10-
"github.com/roadrunner-server/pool/worker"
7+
"github.com/roadrunner-server/pool/v2/payload"
8+
"github.com/roadrunner-server/pool/v2/pool"
9+
staticPool "github.com/roadrunner-server/pool/v2/pool/static_pool"
10+
"github.com/roadrunner-server/pool/v2/worker"
1111
"go.uber.org/zap"
1212
"google.golang.org/grpc"
1313
)

config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/bmatcuk/doublestar/v4"
1111
"github.com/roadrunner-server/errors"
12-
"github.com/roadrunner-server/pool/pool"
12+
"github.com/roadrunner-server/pool/v2/pool"
1313
)
1414

1515
type ClientAuthType string

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/roadrunner-server/grpc/v5
1+
module github.com/roadrunner-server/grpc/v6
22

33
go 1.26
44

@@ -8,11 +8,11 @@ require (
88
github.com/bmatcuk/doublestar/v4 v4.10.0
99
github.com/emicklei/proto v1.14.3
1010
github.com/prometheus/client_golang v1.23.2
11-
github.com/roadrunner-server/api/v4 v4.23.0
11+
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2
1212
github.com/roadrunner-server/endure/v2 v2.6.2
1313
github.com/roadrunner-server/errors v1.4.1
14-
github.com/roadrunner-server/goridge/v3 v3.8.3
15-
github.com/roadrunner-server/pool v1.1.3
14+
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.1
15+
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1
1616
github.com/roadrunner-server/tcplisten v1.5.2
1717
github.com/stretchr/testify v1.11.1
1818
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTU
3838
github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
3939
github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc=
4040
github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo=
41-
github.com/roadrunner-server/api/v4 v4.23.0 h1:lrVXgP4ozD/H5DrIdT181ldVhD1R9QT5qsi8qWUTDF4=
42-
github.com/roadrunner-server/api/v4 v4.23.0/go.mod h1:AlHuVVOklb7XF33Cf7IfmwOn3j4gGg37on9Xi6j08Bg=
41+
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2 h1:GqsZzWQ5jMXRF1O/b8IqFz9PLpS7Ui0K4OyACLql2MI=
42+
github.com/roadrunner-server/api-plugins/v6 v6.0.0-beta.2/go.mod h1:2v4yUK5Kvbvq8C3IkDoBkuamq9h+7i/JLjyf7k1j5JM=
4343
github.com/roadrunner-server/endure/v2 v2.6.2 h1:sIB4kTyE7gtT3fDhuYWUYn6Vt/dcPtiA6FoNS1eS+84=
4444
github.com/roadrunner-server/endure/v2 v2.6.2/go.mod h1:t/2+xpNYgGBwhzn83y2MDhvhZ19UVq1REcvqn7j7RB8=
4545
github.com/roadrunner-server/errors v1.4.1 h1:LKNeaCGiwd3t8IaL840ZNF3UA9yDQlpvHnKddnh0YRQ=
4646
github.com/roadrunner-server/errors v1.4.1/go.mod h1:qeffnIKG0e4j1dzGpa+OGY5VKSfMphizvqWIw8s2lAo=
4747
github.com/roadrunner-server/events v1.0.1 h1:waCkKhxhzdK3VcI1xG22l+h+0J+Nfdpxjhyy01Un+kI=
4848
github.com/roadrunner-server/events v1.0.1/go.mod h1:WZRqoEVaFm209t52EuoT7ISUtvX6BrCi6bI/7pjkVC0=
49-
github.com/roadrunner-server/goridge/v3 v3.8.3 h1:XmjrOFnI6ZbQTPaP39DEk8KwLUNTgjluK3pcZaW6ixQ=
50-
github.com/roadrunner-server/goridge/v3 v3.8.3/go.mod h1:4TZU8zgkKIZCsH51qwGMpvyXCT59u/8z6q8sCe4ZGAQ=
51-
github.com/roadrunner-server/pool v1.1.3 h1:KMsiL6yuYBWGk73bdO0akwP+fJ63bxDF972JukCGsxI=
52-
github.com/roadrunner-server/pool v1.1.3/go.mod h1:8ceC7NvZKJRciv+KJmcyk5CeDugoel6GD+crm5kBFW0=
49+
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.1 h1:dO1wKnuMr4xMmH6DY2ZaZ6FWS+Vo50+C7fuAcyO/xBk=
50+
github.com/roadrunner-server/goridge/v4 v4.0.0-beta.1/go.mod h1:+gKla9HAyYlk0TsC9VktwtOL63aimsWT3oPsuCLh4/o=
51+
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1 h1:jpYXFtdD6QGAdAGPgMxrNi3j1CegCRpb2y+A+3GnXFA=
52+
github.com/roadrunner-server/pool/v2 v2.0.0-beta.1/go.mod h1:Bo1wT7RtL3eyQHXBUohNhtj/yAmRt6Rq8smuBg5pWkY=
5353
github.com/roadrunner-server/tcplisten v1.5.2 h1:nn8yXYrhRDkfQ9AAu4V075uT4fZRmOnpxkawgE+bWPA=
5454
github.com/roadrunner-server/tcplisten v1.5.2/go.mod h1:DufGBz7Dlx2KrNe/4RukEvGMTqZKB0Uve1GztwcyyR8=
5555
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=

go.work.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2738,6 +2738,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.
27382738
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
27392739
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101/go.mod h1:E17fc4PDhkr22dE3RgnH2hEubUaky6ZwW4VhANxyspg=
27402740
google.golang.org/genproto/googleapis/api v0.0.0-20251124214823-79d6a2a48846/go.mod h1:Fk4kyraUvqD7i5H6S43sj2W98fbZa75lpZz/eUyhfO0=
2741+
google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng=
27412742
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc h1:g3hIDl0jRNd9PPTs2uBzYuaD5mQuwOkZY0vSc0LR32o=
27422743
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
27432744
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=

metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strconv"
55

66
"github.com/prometheus/client_golang/prometheus"
7-
"github.com/roadrunner-server/pool/fsm"
8-
"github.com/roadrunner-server/pool/state/process"
7+
"github.com/roadrunner-server/pool/v2/fsm"
8+
"github.com/roadrunner-server/pool/v2/state/process"
99
)
1010

1111
// Informer used to get workers from a particular plugin or set of plugins

plugin.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88

99
"github.com/prometheus/client_golang/prometheus"
10-
"github.com/roadrunner-server/pool/pool/static_pool"
10+
"github.com/roadrunner-server/pool/v2/pool/static_pool"
1111
"github.com/roadrunner-server/tcplisten"
1212
"go.opentelemetry.io/otel/propagation"
1313

@@ -16,11 +16,11 @@ import (
1616

1717
"github.com/roadrunner-server/endure/v2/dep"
1818
"github.com/roadrunner-server/errors"
19-
"github.com/roadrunner-server/grpc/v5/api"
20-
"github.com/roadrunner-server/grpc/v5/codec"
21-
"github.com/roadrunner-server/grpc/v5/proxy"
22-
"github.com/roadrunner-server/pool/pool"
23-
"github.com/roadrunner-server/pool/state/process"
19+
"github.com/roadrunner-server/grpc/v6/api"
20+
"github.com/roadrunner-server/grpc/v6/codec"
21+
"github.com/roadrunner-server/grpc/v6/proxy"
22+
"github.com/roadrunner-server/pool/v2/pool"
23+
"github.com/roadrunner-server/pool/v2/state/process"
2424
"go.uber.org/zap"
2525
"google.golang.org/grpc"
2626
"google.golang.org/grpc/encoding"

proxy/proxy.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"maps"
1818

1919
"github.com/roadrunner-server/errors"
20-
"github.com/roadrunner-server/goridge/v3/pkg/frame"
21-
"github.com/roadrunner-server/grpc/v5/codec"
22-
"github.com/roadrunner-server/pool/payload"
23-
"github.com/roadrunner-server/pool/pool/static_pool"
24-
"github.com/roadrunner-server/pool/worker"
20+
"github.com/roadrunner-server/goridge/v4/pkg/frame"
21+
"github.com/roadrunner-server/grpc/v6/codec"
22+
"github.com/roadrunner-server/pool/v2/payload"
23+
"github.com/roadrunner-server/pool/v2/pool/static_pool"
24+
"github.com/roadrunner-server/pool/v2/worker"
2525
"go.opentelemetry.io/otel/propagation"
2626
"go.uber.org/zap"
2727
spb "google.golang.org/genproto/googleapis/rpc/status"

0 commit comments

Comments
 (0)