From 544273cd0b331aa4bcf998d6092ee11ccce09fad Mon Sep 17 00:00:00 2001 From: Mike Mason Date: Mon, 17 Jul 2023 19:36:19 +0000 Subject: [PATCH] remove unused routes --- cmd/serve.go | 11 ----------- internal/routes/errors.go | 22 ---------------------- internal/routes/options.go | 27 --------------------------- internal/routes/routes.go | 32 -------------------------------- 4 files changed, 92 deletions(-) delete mode 100644 internal/routes/errors.go delete mode 100644 internal/routes/options.go delete mode 100644 internal/routes/routes.go diff --git a/cmd/serve.go b/cmd/serve.go index 5fb707a..4e05b71 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -13,7 +13,6 @@ import ( "go.equinixmetal.net/infra9-metal-bridge/internal/metal" "go.equinixmetal.net/infra9-metal-bridge/internal/permissions" "go.equinixmetal.net/infra9-metal-bridge/internal/pubsub" - "go.equinixmetal.net/infra9-metal-bridge/internal/routes" "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( logger.Desugar(), echox.ConfigFromViper(viper.GetViper()), @@ -104,8 +95,6 @@ func serve(cmd *cobra.Command, _ []string) { logger.Fatalw("failed to initialize new server", "error", err) } - srv.AddHandler(router) - defer subscriber.Close() logger.Info("Listening for events") diff --git a/internal/routes/errors.go b/internal/routes/errors.go deleted file mode 100644 index 007c34f..0000000 --- a/internal/routes/errors.go +++ /dev/null @@ -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") -) diff --git a/internal/routes/options.go b/internal/routes/options.go deleted file mode 100644 index 817ec29..0000000 --- a/internal/routes/options.go +++ /dev/null @@ -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 - } -} diff --git a/internal/routes/routes.go b/internal/routes/routes.go deleted file mode 100644 index d297525..0000000 --- a/internal/routes/routes.go +++ /dev/null @@ -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 -}