Skip to content

Commit e474df8

Browse files
committed
chore: update dependencies and nix flake
1 parent 7341113 commit e474df8

6 files changed

Lines changed: 1640 additions & 233 deletions

File tree

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,9 @@ go.test:
1717

1818
go.test.unit:
1919
go test -short $(GO_TEST_FLAGS) ./...
20+
21+
go.mod.update:
22+
echo "==> update dependencies recursively"
23+
go get -u ./...
24+
echo "==> run 'go mod tidy'"
25+
go mod tidy

firestore/event_store_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"cloud.google.com/go/firestore"
88
"github.com/stretchr/testify/require"
9-
"github.com/testcontainers/testcontainers-go"
109
"github.com/testcontainers/testcontainers-go/modules/gcloud"
1110
"google.golang.org/api/option"
1211
"google.golang.org/grpc"
@@ -27,9 +26,9 @@ func TestEventStore(t *testing.T) {
2726

2827
ctx := context.Background()
2928

30-
firestoreContainer, err := gcloud.RunFirestoreContainer(
29+
firestoreContainer, err := gcloud.RunFirestore(
3130
ctx,
32-
testcontainers.WithImage("google/cloud-sdk:469.0.0-emulators"),
31+
"google/cloud-sdk:469.0.0-emulators",
3332
gcloud.WithProjectID(projectID),
3433
)
3534
require.NoError(t, err)

flake.lock

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

flake.nix

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
config.allowUnfree = true;
1414
};
1515

16-
# NOTE: fixing Go 1.21 for the project.
17-
go = pkgs.go_1_21;
16+
go = pkgs.go_1_23;
17+
withOurGoVersion = pkg: pkg.override { buildGoModule = pkgs.buildGo123Module; };
18+
19+
gopls = withOurGoVersion pkgs.gopls;
20+
delve = withOurGoVersion pkgs.delve;
1821
in
1922
{
2023
devShells.default = with pkgs; mkShell {
@@ -24,14 +27,18 @@
2427
];
2528

2629
packages = [
30+
go
31+
buf
32+
] ++ [
2733
gopls
34+
delve
35+
goreleaser
36+
] ++ (map withOurGoVersion [
2837
gotools
2938
go-outline
3039
gopkgs
31-
delve
32-
goreleaser
33-
34-
# Linters
40+
]) ++ [
41+
git
3542
nil
3643
golangci-lint
3744
markdownlint-cli

go.mod

Lines changed: 64 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,56 @@
11
module github.com/get-eventually/go-eventually
22

3-
go 1.21
3+
go 1.23
44

55
require (
6-
cloud.google.com/go/firestore v1.15.0
7-
github.com/golang-migrate/migrate/v4 v4.17.0
6+
cloud.google.com/go/firestore v1.17.0
7+
github.com/golang-migrate/migrate/v4 v4.18.1
88
github.com/google/uuid v1.6.0
9-
github.com/jackc/pgx/v5 v5.5.5
10-
github.com/stretchr/testify v1.9.0
11-
github.com/testcontainers/testcontainers-go v0.30.0
12-
github.com/testcontainers/testcontainers-go/modules/gcloud v0.30.0
13-
github.com/testcontainers/testcontainers-go/modules/postgres v0.30.0
14-
go.opentelemetry.io/otel v1.26.0
15-
go.opentelemetry.io/otel/metric v1.26.0
16-
go.opentelemetry.io/otel/trace v1.26.0
17-
golang.org/x/sync v0.7.0
18-
google.golang.org/api v0.177.0
19-
google.golang.org/genproto v0.0.0-20240318140521-94a12d6c2237
20-
google.golang.org/grpc v1.63.2
21-
google.golang.org/protobuf v1.34.1
9+
github.com/jackc/pgx/v5 v5.7.2
10+
github.com/stretchr/testify v1.10.0
11+
github.com/testcontainers/testcontainers-go v0.34.0
12+
github.com/testcontainers/testcontainers-go/modules/gcloud v0.34.0
13+
github.com/testcontainers/testcontainers-go/modules/postgres v0.34.0
14+
go.opentelemetry.io/otel v1.33.0
15+
go.opentelemetry.io/otel/metric v1.33.0
16+
go.opentelemetry.io/otel/trace v1.33.0
17+
golang.org/x/sync v0.10.0
18+
google.golang.org/api v0.214.0
19+
google.golang.org/genproto v0.0.0-20241223144023-3abc09e42ca8
20+
google.golang.org/grpc v1.69.2
21+
google.golang.org/protobuf v1.36.1
2222
)
2323

2424
require (
25-
cloud.google.com/go v0.112.2 // indirect
26-
cloud.google.com/go/auth v0.3.0 // indirect
27-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
28-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
29-
cloud.google.com/go/longrunning v0.5.6 // indirect
30-
dario.cat/mergo v1.0.0 // indirect
25+
cloud.google.com/go v0.117.0 // indirect
26+
cloud.google.com/go/auth v0.13.0 // indirect
27+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
28+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
29+
cloud.google.com/go/longrunning v0.6.3 // indirect
30+
dario.cat/mergo v1.0.1 // indirect
31+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
3132
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
32-
github.com/Microsoft/go-winio v0.6.1 // indirect
33-
github.com/Microsoft/hcsshim v0.12.0 // indirect
34-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
35-
github.com/containerd/containerd v1.7.14 // indirect
33+
github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.2 // indirect
34+
github.com/Microsoft/go-winio v0.6.2 // indirect
35+
github.com/apache/arrow/go/v15 v15.0.2 // indirect
36+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3637
github.com/containerd/log v0.1.0 // indirect
37-
github.com/cpuguy83/dockercfg v0.3.1 // indirect
38+
github.com/containerd/platforms v0.2.1 // indirect
39+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
3840
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/distribution/reference v0.5.0 // indirect
40-
github.com/docker/docker v25.0.5+incompatible // indirect
41+
github.com/distribution/reference v0.6.0 // indirect
42+
github.com/docker/docker v27.4.1+incompatible // indirect
4143
github.com/docker/go-connections v0.5.0 // indirect
4244
github.com/docker/go-units v0.5.0 // indirect
4345
github.com/felixge/httpsnoop v1.0.4 // indirect
44-
github.com/go-logr/logr v1.4.1 // indirect
46+
github.com/go-logr/logr v1.4.2 // indirect
4547
github.com/go-logr/stdr v1.2.2 // indirect
4648
github.com/go-ole/go-ole v1.3.0 // indirect
4749
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
49-
github.com/golang/protobuf v1.5.4 // indirect
50-
github.com/google/s2a-go v0.1.7 // indirect
51-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
52-
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
50+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
51+
github.com/google/s2a-go v0.1.8 // indirect
52+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
53+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
5354
github.com/hashicorp/errwrap v1.1.0 // indirect
5455
github.com/hashicorp/go-multierror v1.1.1 // indirect
5556
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -58,44 +59,46 @@ require (
5859
github.com/jackc/pgio v1.0.0 // indirect
5960
github.com/jackc/pgpassfile v1.0.0 // indirect
6061
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
61-
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
62-
github.com/jackc/pgtype v1.14.2 // indirect
62+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
63+
github.com/jackc/pgtype v1.14.4 // indirect
6364
github.com/jackc/pgx/v4 v4.18.3 // indirect
64-
github.com/jackc/puddle/v2 v2.2.1 // indirect
65-
github.com/klauspost/compress v1.17.7 // indirect
66-
github.com/kr/pretty v0.3.1 // indirect
67-
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
68-
github.com/magiconair/properties v1.8.7 // indirect
65+
github.com/jackc/puddle/v2 v2.2.2 // indirect
66+
github.com/klauspost/compress v1.17.11 // indirect
67+
github.com/lib/pq v1.10.9 // indirect
68+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
69+
github.com/magiconair/properties v1.8.9 // indirect
70+
github.com/moby/docker-image-spec v1.3.1 // indirect
6971
github.com/moby/patternmatcher v0.6.0 // indirect
70-
github.com/moby/sys/sequential v0.5.0 // indirect
71-
github.com/moby/sys/user v0.1.0 // indirect
72+
github.com/moby/sys/sequential v0.6.0 // indirect
73+
github.com/moby/sys/user v0.3.0 // indirect
74+
github.com/moby/sys/userns v0.1.0 // indirect
7275
github.com/moby/term v0.5.0 // indirect
7376
github.com/morikuni/aec v1.0.0 // indirect
7477
github.com/opencontainers/go-digest v1.0.0 // indirect
7578
github.com/opencontainers/image-spec v1.1.0 // indirect
7679
github.com/pkg/errors v0.9.1 // indirect
7780
github.com/pmezard/go-difflib v1.0.0 // indirect
7881
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
79-
github.com/shirou/gopsutil/v3 v3.24.2 // indirect
82+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
8083
github.com/shoenig/go-m1cpu v0.1.6 // indirect
8184
github.com/sirupsen/logrus v1.9.3 // indirect
82-
github.com/tklauser/go-sysconf v0.3.13 // indirect
83-
github.com/tklauser/numcpus v0.7.0 // indirect
85+
github.com/tklauser/go-sysconf v0.3.14 // indirect
86+
github.com/tklauser/numcpus v0.9.0 // indirect
8487
github.com/yusufpapurcu/wmi v1.2.4 // indirect
85-
go.opencensus.io v0.24.0 // indirect
86-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
87-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
88+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
90+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
91+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
8892
go.uber.org/atomic v1.11.0 // indirect
89-
golang.org/x/crypto v0.22.0 // indirect
90-
golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
91-
golang.org/x/mod v0.16.0 // indirect
92-
golang.org/x/net v0.24.0 // indirect
93-
golang.org/x/oauth2 v0.19.0 // indirect
94-
golang.org/x/sys v0.19.0 // indirect
95-
golang.org/x/text v0.14.0 // indirect
96-
golang.org/x/time v0.5.0 // indirect
97-
golang.org/x/tools v0.19.0 // indirect
98-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
99-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
93+
golang.org/x/crypto v0.31.0 // indirect
94+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
95+
golang.org/x/net v0.33.0 // indirect
96+
golang.org/x/oauth2 v0.24.0 // indirect
97+
golang.org/x/sys v0.28.0 // indirect
98+
golang.org/x/text v0.21.0 // indirect
99+
golang.org/x/time v0.8.0 // indirect
100+
golang.org/x/tools v0.28.0 // indirect
101+
google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 // indirect
102+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
100103
gopkg.in/yaml.v3 v3.0.1 // indirect
101104
)

0 commit comments

Comments
 (0)