From a93653ea8e2d1c2274784a719e8665660a69b574 Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Tue, 26 Apr 2022 14:32:55 -0700 Subject: [PATCH] Use api.Route instead of the caHandler. --- api/api.go | 15 +++++++++------ ca/ca.go | 5 ++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/api/api.go b/api/api.go index 9b795cf0..2137e29a 100644 --- a/api/api.go +++ b/api/api.go @@ -249,18 +249,21 @@ type FederationResponse struct { } // caHandler is the type used to implement the different CA HTTP endpoints. -type caHandler struct { - Authority Authority +type caHandler struct{} + +// Route configures the http request router. +func (h *caHandler) Route(r Router) { + Route(r) } // New creates a new RouterHandler with the CA endpoints. +// +// Deprecated: Use api.Route(r Router) func New(auth Authority) RouterHandler { - return &caHandler{ - Authority: auth, - } + return &caHandler{} } -func (h *caHandler) Route(r Router) { +func Route(r Router) { r.MethodFunc("GET", "/version", Version) r.MethodFunc("GET", "/health", Health) r.MethodFunc("GET", "/root/{sha}", Root) diff --git a/ca/ca.go b/ca/ca.go index bb8e15ac..24da6311 100644 --- a/ca/ca.go +++ b/ca/ca.go @@ -170,10 +170,9 @@ func (ca *CA) Init(cfg *config.Config) (*CA, error) { insecureHandler := http.Handler(insecureMux) // Add regular CA api endpoints in / and /1.0 - routerHandler := api.New(auth) - routerHandler.Route(mux) + api.Route(mux) mux.Route("/1.0", func(r chi.Router) { - routerHandler.Route(r) + api.Route(r) }) //Add ACME api endpoints in /acme and /1.0/acme