feat(api): error mapping (#3708)

Author: tothandras

api/v3/apierrors/handler.go

@@ -13,51 +13,17 @@ import (
 
 const httpStatusCodeErrorAttribute = "openmeter.http.status_code"
 
-type v3ErrorMapping struct {
-	match func(err error) bool
-	build func(ctx context.Context, err error) *BaseAPIError
+type ErrorMapping struct {
+	Match func(err error) bool
+	Build func(ctx context.Context, err error) *BaseAPIError
 }
 
 // NewV3ErrorHandlerFunc returns an oapi-codegen ChiServerOptions.ErrorHandlerFunc implementation.
 //
 // It is invoked when the generated router fails request binding (query/path/header parsing).
 // The main purpose is to ensure we always write a response (otherwise net/http defaults to 200 with
 // an empty body), and to keep error-to-status mapping consistent with our model error types.
-func NewV3ErrorHandlerFunc(logger errorsx.Handler) func(w http.ResponseWriter, r *http.Request, err error) {
-	// Mirrors pkg/framework/commonhttp/encoder.go GenericErrorEncoder ordering (after the status-code attribute mapping).
-	mappings := []v3ErrorMapping{
-		{
-			match: models.IsGenericConflictError,
-			build: func(ctx context.Context, err error) *BaseAPIError { return NewConflictError(ctx, err, err.Error()) },
-		},
-		{
-			match: models.IsGenericForbiddenError,
-			build: func(ctx context.Context, err error) *BaseAPIError { return NewForbiddenError(ctx, err) },
-		},
-		{
-			match: models.IsGenericNotImplementedError,
-			build: func(ctx context.Context, err error) *BaseAPIError { return NewNotImplementedError(ctx, err) },
-		},
-		{
-			match: models.IsGenericValidationError,
-			build: func(ctx context.Context, err error) *BaseAPIError { return NewBadRequestError(ctx, err, nil) },
-		},
-		{
-			match: models.IsGenericNotFoundError,
-			build: func(ctx context.Context, err error) *BaseAPIError { return NewNotFoundError(ctx, err, "") },
-		},
-		{
-			match: models.IsGenericUnauthorizedError,
-			build: func(ctx context.Context, err error) *BaseAPIError { return NewUnauthenticatedError(ctx, err) },
-		},
-		{
-			match: models.IsGenericPreConditionFailedError,
-			build: func(ctx context.Context, err error) *BaseAPIError {
-				return NewPreconditionFailedError(ctx, err.Error())
-			},
-		},
-	}
-
+func NewV3ErrorHandlerFunc(logger errorsx.Handler, mappings []ErrorMapping) func(w http.ResponseWriter, r *http.Request, err error) {
 	return func(w http.ResponseWriter, r *http.Request, err error) {
 		if err == nil {
 			return
@@ -90,9 +56,9 @@ func NewV3ErrorHandlerFunc(logger errorsx.Handler) func(w http.ResponseWriter, r
 		}
 
 		for _, m := range mappings {
-			if m.match(err) {
+			if m.Match(err) {
 				logger.HandleContext(ctx, err)
-				m.build(ctx, err).HandleAPIError(w, r)
+				m.Build(ctx, err).HandleAPIError(w, r)
 				return
 			}
 		}

api/v3/server/server.go

@@ -30,6 +30,7 @@ import (
 	"github.com/openmeterio/openmeter/openmeter/subscription"
 	"github.com/openmeterio/openmeter/pkg/errorsx"
 	"github.com/openmeterio/openmeter/pkg/framework/transport/httptransport"
+	"github.com/openmeterio/openmeter/pkg/models"
 )
 
 type Config struct {
@@ -207,7 +208,50 @@ func (s *Server) RegisterRoutes(r chi.Router) error {
 			Middlewares: []api.MiddlewareFunc{
 				validationMiddleware,
 			},
-			ErrorHandlerFunc: apierrors.NewV3ErrorHandlerFunc(s.ErrorHandler),
+			ErrorHandlerFunc: apierrors.NewV3ErrorHandlerFunc(s.ErrorHandler, []apierrors.ErrorMapping{
+				{
+					Match: models.IsGenericConflictError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewConflictError(ctx, err, err.Error())
+					},
+				},
+				{
+					Match: models.IsGenericForbiddenError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewForbiddenError(ctx, err)
+					},
+				},
+				{
+					Match: models.IsGenericNotImplementedError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewNotImplementedError(ctx, err)
+					},
+				},
+				{
+					Match: models.IsGenericValidationError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewBadRequestError(ctx, err, nil)
+					},
+				},
+				{
+					Match: models.IsGenericNotFoundError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewNotFoundError(ctx, err, "")
+					},
+				},
+				{
+					Match: models.IsGenericUnauthorizedError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewUnauthenticatedError(ctx, err)
+					},
+				},
+				{
+					Match: models.IsGenericPreConditionFailedError,
+					Build: func(ctx context.Context, err error) *apierrors.BaseAPIError {
+						return apierrors.NewPreconditionFailedError(ctx, err.Error())
+					},
+				},
+			}),
 		})
 	})
 

openmeter/server/server.go

@@ -102,10 +102,6 @@ func NewServer(config *Config) (*Server, error) {
 		server.NewRequestLoggerMiddleware(slog.Default().Handler()),
 		middleware.Recoverer,
 	}
-	// Append PostAuthMiddlewares (e.g., FFXConfigContextMiddleware) to V3 API middlewares
-	for _, mw := range config.PostAuthMiddlewares {
-		v3Middlewares = append(v3Middlewares, mw)
-	}
 
 	v3API, err := v3server.NewServer(&v3server.Config{
 		BaseURL:                 "/api/v3",