Skip to content

Commit 1346cc6

Browse files
authored
migrate to connectrpc (#120)
* migrate to connectrpc * Enable Compression again * Pin connect-compress
1 parent 5037009 commit 1346cc6

File tree

10 files changed

+203
-187
lines changed

10 files changed

+203
-187
lines changed

api/v1/apiv1connect/ipam.connect.go

Lines changed: 116 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/client/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"net/http"
77
"os"
88

9-
"github.com/bufbuild/connect-go"
10-
compress "github.com/klauspost/connect-compress"
9+
"connectrpc.com/connect"
10+
compress "github.com/klauspost/connect-compress/v2"
1111
v1 "github.com/metal-stack/go-ipam/api/v1"
1212
"github.com/metal-stack/go-ipam/api/v1/apiv1connect"
1313
"github.com/metal-stack/v"

cmd/server/server.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"net/http"
55
"time"
66

7-
"github.com/bufbuild/connect-go"
8-
otelconnect "github.com/bufbuild/connect-opentelemetry-go"
9-
compress "github.com/klauspost/connect-compress"
7+
"connectrpc.com/connect"
8+
"connectrpc.com/otelconnect"
9+
compress "github.com/klauspost/connect-compress/v2"
1010
goipam "github.com/metal-stack/go-ipam"
1111
"github.com/metal-stack/go-ipam/api/v1/apiv1connect"
1212
"github.com/metal-stack/go-ipam/pkg/service"
@@ -15,8 +15,8 @@ import (
1515
"go.opentelemetry.io/otel/exporters/prometheus"
1616
"go.opentelemetry.io/otel/sdk/metric"
1717

18-
grpchealth "github.com/bufbuild/connect-grpchealth-go"
19-
grpcreflect "github.com/bufbuild/connect-grpcreflect-go"
18+
"connectrpc.com/grpchealth"
19+
"connectrpc.com/grpcreflect"
2020

2121
"go.uber.org/zap"
2222
"golang.org/x/net/http2"

go.mod

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module github.com/metal-stack/go-ipam
33
go 1.20
44

55
require (
6+
connectrpc.com/connect v1.11.0
7+
connectrpc.com/grpchealth v1.2.0
8+
connectrpc.com/grpcreflect v1.2.0
9+
connectrpc.com/otelconnect v0.5.0
610
github.com/avast/retry-go/v4 v4.3.4
7-
github.com/bufbuild/connect-go v1.9.0
8-
github.com/bufbuild/connect-grpchealth-go v1.1.1
9-
github.com/bufbuild/connect-grpcreflect-go v1.1.0
10-
github.com/bufbuild/connect-opentelemetry-go v0.4.0
1111
github.com/jmoiron/sqlx v1.3.5
12-
github.com/klauspost/connect-compress v1.0.0
12+
github.com/klauspost/connect-compress/v2 v2.0.0
1313
github.com/lib/pq v1.10.9
1414
github.com/metal-stack/v v1.0.3
1515
github.com/prometheus/client_golang v1.16.0
@@ -18,12 +18,12 @@ require (
1818
github.com/testcontainers/testcontainers-go v0.21.0
1919
github.com/urfave/cli/v2 v2.25.7
2020
go.etcd.io/etcd/client/v3 v3.5.9
21-
go.mongodb.org/mongo-driver v1.12.0
21+
go.mongodb.org/mongo-driver v1.12.1
2222
go.opentelemetry.io/otel/exporters/prometheus v0.39.0
2323
go.opentelemetry.io/otel/sdk/metric v0.39.0
24-
go.uber.org/zap v1.24.0
25-
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35
26-
golang.org/x/net v0.12.0
24+
go.uber.org/zap v1.25.0
25+
go4.org/netipx v0.0.0-20230728184502-ec4c8b891b28
26+
golang.org/x/net v0.13.0
2727
golang.org/x/sync v0.3.0
2828
google.golang.org/protobuf v1.31.0
2929
)
@@ -35,15 +35,15 @@ require (
3535
github.com/beorn7/perks v1.0.1 // indirect
3636
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3737
github.com/cespare/xxhash/v2 v2.2.0 // indirect
38-
github.com/containerd/containerd v1.7.2 // indirect
38+
github.com/containerd/containerd v1.7.3 // indirect
3939
github.com/coreos/go-semver v0.3.1 // indirect
4040
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4141
github.com/cpuguy83/dockercfg v0.3.1 // indirect
4242
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
4343
github.com/davecgh/go-spew v1.1.1 // indirect
4444
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
4545
github.com/docker/distribution v2.8.2+incompatible // indirect
46-
github.com/docker/docker v24.0.4+incompatible // indirect
46+
github.com/docker/docker v24.0.5+incompatible // indirect
4747
github.com/docker/go-connections v0.4.0 // indirect
4848
github.com/docker/go-units v0.5.0 // indirect
4949
github.com/go-logr/logr v1.2.4 // indirect
@@ -63,12 +63,12 @@ require (
6363
github.com/morikuni/aec v1.0.0 // indirect
6464
github.com/opencontainers/go-digest v1.0.0 // indirect
6565
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
66-
github.com/opencontainers/runc v1.1.7 // indirect
66+
github.com/opencontainers/runc v1.1.8 // indirect
6767
github.com/pkg/errors v0.9.1 // indirect
6868
github.com/pmezard/go-difflib v1.0.0 // indirect
6969
github.com/prometheus/client_model v0.4.0 // indirect
7070
github.com/prometheus/common v0.44.0 // indirect
71-
github.com/prometheus/procfs v0.11.0 // indirect
71+
github.com/prometheus/procfs v0.11.1 // indirect
7272
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7373
github.com/sirupsen/logrus v1.9.3 // indirect
7474
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -82,19 +82,18 @@ require (
8282
go.opentelemetry.io/otel/metric v1.16.0 // indirect
8383
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
8484
go.opentelemetry.io/otel/trace v1.16.0 // indirect
85-
go.uber.org/atomic v1.11.0 // indirect
8685
go.uber.org/goleak v1.2.1 // indirect
8786
go.uber.org/multierr v1.11.0 // indirect
8887
golang.org/x/crypto v0.11.0 // indirect
89-
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
88+
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b // indirect
9089
golang.org/x/mod v0.12.0 // indirect
9190
golang.org/x/sys v0.10.0 // indirect
9291
golang.org/x/text v0.11.0 // indirect
93-
golang.org/x/tools v0.11.0 // indirect
94-
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
95-
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect
96-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
97-
google.golang.org/grpc v1.56.2 // indirect
92+
golang.org/x/tools v0.11.1 // indirect
93+
google.golang.org/genproto v0.0.0-20230731193218-e0aa005b6bdf // indirect
94+
google.golang.org/genproto/googleapis/api v0.0.0-20230731193218-e0aa005b6bdf // indirect
95+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf // indirect
96+
google.golang.org/grpc v1.57.0 // indirect
9897
gopkg.in/yaml.v3 v3.0.1 // indirect
9998
gotest.tools/v3 v3.5.0 // indirect
10099
)

0 commit comments

Comments
 (0)