Skip to content

Commit 3f0dd4f

Browse files
Gerrit91Gerrit91
authored
Update masterdata-api depedency. (#627)
1 parent 3566ba5 commit 3f0dd4f

File tree

6 files changed

+130
-124
lines changed

6 files changed

+130
-124
lines changed

‎cmd/metal-api/internal/service/audit-service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (r *auditResource) find(request *restful.Request, response *restful.Respons
8080
ForwardedFor: requestPayload.ForwardedFor,
8181
RemoteAddr: requestPayload.RemoteAddr,
8282
Body: requestPayload.Body,
83-
StatusCode: requestPayload.StatusCode,
83+
StatusCode: &requestPayload.StatusCode,
8484
Error: requestPayload.Error,
8585
})
8686
if err != nil {

‎cmd/metal-api/internal/service/tenant-service.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
v1 "github.com/metal-stack/masterdata-api/api/rest/v1"
1010
mdmv1 "github.com/metal-stack/masterdata-api/api/v1"
1111
mdm "github.com/metal-stack/masterdata-api/pkg/client"
12-
"google.golang.org/protobuf/types/known/wrapperspb"
1312

1413
restfulspec "github.com/emicklei/go-restful-openapi/v2"
1514
restful "github.com/emicklei/go-restful/v3"
@@ -198,7 +197,7 @@ func (r *tenantResource) deleteTenant(request *restful.Request, response *restfu
198197
return
199198
}
200199

201-
plr, err := r.mdc.Project().Find(request.Request.Context(), &mdmv1.ProjectFindRequest{TenantId: wrapperspb.String(id)})
200+
plr, err := r.mdc.Project().Find(request.Request.Context(), &mdmv1.ProjectFindRequest{TenantId: &id})
202201
if err != nil {
203202
r.sendError(request, response, defaultError(err))
204203
return

‎cmd/metal-api/internal/service/v1/audit.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type AuditResponse struct {
5555
RemoteAddr string `json:"remote_addr" optional:"true"`
5656

5757
Body string `json:"body" optional:"true"`
58-
StatusCode int `json:"status_code" optional:"true"`
58+
StatusCode *int `json:"status_code" optional:"true"`
5959

6060
// Internal errors
6161
Error string `json:"error" optional:"true"`

‎cmd/metal-api/main.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import (
1616
"syscall"
1717
"time"
1818

19-
"google.golang.org/protobuf/types/known/wrapperspb"
20-
2119
"github.com/Masterminds/semver/v3"
2220
"github.com/avast/retry-go/v4"
2321
v1 "github.com/metal-stack/masterdata-api/api/v1"
@@ -613,7 +611,7 @@ func initAuth(lg *slog.Logger) security.UserGetter {
613611

614612
// get provider tenant from masterdata
615613
ts, err := mdc.Tenant().Find(context.Background(), &v1.TenantFindRequest{
616-
Id: wrapperspb.String(providerTenant),
614+
Id: &providerTenant,
617615
})
618616
if err != nil {
619617
return nil, err

‎go.mod‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ require (
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
16-
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
16+
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
2020
github.com/looplab/fsm v1.0.2
2121
github.com/metal-stack/go-ipam v1.14.11
22-
github.com/metal-stack/masterdata-api v0.11.11
23-
github.com/metal-stack/metal-lib v0.21.0
22+
github.com/metal-stack/masterdata-api v0.12.0
23+
github.com/metal-stack/metal-lib v0.23.2
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
@@ -29,11 +29,11 @@ require (
2929
github.com/spf13/cobra v1.9.1
3030
github.com/spf13/viper v1.20.1
3131
github.com/stretchr/testify v1.10.0
32-
github.com/testcontainers/testcontainers-go v0.37.0
32+
github.com/testcontainers/testcontainers-go v0.38.0
3333
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
34-
golang.org/x/crypto v0.38.0
35-
golang.org/x/sync v0.14.0
36-
google.golang.org/grpc v1.72.1
34+
golang.org/x/crypto v0.40.0
35+
golang.org/x/sync v0.16.0
36+
google.golang.org/grpc v1.74.2
3737
google.golang.org/protobuf v1.36.6
3838
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
3939
)
@@ -43,13 +43,16 @@ require (
4343
replace github.com/emicklei/go-restful-openapi/v2 => github.com/emicklei/go-restful-openapi/v2 v2.9.1
4444

4545
require (
46-
dario.cat/mergo v1.0.1 // indirect
46+
dario.cat/mergo v1.0.2 // indirect
4747
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4848
github.com/Microsoft/go-winio v0.6.2 // indirect
4949
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
5050
github.com/beorn7/perks v1.0.1 // indirect
5151
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
52+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
5253
github.com/cespare/xxhash/v2 v2.3.0 // indirect
54+
github.com/containerd/errdefs v1.0.0 // indirect
55+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
5356
github.com/containerd/log v0.1.0 // indirect
5457
github.com/containerd/platforms v0.2.1 // indirect
5558
github.com/coreos/go-oidc/v3 v3.14.1 // indirect
@@ -60,18 +63,18 @@ require (
6063
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
6164
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
6265
github.com/distribution/reference v0.6.0 // indirect
63-
github.com/docker/docker v28.1.1+incompatible // indirect
66+
github.com/docker/docker v28.3.2+incompatible // indirect
6467
github.com/docker/go-connections v0.5.0 // indirect
6568
github.com/docker/go-units v0.5.0 // indirect
66-
github.com/ebitengine/purego v0.8.2 // indirect
69+
github.com/ebitengine/purego v0.8.4 // indirect
6770
github.com/felixge/httpsnoop v1.0.4 // indirect
68-
github.com/fsnotify/fsnotify v1.8.0 // indirect
71+
github.com/fsnotify/fsnotify v1.9.0 // indirect
6972
github.com/glebarez/go-sqlite v1.22.0 // indirect
7073
github.com/glebarez/sqlite v1.11.0 // indirect
7174
github.com/go-gormigrate/gormigrate/v2 v2.1.3 // indirect
72-
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
75+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
7376
github.com/go-json-experiment/json v0.0.0-20250213060926-925ba3f173fa // indirect
74-
github.com/go-logr/logr v1.4.2 // indirect
77+
github.com/go-logr/logr v1.4.3 // indirect
7578
github.com/go-logr/stdr v1.2.2 // indirect
7679
github.com/go-ole/go-ole v1.3.0 // indirect
7780
github.com/go-openapi/errors v0.22.1 // indirect
@@ -80,10 +83,10 @@ require (
8083
github.com/go-openapi/runtime v0.28.0 // indirect
8184
github.com/go-openapi/strfmt v0.23.0 // indirect
8285
github.com/go-openapi/swag v0.23.1 // indirect
83-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
86+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
8487
github.com/goccy/go-json v0.10.5 // indirect
8588
github.com/gogo/protobuf v1.3.2 // indirect
86-
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
89+
github.com/golang-jwt/jwt/v5 v5.2.3 // indirect
8790
github.com/golang/protobuf v1.5.4 // indirect
8891
github.com/golang/snappy v1.0.0 // indirect
8992
github.com/gorilla/mux v1.8.1 // indirect
@@ -102,11 +105,11 @@ require (
102105
github.com/josharian/intern v1.0.0 // indirect
103106
github.com/json-iterator/go v1.1.12 // indirect
104107
github.com/klauspost/compress v1.18.0 // indirect
105-
github.com/lestrrat-go/blackmagic v1.0.3 // indirect
108+
github.com/lestrrat-go/blackmagic v1.0.4 // indirect
106109
github.com/lestrrat-go/httpcc v1.0.1 // indirect
107110
github.com/lestrrat-go/httprc v1.0.6 // indirect
108111
github.com/lestrrat-go/iter v1.0.2 // indirect
109-
github.com/lestrrat-go/jwx/v2 v2.1.5 // indirect
112+
github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect
110113
github.com/lestrrat-go/option v1.0.1 // indirect
111114
github.com/lib/pq v1.10.9 // indirect
112115
github.com/lopezator/migrator v0.3.1 // indirect
@@ -119,7 +122,6 @@ require (
119122
github.com/moby/docker-image-spec v1.3.1 // indirect
120123
github.com/moby/go-archive v0.1.0 // indirect
121124
github.com/moby/patternmatcher v0.6.0 // indirect
122-
github.com/moby/sys/atomicwriter v0.1.0 // indirect
123125
github.com/moby/sys/sequential v0.6.0 // indirect
124126
github.com/moby/sys/user v0.4.0 // indirect
125127
github.com/moby/sys/userns v0.1.0 // indirect
@@ -135,25 +137,25 @@ require (
135137
github.com/opencontainers/image-spec v1.1.1 // indirect
136138
github.com/opentracing/opentracing-go v1.2.0 // indirect
137139
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
138-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
140+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
139141
github.com/pkg/errors v0.9.1 // indirect
140142
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
141143
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
142-
github.com/prometheus/client_model v0.6.1 // indirect
143-
github.com/prometheus/common v0.63.0 // indirect
144-
github.com/prometheus/procfs v0.16.0 // indirect
144+
github.com/prometheus/client_model v0.6.2 // indirect
145+
github.com/prometheus/common v0.65.0 // indirect
146+
github.com/prometheus/procfs v0.17.0 // indirect
145147
github.com/puzpuzpuz/xsync/v3 v3.5.0 // indirect
146148
github.com/redis/go-redis/v9 v9.7.3 // indirect
147149
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
148150
github.com/rs/zerolog v1.33.0 // indirect
149-
github.com/sagikazarmark/locafero v0.8.0 // indirect
151+
github.com/sagikazarmark/locafero v0.9.0 // indirect
150152
github.com/segmentio/asm v1.2.0 // indirect
151-
github.com/shirou/gopsutil/v4 v4.25.3 // indirect
153+
github.com/shirou/gopsutil/v4 v4.25.6 // indirect
152154
github.com/sirupsen/logrus v1.9.3 // indirect
153155
github.com/sourcegraph/conc v0.3.0 // indirect
154156
github.com/spf13/afero v1.14.0 // indirect
155-
github.com/spf13/cast v1.7.1 // indirect
156-
github.com/spf13/pflag v1.0.6 // indirect
157+
github.com/spf13/cast v1.9.2 // indirect
158+
github.com/spf13/pflag v1.0.7 // indirect
157159
github.com/stretchr/objx v0.5.2 // indirect
158160
github.com/subosito/gotenv v1.6.0 // indirect
159161
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
@@ -167,24 +169,24 @@ require (
167169
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
168170
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
169171
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
170-
go.mongodb.org/mongo-driver v1.17.3 // indirect
172+
go.mongodb.org/mongo-driver v1.17.4 // indirect
171173
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
172-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
173-
go.opentelemetry.io/otel v1.35.0 // indirect
174+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
175+
go.opentelemetry.io/otel v1.37.0 // indirect
174176
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
175-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
176-
go.opentelemetry.io/otel/trace v1.35.0
177+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
178+
go.opentelemetry.io/otel/trace v1.37.0
177179
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
178180
go.uber.org/multierr v1.11.0 // indirect
179181
go.uber.org/zap v1.27.0 // indirect
180182
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
181183
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
182-
golang.org/x/net v0.40.0 // indirect
184+
golang.org/x/net v0.42.0 // indirect
183185
golang.org/x/oauth2 v0.30.0 // indirect
184-
golang.org/x/sys v0.33.0 // indirect
185-
golang.org/x/text v0.25.0 // indirect
186-
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
187-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // 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
188190
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
189191
gopkg.in/inf.v0 v0.9.1 // indirect
190192
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)