From 179ee6ef6b302c6e99b6bc13b4fa723501b5c559 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Sep 2026 01:02:57 +0000 Subject: [PATCH 1/2] deps: update Go dependencies --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- samples/estore/go.mod | 2 +- samples/estore/go.sum | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 4705589ff..92cd1fdd9 100644 --- a/go.mod +++ b/go.mod @@ -30,9 +30,9 @@ require ( google.golang.org/grpc v1.84.0 google.golang.org/protobuf v1.36.12 helm.sh/helm/v4 v4.3.0 - k8s.io/api v0.37.0 - k8s.io/apimachinery v0.37.0 - k8s.io/client-go v0.37.0 + k8s.io/api v0.37.1 + k8s.io/apimachinery v0.37.1 + k8s.io/client-go v0.37.1 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 sigs.k8s.io/controller-runtime v0.25.1 sigs.k8s.io/yaml v1.6.0 @@ -174,7 +174,7 @@ require ( k8s.io/klog/v2 v2.140.0 // indirect k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect k8s.io/kubectl v0.37.0 // indirect - k8s.io/streaming v0.37.0 // indirect + k8s.io/streaming v0.37.1 // indirect oras.land/oras-go/v2 v2.6.2 // indirect sigs.k8s.io/gateway-api v1.6.0 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect diff --git a/go.sum b/go.sum index e15ea8b26..6149d99ac 100644 --- a/go.sum +++ b/go.sum @@ -501,18 +501,18 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= helm.sh/helm/v4 v4.3.0 h1:wLRTNXzy96ro7waurWMsymlUPaCQOj5nokpJZJNen/w= helm.sh/helm/v4 v4.3.0/go.mod h1:p6SMo6BMyg+4H52fJXvRNg1To0a0KGfiPxjVEcHHSk0= -k8s.io/api v0.37.0 h1:Z//Vj9N7RA/yS2sDmxyeo7h+RR4zbUrd2vrd3Z0TbB4= -k8s.io/api v0.37.0/go.mod h1:LKXgcJWMc+f4OLbP5SFR8rulEg07zZhpi/zMULiBImk= +k8s.io/api v0.37.1 h1:l6N77U7tjwB5L056bgrBTJIEdevac/naBZ3iSvDNfpM= +k8s.io/api v0.37.1/go.mod h1:zSlbB1YpJ1YQlFVQy20UYll81UJSJJUMLhkhvg6Z78M= k8s.io/apiextensions-apiserver v0.37.0 h1:zRMQ3+/LIE5oZ0tVvXwYHC+dIkSP5cjNWju7AZU1LOI= k8s.io/apiextensions-apiserver v0.37.0/go.mod h1:HU0PfSBwchHL5iDau6jjt9zU6ryWkDDlaVUiq91NK80= -k8s.io/apimachinery v0.37.0 h1:Np2AbDtf8x6RDHiD8T9LbKJ9gaegeVNa8yNm5FuGKm0= -k8s.io/apimachinery v0.37.0/go.mod h1:RN3nhprFSCxOi5Selxd7oMTXOe/c+ZbcE7Im+TS2zkE= +k8s.io/apimachinery v0.37.1 h1:hGCYyvKHCwtwMitj2vU4vYx0Z16N9GyZk9BBnz0wDAE= +k8s.io/apimachinery v0.37.1/go.mod h1:jF84AyUi/IRIXRot5f+lm6MpxoWI+F1XgjaMmwCdTFw= k8s.io/apiserver v0.37.0 h1:TXg7OxsOWrAH8J4Zi/gBAZuMw1Dfdd+6cca2h4qjRqo= k8s.io/apiserver v0.37.0/go.mod h1:OddHDF4gy9qyIb8o/3+qaeP6S0vEObWLgOygVqXksv0= k8s.io/cli-runtime v0.37.0 h1:U3XakUeirBQJMz5688r04z74SIHSE7V5SIZ6Ho5JyBM= k8s.io/cli-runtime v0.37.0/go.mod h1:qiQMFkKwFFuPH6zy953On+nc3qfpEHAIDrJmAuRz5Vg= -k8s.io/client-go v0.37.0 h1:nsN31fy8wBySuZ+QRnKmrjRSQLOG2rvoGN0tKd12zhQ= -k8s.io/client-go v0.37.0/go.mod h1:FcGqw+Ll/gNQiq+nPGY1Oyt9y7SgDh1d3MW3RFDEbn0= +k8s.io/client-go v0.37.1 h1:QTv/5ha4jAHtW9qxxVBkQVFBRDb4jHfFopQqqMdc+wM= +k8s.io/client-go v0.37.1/go.mod h1:dnAPtTnCNY38Ho04D2KdY1F4IKausa9UbqaAZKl60SY= k8s.io/component-base v0.37.0 h1:3SdSa4+itMdFTDFTeR8CxKGmSTSMXFlKL4ky8OqjguM= k8s.io/component-base v0.37.0/go.mod h1:LjOebp4R9y6LODWZQv102ZQxGheLcDO2ZJLAw6bbh4I= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= @@ -521,8 +521,8 @@ k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad h1:oXImqH8mQNk7PmvzKhmN3d k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= k8s.io/kubectl v0.37.0 h1:cici6hiofx93ASldmprDmZF55SfhVt4o3HniltVLjTc= k8s.io/kubectl v0.37.0/go.mod h1:RSeEl8e/yqDx6srG8Azr0uAtVPNIZljA0PNh9HCBcdg= -k8s.io/streaming v0.37.0 h1:iPBUZLZiKt5bV+lxJurASMOV07VuBhNpiwJt2//AWrM= -k8s.io/streaming v0.37.0/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= +k8s.io/streaming v0.37.1 h1:TpzVfQeFuVndn2g9mFqxy1UcUYPwDzqjUmwR/IzJCWc= +k8s.io/streaming v0.37.1/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= diff --git a/samples/estore/go.mod b/samples/estore/go.mod index d268afb8d..c760fd634 100644 --- a/samples/estore/go.mod +++ b/samples/estore/go.mod @@ -4,7 +4,7 @@ go 1.26.1 replace github.com/edgelesssys/marblerun => ../../ -replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20260918162117-cecb64721679 +replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20260921155816-b14227669459 require ( github.com/edgelesssys/estore v1.2.0 diff --git a/samples/estore/go.sum b/samples/estore/go.sum index 9f4c4e472..aade3d046 100644 --- a/samples/estore/go.sum +++ b/samples/estore/go.sum @@ -116,7 +116,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20260918162117-cecb64721679 h1:mrYWzwd6zwK4O6JPs/+qxW8NM+tH2MWU5J0e08dx0Ss= +google.golang.org/genproto v0.0.0-20260921155816-b14227669459 h1:5prWTQVAMQeg+h29dQ58n/jksx4EWd+d7KrFOyr697s= google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800 h1:qEHAMpSaUhtD0p3NbEEI83HwNGFxEwaSJ1G9PLnCBZE= google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.84.0 h1:soMyaPJ8pAak5PIQ0DGBUir0XRo2fRoMqhNWMLlLxO0= From 923eb171745a815ef82841324faa3360f4cc8e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Mon, 28 Sep 2026 08:51:39 +0200 Subject: [PATCH 2/2] server: export interface declaration to satisfy linter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- coordinator/server/metrics.go | 16 ++++++++++------ coordinator/server/server.go | 4 ++-- coordinator/server/server_test.go | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/coordinator/server/metrics.go b/coordinator/server/metrics.go index 0159521ab..1a73e1105 100644 --- a/coordinator/server/metrics.go +++ b/coordinator/server/metrics.go @@ -14,8 +14,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" ) -// serveMux is an interface of an HTTP request multiplexer. -type serveMux interface { +// ServeMux is an interface of an HTTP request multiplexer. +type ServeMux interface { Handle(pattern string, handler http.Handler) HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) ServeHTTP(w http.ResponseWriter, r *http.Request) @@ -138,10 +138,14 @@ func (p *promServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) { // metricsMiddelware returns the handed next handler wrapped in a bunch of prometheus metric handlers. func (p *promServeMux) metricsMiddleware(pattern string, next http.Handler) http.Handler { - return promhttp.InstrumentHandlerDuration(p.metrics[pattern].duration, - promhttp.InstrumentHandlerCounter(p.metrics[pattern].request, - promhttp.InstrumentHandlerRequestSize(p.metrics[pattern].requestSize, - promhttp.InstrumentHandlerResponseSize(p.metrics[pattern].responseSize, + return promhttp.InstrumentHandlerDuration( + p.metrics[pattern].duration, + promhttp.InstrumentHandlerCounter( + p.metrics[pattern].request, + promhttp.InstrumentHandlerRequestSize( + p.metrics[pattern].requestSize, + promhttp.InstrumentHandlerResponseSize( + p.metrics[pattern].responseSize, promhttp.InstrumentHandlerInFlight(p.metrics[pattern].inflight, next), ), ), diff --git a/coordinator/server/server.go b/coordinator/server/server.go index e9ab56d95..0b5e2114f 100644 --- a/coordinator/server/server.go +++ b/coordinator/server/server.go @@ -77,10 +77,10 @@ func RunMarbleServer(core *core.Core, addr string, addrChan chan string, errChan } // CreateServeMux creates a mux that serves the client API. -func CreateServeMux(api handler.ClientAPI, promFactory *promauto.Factory, log *zap.Logger) serveMux { +func CreateServeMux(api handler.ClientAPI, promFactory *promauto.Factory, log *zap.Logger) ServeMux { serverV1 := v1.NewServer(api, log) serverV2 := v2.NewServer(api, log) - var router serveMux + var router ServeMux if promFactory != nil { muxRouter := newPromServeMux(promFactory, "server", "client_api") muxRouter.setMethodNotAllowedHandler(handler.MethodNotAllowedHandler) diff --git a/coordinator/server/server_test.go b/coordinator/server/server_test.go index 2be59adbd..89d7aa26d 100644 --- a/coordinator/server/server_test.go +++ b/coordinator/server/server_test.go @@ -227,7 +227,7 @@ func TestSetSecret(t *testing.T) { assert.NoError(err) } -func testRequestWithCert(req *http.Request, resp *httptest.ResponseRecorder, mux serveMux) error { +func testRequestWithCert(req *http.Request, resp *httptest.ResponseRecorder, mux ServeMux) error { mux.ServeHTTP(resp, req) if resp.Code != http.StatusUnauthorized { return errors.New("request without certificate was not rejected")