Skip to content

Commit 0423be8

Browse files
authored
Upgrade dependencies to use the new FCM API (#5)
* Use the debian 12-based distroless image Otherwise the container fails with ``` /webpush-fcm-relay: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by /webpush-fcm-relay) ``` * Update dependencies and use the new FCM API
1 parent c5f630c commit 0423be8

File tree

4 files changed

+366
-47
lines changed

4 files changed

+366
-47
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-bookworm as build-env
1+
FROM golang:1.23-bookworm as build-env
22
WORKDIR /go/src/webpush-fcm-relay
33

44
COPY go.mod ./

go.mod

Lines changed: 59 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,83 @@
11
module github.com/mastodon/webpush-fcm-relay
22

3-
go 1.22
3+
go 1.23.1
44

55
require (
6-
github.com/appleboy/go-fcm v0.1.6
6+
firebase.google.com/go/v4 v4.14.1
7+
github.com/appleboy/go-fcm v1.2.1
78
github.com/satori/go.uuid v1.2.0
89
github.com/sirupsen/logrus v1.9.3
9-
gopkg.in/DataDog/dd-trace-go.v1 v1.62.0
10+
gopkg.in/DataDog/dd-trace-go.v1 v1.67.1
1011
)
1112

1213
require (
13-
github.com/DataDog/appsec-internal-go v1.5.0 // indirect
14-
github.com/DataDog/datadog-agent/pkg/obfuscate v0.52.1 // indirect
15-
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.52.1 // indirect
14+
cloud.google.com/go v0.115.1 // indirect
15+
cloud.google.com/go/auth v0.9.3 // indirect
16+
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
17+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
18+
cloud.google.com/go/firestore v1.16.0 // indirect
19+
cloud.google.com/go/iam v1.2.0 // indirect
20+
cloud.google.com/go/longrunning v0.6.0 // indirect
21+
cloud.google.com/go/storage v1.43.0 // indirect
22+
github.com/DataDog/appsec-internal-go v1.7.0 // indirect
23+
github.com/DataDog/datadog-agent/pkg/obfuscate v0.57.0 // indirect
24+
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.57.0 // indirect
1625
github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
1726
github.com/DataDog/go-libddwaf/v2 v2.4.2 // indirect
18-
github.com/DataDog/go-sqllexer v0.0.11 // indirect
27+
github.com/DataDog/go-libddwaf/v3 v3.3.0 // indirect
28+
github.com/DataDog/go-sqllexer v0.0.14 // indirect
1929
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
20-
github.com/DataDog/sketches-go v1.4.4 // indirect
21-
github.com/Microsoft/go-winio v0.6.1 // indirect
30+
github.com/DataDog/sketches-go v1.4.6 // indirect
31+
github.com/MicahParks/keyfunc v1.9.0 // indirect
32+
github.com/Microsoft/go-winio v0.6.2 // indirect
2233
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2334
github.com/dustin/go-humanize v1.0.1 // indirect
35+
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
2436
github.com/ebitengine/purego v0.7.1 // indirect
37+
github.com/felixge/httpsnoop v1.0.4 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
39+
github.com/go-logr/stdr v1.2.2 // indirect
40+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
41+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2542
github.com/golang/protobuf v1.5.4 // indirect
43+
github.com/google/s2a-go v0.1.8 // indirect
2644
github.com/google/uuid v1.6.0 // indirect
45+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
46+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
2747
github.com/hashicorp/errwrap v1.1.0 // indirect
2848
github.com/hashicorp/go-multierror v1.1.1 // indirect
49+
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
50+
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
51+
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
52+
github.com/mitchellh/mapstructure v1.5.0 // indirect
2953
github.com/outcaste-io/ristretto v0.2.3 // indirect
30-
github.com/philhofer/fwd v1.1.2 // indirect
54+
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
3155
github.com/pkg/errors v0.9.1 // indirect
56+
github.com/ryanuber/go-glob v1.0.0 // indirect
3257
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
33-
github.com/tinylib/msgp v1.1.9 // indirect
58+
github.com/tinylib/msgp v1.2.1 // indirect
59+
go.opencensus.io v0.24.0 // indirect
60+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
61+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
62+
go.opentelemetry.io/otel v1.29.0 // indirect
63+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
64+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
3465
go.uber.org/atomic v1.11.0 // indirect
35-
golang.org/x/mod v0.17.0 // indirect
36-
golang.org/x/sync v0.7.0 // indirect
37-
golang.org/x/sys v0.19.0 // indirect
38-
golang.org/x/time v0.5.0 // indirect
39-
golang.org/x/tools v0.20.0 // indirect
40-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
41-
google.golang.org/protobuf v1.33.0 // indirect
66+
golang.org/x/crypto v0.27.0 // indirect
67+
golang.org/x/mod v0.21.0 // indirect
68+
golang.org/x/net v0.29.0 // indirect
69+
golang.org/x/oauth2 v0.23.0 // indirect
70+
golang.org/x/sync v0.8.0 // indirect
71+
golang.org/x/sys v0.25.0 // indirect
72+
golang.org/x/text v0.18.0 // indirect
73+
golang.org/x/time v0.6.0 // indirect
74+
golang.org/x/tools v0.25.0 // indirect
75+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
76+
google.golang.org/api v0.196.0 // indirect
77+
google.golang.org/appengine/v2 v2.0.6 // indirect
78+
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
79+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
80+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
81+
google.golang.org/grpc v1.66.1 // indirect
82+
google.golang.org/protobuf v1.34.2 // indirect
4283
)

0 commit comments

Comments
 (0)