Skip to content

Commit 5b5215e

Browse files
authored
Updates go to 1.23.1 & others (#47)
Updates - go to 1.23.1 - golangci-lint to 1.61.0 - protoc 5.25.4 - nix flakes lock - go modules, inc dapr/kit Signed-off-by: joshvanl <[email protected]>
1 parent 2903098 commit 5b5215e

File tree

12 files changed

+351
-211
lines changed

12 files changed

+351
-211
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ jobs:
1010
- uses: actions/setup-go@v5
1111
- uses: golangci/[email protected]
1212
with:
13-
version: v1.55.2
13+
version: v1.61.0
1414
- run: go test -v --race ./...

.golangci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ linters:
44
- wsl
55
- wrapcheck
66
- varnamelen
7-
- goerr113
87
- ireturn
98
- nilnil
109
- gomnd

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ modtidy:
3636
# Target: gen-proto #
3737
################################################################################
3838
PROTOC ?=protoc
39-
PROTOC_VERSION = 24.4
40-
PROTOBUF_SUITE_VERSION = 24.4
39+
PROTOC_VERSION = 25.4
40+
PROTOBUF_SUITE_VERSION = 25.4
4141
PROTOC_GEN_GO_VERSION = v1.32.0
4242

4343
PROTOC_GEN_GO_GRPC_VERSION = 1.3.0

api/counter.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/job.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/trigger.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.lock

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

flake.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,14 @@
3232
overlays = [ gomod2nix.overlays.default ];
3333
};
3434

35-
ci = import ./nix/ci.nix {
36-
inherit src repo pkgs;
37-
gomod2nix = (gomod2nix.packages.${system}.default);
38-
};
35+
ci = import ./nix/ci.nix { inherit pkgs; };
3936

4037
in {
4138
apps = ci.apps;
4239

4340
devShells.default = pkgs.mkShell {
4441
buildInputs = with pkgs; [
4542
go
46-
gopls
47-
gotools
48-
go-tools
4943
gomod2nix.packages.${system}.default
5044
];
5145
};

go.mod

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,83 @@
11
module github.com/diagridio/go-etcd-cron
22

3-
go 1.22.5
3+
go 1.23.1
44

55
require (
66
github.com/dapr/kit v0.13.1-0.20240724000121-26b564d9d0f5
7-
github.com/go-logr/logr v1.3.0
7+
github.com/go-logr/logr v1.4.2
88
github.com/go-logr/zapr v1.3.0
99
github.com/stretchr/testify v1.9.0
10-
go.etcd.io/etcd/api/v3 v3.5.13
11-
go.etcd.io/etcd/client/pkg/v3 v3.5.13
12-
go.etcd.io/etcd/client/v3 v3.5.13
13-
go.etcd.io/etcd/server/v3 v3.5.13
14-
go.uber.org/zap v1.26.0
15-
google.golang.org/protobuf v1.33.0
16-
k8s.io/apimachinery v0.26.9
17-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
10+
go.etcd.io/etcd/api/v3 v3.5.16
11+
go.etcd.io/etcd/client/pkg/v3 v3.5.16
12+
go.etcd.io/etcd/client/v3 v3.5.16
13+
go.etcd.io/etcd/server/v3 v3.5.16
14+
go.uber.org/zap v1.27.0
15+
google.golang.org/protobuf v1.34.2
16+
k8s.io/apimachinery v0.31.1
17+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
1818
)
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24-
github.com/coreos/go-semver v0.3.0 // indirect
25-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
26-
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/dustin/go-humanize v1.0.0 // indirect
22+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
24+
github.com/coreos/go-semver v0.3.1 // indirect
25+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
26+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27+
github.com/dustin/go-humanize v1.0.1 // indirect
2828
github.com/go-logr/stdr v1.2.2 // indirect
2929
github.com/gogo/protobuf v1.3.2 // indirect
30-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
30+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
3131
github.com/golang/protobuf v1.5.4 // indirect
32-
github.com/google/btree v1.0.1 // indirect
33-
github.com/gorilla/websocket v1.4.2 // indirect
34-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
32+
github.com/google/btree v1.1.3 // indirect
33+
github.com/google/uuid v1.6.0 // indirect
34+
github.com/gorilla/websocket v1.5.3 // indirect
35+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
3536
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
3637
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
37-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
38-
github.com/jonboulle/clockwork v0.2.2 // indirect
38+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
39+
github.com/jonboulle/clockwork v0.4.0 // indirect
3940
github.com/json-iterator/go v1.1.12 // indirect
40-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
41+
github.com/klauspost/compress v1.17.10 // indirect
42+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4143
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4244
github.com/modern-go/reflect2 v1.0.2 // indirect
43-
github.com/pmezard/go-difflib v1.0.0 // indirect
44-
github.com/prometheus/client_golang v1.11.1 // indirect
45-
github.com/prometheus/client_model v0.2.0 // indirect
46-
github.com/prometheus/common v0.26.0 // indirect
47-
github.com/prometheus/procfs v0.6.0 // indirect
45+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
46+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
47+
github.com/prometheus/client_golang v1.20.4 // indirect
48+
github.com/prometheus/client_model v0.6.1 // indirect
49+
github.com/prometheus/common v0.59.1 // indirect
50+
github.com/prometheus/procfs v0.15.1 // indirect
4851
github.com/sirupsen/logrus v1.9.3 // indirect
4952
github.com/soheilhy/cmux v0.1.5 // indirect
5053
github.com/spf13/pflag v1.0.5 // indirect
51-
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
52-
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
53-
go.etcd.io/bbolt v1.3.9 // indirect
54-
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
55-
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
56-
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
57-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
58-
go.opentelemetry.io/otel v1.20.0 // indirect
59-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
60-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
61-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
62-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
63-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
64-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
65-
go.uber.org/multierr v1.10.0 // indirect
66-
golang.org/x/crypto v0.24.0 // indirect
67-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
68-
golang.org/x/net v0.26.0 // indirect
69-
golang.org/x/sys v0.21.0 // indirect
70-
golang.org/x/text v0.16.0 // indirect
71-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
72-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
73-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
74-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
75-
google.golang.org/grpc v1.64.0 // indirect
76-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
54+
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
55+
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
56+
go.etcd.io/bbolt v1.3.11 // indirect
57+
go.etcd.io/etcd/client/v2 v2.305.16 // indirect
58+
go.etcd.io/etcd/pkg/v3 v3.5.16 // indirect
59+
go.etcd.io/etcd/raft/v3 v3.5.16 // indirect
60+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
61+
go.opentelemetry.io/otel v1.30.0 // indirect
62+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
63+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect
64+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
65+
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
66+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
67+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
68+
go.uber.org/multierr v1.11.0 // indirect
69+
golang.org/x/crypto v0.27.0 // indirect
70+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
71+
golang.org/x/net v0.29.0 // indirect
72+
golang.org/x/sys v0.25.0 // indirect
73+
golang.org/x/text v0.18.0 // indirect
74+
golang.org/x/time v0.6.0 // indirect
75+
google.golang.org/genproto v0.0.0-20240924160255-9d4c2d233b61 // indirect
76+
google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect
77+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
78+
google.golang.org/grpc v1.67.0 // indirect
79+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
7780
gopkg.in/yaml.v2 v2.4.0 // indirect
7881
gopkg.in/yaml.v3 v3.0.1 // indirect
79-
sigs.k8s.io/yaml v1.3.0 // indirect
82+
sigs.k8s.io/yaml v1.4.0 // indirect
8083
)

0 commit comments

Comments
 (0)