Skip to content

Commit 3947ae9

Browse files
authored
Update to go-1.25 (#633)
1 parent 2059d6e commit 3947ae9

File tree

9 files changed

+299
-430
lines changed

9 files changed

+299
-430
lines changed

.github/workflows/docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
3030

3131
- name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

3434
- name: Setup Go
3535
uses: actions/setup-go@v5
@@ -38,7 +38,7 @@ jobs:
3838
cache: false
3939

4040
- name: Lint
41-
uses: golangci/golangci-lint-action@v7
41+
uses: golangci/golangci-lint-action@v8
4242
with:
4343
args: --build-tags integration -D protogetter --timeout=5m
4444

@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- name: Checkout
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@v5
7171

7272
- name: Setup Go
7373
uses: actions/setup-go@v5

CONTRIBUTING.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

cmd/metal-api/internal/metal/filesystem_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,15 +863,15 @@ func Test_convertToOpAndVersion(t *testing.T) {
863863
op: "",
864864
version: nil,
865865
wantErr: true,
866-
errString: "given imageconstraint:>=10.0.1 is not valid, missing space between op and version? Invalid Semantic Version",
866+
errString: "given imageconstraint:>=10.0.1 is not valid, missing space between op and version? invalid semantic version",
867867
},
868868
{
869869
name: "invalid version",
870870
versionconstraint: ">= 10.x.1",
871871
op: "",
872872
version: nil,
873873
wantErr: true,
874-
errString: "given version:10.x.1 is not valid:Invalid Semantic Version",
874+
errString: "given version:10.x.1 is not valid:invalid semantic version",
875875
},
876876
}
877877
for _, tt := range tests {

go.mod

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
module github.com/metal-stack/metal-api
22

3-
go 1.24
3+
go 1.25
44

55
require (
66
connectrpc.com/connect v1.18.1
7-
github.com/Masterminds/semver/v3 v3.3.1
7+
github.com/Masterminds/semver/v3 v3.4.0
88
github.com/avast/retry-go/v4 v4.6.1
9-
github.com/aws/aws-sdk-go v1.55.7
9+
github.com/aws/aws-sdk-go v1.55.8
1010
github.com/dustin/go-humanize v1.0.1
1111
github.com/emicklei/go-restful-openapi/v2 v2.11.0
12-
github.com/emicklei/go-restful/v3 v3.12.2
12+
github.com/emicklei/go-restful/v3 v3.13.0
1313
github.com/go-openapi/spec v0.21.0
1414
github.com/google/go-cmp v0.7.0
1515
github.com/google/uuid v1.6.0
1616
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0
1717
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2
1818
github.com/juanfont/headscale v0.23.0
1919
github.com/klauspost/connect-compress/v2 v2.0.0
20-
github.com/looplab/fsm v1.0.2
21-
github.com/metal-stack/go-ipam v1.14.11
20+
github.com/looplab/fsm v1.0.3
21+
github.com/metal-stack/go-ipam v1.14.13
2222
github.com/metal-stack/masterdata-api v0.12.0
23-
github.com/metal-stack/metal-lib v0.23.2
23+
github.com/metal-stack/metal-lib v0.23.4
2424
github.com/metal-stack/security v0.9.4
2525
github.com/metal-stack/v v1.0.3
2626
github.com/nsqio/go-nsq v1.1.0
27-
github.com/prometheus/client_golang v1.22.0
28-
github.com/samber/lo v1.50.0
29-
github.com/spf13/cobra v1.9.1
27+
github.com/prometheus/client_golang v1.23.0
28+
github.com/samber/lo v1.51.0
29+
github.com/spf13/cobra v1.10.1
3030
github.com/spf13/viper v1.20.1
31-
github.com/stretchr/testify v1.10.0
31+
github.com/stretchr/testify v1.11.1
3232
github.com/testcontainers/testcontainers-go v0.38.0
3333
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
34-
golang.org/x/crypto v0.40.0
34+
golang.org/x/crypto v0.41.0
3535
golang.org/x/sync v0.16.0
36-
google.golang.org/grpc v1.74.2
37-
google.golang.org/protobuf v1.36.6
36+
google.golang.org/grpc v1.75.0
37+
google.golang.org/protobuf v1.36.8
3838
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
3939
)
4040

@@ -55,16 +55,16 @@ require (
5555
github.com/containerd/errdefs/pkg v0.3.0 // indirect
5656
github.com/containerd/log v0.1.0 // indirect
5757
github.com/containerd/platforms v0.2.1 // indirect
58-
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
58+
github.com/coreos/go-oidc/v3 v3.15.0 // indirect
5959
github.com/coreos/go-semver v0.3.1 // indirect
60-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
60+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
6161
github.com/cpuguy83/dockercfg v0.3.2 // indirect
6262
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6363
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
6464
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
6565
github.com/distribution/reference v0.6.0 // indirect
66-
github.com/docker/docker v28.3.2+incompatible // indirect
67-
github.com/docker/go-connections v0.5.0 // indirect
66+
github.com/docker/docker v28.3.3+incompatible // indirect
67+
github.com/docker/go-connections v0.6.0 // indirect
6868
github.com/docker/go-units v0.5.0 // indirect
6969
github.com/ebitengine/purego v0.8.4 // indirect
7070
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -86,17 +86,17 @@ require (
8686
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
8787
github.com/goccy/go-json v0.10.5 // indirect
8888
github.com/gogo/protobuf v1.3.2 // indirect
89-
github.com/golang-jwt/jwt/v5 v5.2.3 // indirect
89+
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
9090
github.com/golang/protobuf v1.5.4 // indirect
9191
github.com/golang/snappy v1.0.0 // indirect
9292
github.com/gorilla/mux v1.8.1 // indirect
93-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
93+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
9494
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
9595
github.com/icza/dyno v0.0.0-20230330125955-09f820a8d9c0 // indirect
9696
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9797
github.com/jackc/pgpassfile v1.0.0 // indirect
9898
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
99-
github.com/jackc/pgx/v5 v5.7.2 // indirect
99+
github.com/jackc/pgx/v5 v5.7.5 // indirect
100100
github.com/jackc/puddle/v2 v2.2.2 // indirect
101101
github.com/jinzhu/inflection v1.0.0 // indirect
102102
github.com/jinzhu/now v1.1.5 // indirect
@@ -113,7 +113,7 @@ require (
113113
github.com/lestrrat-go/option v1.0.1 // indirect
114114
github.com/lib/pq v1.10.9 // indirect
115115
github.com/lopezator/migrator v0.3.1 // indirect
116-
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
116+
github.com/lufia/plan9stats v0.0.0-20250821153705-5981dea3221d // indirect
117117
github.com/magiconair/properties v1.8.10 // indirect
118118
github.com/mailru/easyjson v0.9.0 // indirect
119119
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -144,18 +144,18 @@ require (
144144
github.com/prometheus/client_model v0.6.2 // indirect
145145
github.com/prometheus/common v0.65.0 // indirect
146146
github.com/prometheus/procfs v0.17.0 // indirect
147-
github.com/puzpuzpuz/xsync/v3 v3.5.0 // indirect
148-
github.com/redis/go-redis/v9 v9.7.3 // indirect
147+
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
148+
github.com/redis/go-redis/v9 v9.13.0 // indirect
149149
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
150-
github.com/rs/zerolog v1.33.0 // indirect
150+
github.com/rs/zerolog v1.34.0 // indirect
151151
github.com/sagikazarmark/locafero v0.9.0 // indirect
152152
github.com/segmentio/asm v1.2.0 // indirect
153-
github.com/shirou/gopsutil/v4 v4.25.6 // indirect
153+
github.com/shirou/gopsutil/v4 v4.25.8 // indirect
154154
github.com/sirupsen/logrus v1.9.3 // indirect
155155
github.com/sourcegraph/conc v0.3.0 // indirect
156156
github.com/spf13/afero v1.14.0 // indirect
157157
github.com/spf13/cast v1.9.2 // indirect
158-
github.com/spf13/pflag v1.0.7 // indirect
158+
github.com/spf13/pflag v1.0.10 // indirect
159159
github.com/stretchr/objx v0.5.2 // indirect
160160
github.com/subosito/gotenv v1.6.0 // indirect
161161
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
@@ -166,27 +166,27 @@ require (
166166
github.com/xdg-go/stringprep v1.0.4 // indirect
167167
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
168168
github.com/yusufpapurcu/wmi v1.2.4 // indirect
169-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
170-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
171-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
169+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
170+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
171+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
172172
go.mongodb.org/mongo-driver v1.17.4 // indirect
173173
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
174-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
175-
go.opentelemetry.io/otel v1.37.0 // indirect
176-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
177-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
178-
go.opentelemetry.io/otel/trace v1.37.0
179-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
174+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
175+
go.opentelemetry.io/otel v1.38.0 // indirect
176+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
177+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
178+
go.opentelemetry.io/otel/trace v1.38.0
179+
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
180180
go.uber.org/multierr v1.11.0 // indirect
181181
go.uber.org/zap v1.27.0 // indirect
182182
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
183-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
184-
golang.org/x/net v0.42.0 // indirect
183+
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b
184+
golang.org/x/net v0.43.0 // indirect
185185
golang.org/x/oauth2 v0.30.0 // indirect
186-
golang.org/x/sys v0.34.0 // indirect
187-
golang.org/x/text v0.27.0 // indirect
188-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
189-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
186+
golang.org/x/sys v0.35.0 // indirect
187+
golang.org/x/text v0.28.0 // indirect
188+
google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 // indirect
189+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
190190
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
191191
gopkg.in/inf.v0 v0.9.1 // indirect
192192
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)