bump go-app

clean-up grpc-gateway middleware
2025-03-26 08:38:57 -04:00 · 2025-03-26 08:31:37 -04:00
3 changed files with 6 additions and 20 deletions
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module gitea.libretechconsulting.com/rmcguire/ambient-local-exporter
 go 1.24.1

 require (
-	gitea.libretechconsulting.com/rmcguire/go-app v0.9.0
+	gitea.libretechconsulting.com/rmcguire/go-app v0.9.1
 	github.com/go-resty/resty/v2 v2.16.5
 	github.com/gorilla/schema v1.4.1
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
--- a/go.sum
+++ b/go.sum
@@ -8,6 +8,8 @@ gitea.libretechconsulting.com/rmcguire/go-app v0.8.1 h1:pnmFJnY77dsh84zvVcHqFuQg
 gitea.libretechconsulting.com/rmcguire/go-app v0.8.1/go.mod h1:W6YHFSGf4nJrgs9DqEaw+3J6ufIARsr1zpOs/V6gRTQ=
 gitea.libretechconsulting.com/rmcguire/go-app v0.9.0 h1:ZOBdVk2EehGCX6K3pdT5Dy07bMiUR7VTifE+n0ODfak=
 gitea.libretechconsulting.com/rmcguire/go-app v0.9.0/go.mod h1:W6YHFSGf4nJrgs9DqEaw+3J6ufIARsr1zpOs/V6gRTQ=
+gitea.libretechconsulting.com/rmcguire/go-app v0.9.1 h1:QihWX1YeCqttpAjXq6nHWvNk1MpIhuW8bSO3G+fbsRg=
+gitea.libretechconsulting.com/rmcguire/go-app v0.9.1/go.mod h1:W6YHFSGf4nJrgs9DqEaw+3J6ufIARsr1zpOs/V6gRTQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
--- a/pkg/ambient/app.go
+++ b/pkg/ambient/app.go
@@ -9,25 +9,9 @@ import (

 func (aw *AmbientWeather) GetGatewayOpts() []runtime.ServeMuxOption {
 	return []runtime.ServeMuxOption{
-		runtime.WithMiddlewares(func(hf runtime.HandlerFunc) runtime.HandlerFunc {
-			return func(w http.ResponseWriter, r *http.Request, pathParams map[string]string) {
-				aw.GetLogger().Trace().
-					Any("pathParams", pathParams).
-					Msg("inbound request called")
-			}
-		}),
-		runtime.WithRoutingErrorHandler(
-			func(
-				ctx context.Context, mux *runtime.ServeMux, mshl runtime.Marshaler,
-				w http.ResponseWriter, r *http.Request, code int,
-			) {
-				aw.GetLogger().Trace().
-					Int("code", code).
-					Str("pattern", r.Pattern).
-					Msg("requesting grpc-gateway route")
-
-				// Pass back to default
-				runtime.DefaultRoutingErrorHandler(ctx, mux, mshl, w, r, code)
+		runtime.WithErrorHandler(func(ctx context.Context, sm *runtime.ServeMux, m runtime.Marshaler, w http.ResponseWriter, req *http.Request, err error) {
+			aw.GetLogger().Err(err).Msg("error handling gateway request")
+			runtime.DefaultHTTPErrorHandler(ctx, sm, m, w, req, err)
 		}),
 	}
 }
Author	SHA1	Message	Date
Ryan McGuire	82c08a7bc3	bump go-app All checks were successful Build and Publish / release (push) Has been skipped Details Build and Publish / check-chart (push) Successful in 10s Details Build and Publish / helm-release (push) Has been skipped Details	2025-03-26 08:38:57 -04:00
Ryan McGuire	a8f62858e0	clean-up grpc-gateway middleware	2025-03-26 08:31:37 -04:00