remove unused routes
This commit is contained in:
11
cmd/serve.go
11
cmd/serve.go
@@ -13,7 +13,6 @@ import (
|
|||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/metal"
|
"go.equinixmetal.net/infra9-metal-bridge/internal/metal"
|
||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/permissions"
|
"go.equinixmetal.net/infra9-metal-bridge/internal/permissions"
|
||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/pubsub"
|
"go.equinixmetal.net/infra9-metal-bridge/internal/pubsub"
|
||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/routes"
|
|
||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/service"
|
"go.equinixmetal.net/infra9-metal-bridge/internal/service"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -87,14 +86,6 @@ func serve(cmd *cobra.Command, _ []string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
router, err := routes.NewRouter(
|
|
||||||
routes.WithLogger(logger.Desugar()),
|
|
||||||
routes.WithService(service),
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
logger.Fatalw("error initializing router", "error", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
srv, err := echox.NewServer(
|
srv, err := echox.NewServer(
|
||||||
logger.Desugar(),
|
logger.Desugar(),
|
||||||
echox.ConfigFromViper(viper.GetViper()),
|
echox.ConfigFromViper(viper.GetViper()),
|
||||||
@@ -104,8 +95,6 @@ func serve(cmd *cobra.Command, _ []string) {
|
|||||||
logger.Fatalw("failed to initialize new server", "error", err)
|
logger.Fatalw("failed to initialize new server", "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
srv.AddHandler(router)
|
|
||||||
|
|
||||||
defer subscriber.Close()
|
defer subscriber.Close()
|
||||||
|
|
||||||
logger.Info("Listening for events")
|
logger.Info("Listening for events")
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
package routes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/labstack/echo/v4"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
// ErrInvalidJWTPrivateKeyType is returned when the private key type is not of an expected value.
|
|
||||||
ErrInvalidJWTPrivateKeyType = errors.New("invalid JWT private key provided")
|
|
||||||
|
|
||||||
// ErrAuthTokenHeaderRequired is returned when a token check request is made, but the Authorization header is missing.
|
|
||||||
ErrAuthTokenHeaderRequired = echo.NewHTTPError(http.StatusBadRequest, "header Authorization missing or invalid")
|
|
||||||
|
|
||||||
// ErrInvalidSigningMethod is returned when defined jwt signing method is not recognized.
|
|
||||||
ErrInvalidSigningMethod = errors.New("unrecognized jwt signing method provided")
|
|
||||||
|
|
||||||
// ErrMissingIssuer is returned when the jwt issuer is not defined in the config.
|
|
||||||
ErrMissingIssuer = errors.New("jwt issuer required")
|
|
||||||
)
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
package routes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/service"
|
|
||||||
"go.uber.org/zap"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Option is a functional configuration option for the router.
|
|
||||||
type Option func(r *Router) error
|
|
||||||
|
|
||||||
// WithLogger sets the logger for the router.
|
|
||||||
func WithLogger(logger *zap.Logger) Option {
|
|
||||||
return func(r *Router) error {
|
|
||||||
r.logger = logger
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// WithService sets the service handler.
|
|
||||||
func WithService(svc service.Service) Option {
|
|
||||||
return func(r *Router) error {
|
|
||||||
r.svc = svc
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
// Package routes provides the routes for the application.
|
|
||||||
package routes
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/labstack/echo/v4"
|
|
||||||
"go.equinixmetal.net/infra9-metal-bridge/internal/service"
|
|
||||||
"go.uber.org/zap"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Router is the router for the application.
|
|
||||||
type Router struct {
|
|
||||||
logger *zap.Logger
|
|
||||||
svc service.Service
|
|
||||||
}
|
|
||||||
|
|
||||||
// Routes registers the routes for the application.
|
|
||||||
func (r *Router) Routes(g *echo.Group) {}
|
|
||||||
|
|
||||||
// NewRouter creates a new router
|
|
||||||
func NewRouter(opts ...Option) (*Router, error) {
|
|
||||||
router := Router{
|
|
||||||
logger: zap.NewNop(),
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, opt := range opts {
|
|
||||||
if err := opt(&router); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return &router, nil
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user