Skip to content

Commit 3d853db

Browse files
Gerrit91Gerrit91
authored
Update dependencies. (#614)
1 parent 9170367 commit 3d853db

File tree

5 files changed

+89
-192
lines changed

5 files changed

+89
-192
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,14 @@ func NewAuditResponse(e auditing.Entry) *AuditResponse {
7676
body = fmt.Sprintf("unknown body: %v", v)
7777
}
7878
}
79-
err := ""
79+
errStr := ""
8080
if e.Error != nil {
81-
err = e.Error.Error()
81+
b, err := json.Marshal(e.Error)
82+
if err == nil {
83+
errStr = string(b)
84+
} else {
85+
errStr = fmt.Sprintf("unknown error: %v", e.Error)
86+
}
8287
}
8388

8489
return &AuditResponse{
@@ -95,6 +100,6 @@ func NewAuditResponse(e auditing.Entry) *AuditResponse {
95100
RemoteAddr: e.RemoteAddr,
96101
Body: body,
97102
StatusCode: e.StatusCode,
98-
Error: err,
103+
Error: errStr,
99104
}
100105
}

‎cmd/metal-api/main.go‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ const (
7272
DataStoreConnectNoDemotion dsConnectOpt = 1
7373

7474
auditingBackendTimescaleDB = "timescaledb"
75-
auditingBackendMeilisearch = "meilisearch"
7675
)
7776

7877
var (
@@ -290,13 +289,7 @@ func init() {
290289
rootCmd.Flags().StringP("masterdata-certkeypath", "", "", "the tls certificate key to talk to the masterdata-api")
291290

292291
rootCmd.Flags().Bool("auditing-enabled", false, "enable auditing")
293-
rootCmd.Flags().String("auditing-search-backend", "", "the auditing backend used as a source for search in the audit service. if not specified the first one configured is picked given the following order of precedence: timescaledb,meilisearch")
294-
295-
rootCmd.Flags().String("auditing-meili-url", "http://localhost:7700", "url of the auditing service")
296-
rootCmd.Flags().String("auditing-meili-api-key", "secret", "api key for the auditing service")
297-
rootCmd.Flags().String("auditing-meili-index-prefix", "auditing", "auditing index prefix")
298-
rootCmd.Flags().String("auditing-meili-index-interval", "@daily", "auditing index creation interval, can be one of @hourly|@daily|@monthly")
299-
rootCmd.Flags().Int64("auditing-meili-keep", 14, "the amount of indexes to keep until cleanup")
292+
rootCmd.Flags().String("auditing-search-backend", "", "the auditing backend used as a source for search in the audit service. if not specified the first one configured is picked given the following order of precedence: timescaledb")
300293

301294
rootCmd.Flags().String("auditing-timescaledb-host", "", "host of the auditing service")
302295
rootCmd.Flags().String("auditing-timescaledb-port", "", "port of the auditing service")
@@ -960,26 +953,6 @@ func createAuditingClient(log *slog.Logger) (searchBackend auditing.Auditing, ba
960953
}
961954
}
962955

963-
if viper.IsSet("auditing-meili-api-key") {
964-
backend, err := auditing.NewMeilisearch(c, auditing.MeilisearchConfig{
965-
URL: viper.GetString("auditing-meili-url"),
966-
APIKey: viper.GetString("auditing-meili-api-key"),
967-
IndexPrefix: viper.GetString("auditing-meili-index-prefix"),
968-
RotationInterval: auditing.Interval(viper.GetString("auditing-meili-index-interval")),
969-
Keep: viper.GetInt64("auditing-meili-keep"),
970-
})
971-
972-
if err != nil {
973-
return nil, nil, err
974-
}
975-
976-
backends = append(backends, backend)
977-
978-
if viper.GetString("auditing-search-backend") == auditingBackendMeilisearch {
979-
searchBackend = backend
980-
}
981-
}
982-
983956
if searchBackend == nil {
984957
searchBackend = pointer.FirstOrZero(backends)
985958
}

‎go.mod‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ require (
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
21-
github.com/metal-stack/go-ipam v1.14.9
22-
github.com/metal-stack/masterdata-api v0.11.6
23-
github.com/metal-stack/metal-lib v0.20.2
21+
github.com/metal-stack/go-ipam v1.14.10
22+
github.com/metal-stack/masterdata-api v0.11.8
23+
github.com/metal-stack/metal-lib v0.21.0
2424
github.com/metal-stack/security v0.9.3
2525
github.com/metal-stack/v v1.0.3
2626
github.com/nsqio/go-nsq v1.1.0
@@ -34,7 +34,7 @@ require (
3434
golang.org/x/crypto v0.36.0
3535
golang.org/x/sync v0.12.0
3636
google.golang.org/grpc v1.71.0
37-
google.golang.org/protobuf v1.36.5
37+
google.golang.org/protobuf v1.36.6
3838
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
3939
)
4040

@@ -46,47 +46,45 @@ require (
4646
dario.cat/mergo v1.0.1 // indirect
4747
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
4848
github.com/Microsoft/go-winio v0.6.2 // indirect
49-
github.com/andybalholm/brotli v1.1.1 // indirect
5049
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
5150
github.com/beorn7/perks v1.0.1 // indirect
5251
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5352
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5453
github.com/containerd/log v0.1.0 // indirect
5554
github.com/containerd/platforms v0.2.1 // indirect
56-
github.com/coreos/go-oidc/v3 v3.12.0 // indirect
55+
github.com/coreos/go-oidc/v3 v3.13.0 // indirect
5756
github.com/coreos/go-semver v0.3.1 // indirect
5857
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5958
github.com/cpuguy83/dockercfg v0.3.2 // indirect
6059
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
61-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
60+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
6261
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
6362
github.com/distribution/reference v0.6.0 // indirect
64-
github.com/docker/docker v27.5.1+incompatible // indirect
63+
github.com/docker/docker v28.0.2+incompatible // indirect
6564
github.com/docker/go-connections v0.5.0 // indirect
6665
github.com/docker/go-units v0.5.0 // indirect
6766
github.com/felixge/httpsnoop v1.0.4 // indirect
6867
github.com/fsnotify/fsnotify v1.8.0 // indirect
6968
github.com/glebarez/go-sqlite v1.22.0 // indirect
7069
github.com/glebarez/sqlite v1.11.0 // indirect
7170
github.com/go-gormigrate/gormigrate/v2 v2.1.3 // indirect
72-
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
71+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
7372
github.com/go-json-experiment/json v0.0.0-20250213060926-925ba3f173fa // indirect
7473
github.com/go-logr/logr v1.4.2 // indirect
7574
github.com/go-logr/stdr v1.2.2 // indirect
7675
github.com/go-ole/go-ole v1.3.0 // indirect
77-
github.com/go-openapi/errors v0.22.0 // indirect
76+
github.com/go-openapi/errors v0.22.1 // indirect
7877
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7978
github.com/go-openapi/jsonreference v0.21.0 // indirect
8079
github.com/go-openapi/runtime v0.28.0 // indirect
8180
github.com/go-openapi/strfmt v0.23.0 // indirect
82-
github.com/go-openapi/swag v0.23.0 // indirect
81+
github.com/go-openapi/swag v0.23.1 // indirect
8382
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
8483
github.com/goccy/go-json v0.10.5 // indirect
8584
github.com/gogo/protobuf v1.3.2 // indirect
86-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
87-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
85+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
8886
github.com/golang/protobuf v1.5.4 // indirect
89-
github.com/golang/snappy v0.0.4 // indirect
87+
github.com/golang/snappy v1.0.0 // indirect
9088
github.com/gorilla/mux v1.8.1 // indirect
9189
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
9290
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
@@ -102,21 +100,20 @@ require (
102100
github.com/jmoiron/sqlx v1.4.0 // indirect
103101
github.com/josharian/intern v1.0.0 // indirect
104102
github.com/json-iterator/go v1.1.12 // indirect
105-
github.com/klauspost/compress v1.17.11 // indirect
103+
github.com/klauspost/compress v1.18.0 // indirect
106104
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
107105
github.com/lestrrat-go/httpcc v1.0.1 // indirect
108106
github.com/lestrrat-go/httprc v1.0.6 // indirect
109107
github.com/lestrrat-go/iter v1.0.2 // indirect
110-
github.com/lestrrat-go/jwx/v2 v2.1.3 // indirect
108+
github.com/lestrrat-go/jwx/v2 v2.1.4 // indirect
111109
github.com/lestrrat-go/option v1.0.1 // indirect
112110
github.com/lib/pq v1.10.9 // indirect
113111
github.com/lopezator/migrator v0.3.1 // indirect
114-
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
112+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
115113
github.com/magiconair/properties v1.8.9 // indirect
116114
github.com/mailru/easyjson v0.9.0 // indirect
117115
github.com/mattn/go-colorable v0.1.14 // indirect
118116
github.com/mattn/go-isatty v0.0.20 // indirect
119-
github.com/meilisearch/meilisearch-go v0.27.2 // indirect
120117
github.com/mitchellh/mapstructure v1.5.0 // indirect
121118
github.com/moby/docker-image-spec v1.3.1 // indirect
122119
github.com/moby/patternmatcher v0.6.0 // indirect
@@ -132,7 +129,7 @@ require (
132129
github.com/ncruces/go-strftime v0.1.9 // indirect
133130
github.com/oklog/ulid v1.3.1 // indirect
134131
github.com/opencontainers/go-digest v1.0.0 // indirect
135-
github.com/opencontainers/image-spec v1.1.0 // indirect
132+
github.com/opencontainers/image-spec v1.1.1 // indirect
136133
github.com/opentracing/opentracing-go v1.2.0 // indirect
137134
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
138135
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
@@ -141,12 +138,12 @@ require (
141138
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
142139
github.com/prometheus/client_model v0.6.1 // indirect
143140
github.com/prometheus/common v0.63.0 // indirect
144-
github.com/prometheus/procfs v0.15.1 // indirect
141+
github.com/prometheus/procfs v0.16.0 // indirect
145142
github.com/puzpuzpuz/xsync/v3 v3.5.0 // indirect
146-
github.com/redis/go-redis/v9 v9.7.0 // indirect
143+
github.com/redis/go-redis/v9 v9.7.1 // indirect
147144
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
148145
github.com/rs/zerolog v1.33.0 // indirect
149-
github.com/sagikazarmark/locafero v0.7.0 // indirect
146+
github.com/sagikazarmark/locafero v0.8.0 // indirect
150147
github.com/segmentio/asm v1.2.0 // indirect
151148
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
152149
github.com/shoenig/go-m1cpu v0.1.6 // indirect
@@ -158,19 +155,17 @@ require (
158155
github.com/stretchr/objx v0.5.2 // indirect
159156
github.com/subosito/gotenv v1.6.0 // indirect
160157
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
161-
github.com/tklauser/go-sysconf v0.3.14 // indirect
162-
github.com/tklauser/numcpus v0.9.0 // indirect
163-
github.com/valyala/bytebufferpool v1.0.0 // indirect
164-
github.com/valyala/fasthttp v1.58.0 // indirect
158+
github.com/tklauser/go-sysconf v0.3.15 // indirect
159+
github.com/tklauser/numcpus v0.10.0 // indirect
165160
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
166161
github.com/xdg-go/scram v1.1.2 // indirect
167162
github.com/xdg-go/stringprep v1.0.4 // indirect
168163
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
169164
github.com/yusufpapurcu/wmi v1.2.4 // indirect
170-
go.etcd.io/etcd/api/v3 v3.5.18 // indirect
171-
go.etcd.io/etcd/client/pkg/v3 v3.5.18 // indirect
172-
go.etcd.io/etcd/client/v3 v3.5.18 // indirect
173-
go.mongodb.org/mongo-driver v1.17.2 // indirect
165+
go.etcd.io/etcd/api/v3 v3.5.19 // indirect
166+
go.etcd.io/etcd/client/pkg/v3 v3.5.19 // indirect
167+
go.etcd.io/etcd/client/v3 v3.5.19 // indirect
168+
go.mongodb.org/mongo-driver v1.17.3 // indirect
174169
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
175170
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
176171
go.opentelemetry.io/otel v1.35.0 // indirect
@@ -186,7 +181,7 @@ require (
186181
golang.org/x/oauth2 v0.28.0 // indirect
187182
golang.org/x/sys v0.31.0 // indirect
188183
golang.org/x/text v0.23.0 // indirect
189-
google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b // indirect
184+
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
190185
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
191186
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
192187
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)