try a different options approach

Author: rybit

router/options.go

@@ -1,40 +1,35 @@
 package router
 
 import (
-	"github.com/netlify/netlify-commons/tracing"
-	"github.com/rs/cors"
 	"github.com/sirupsen/logrus"
 )
 
-type Option func(r Router)
+type Option func(r *chiWrapper)
 
-func OptEnableCORS(r Router) {
-	corsMiddleware := cors.New(cors.Options{
-		AllowedMethods:   []string{"GET", "POST", "PATCH", "PUT", "DELETE"},
-		AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type"},
-		ExposedHeaders:   []string{"Link", "X-Total-Count"},
-		AllowCredentials: true,
-	})
-	r.Use(corsMiddleware.Handler)
+func OptEnableCORS(r *chiWrapper) {
+	r.enableCORS = true
 }
 
 func OptHealthCheck(path string, checker APIHandler) Option {
-	return func(r Router) {
-		r.Use(HealthCheck(path, checker))
+	return func(r *chiWrapper) {
+		r.healthEndpoint = path
+		r.healthHandler = checker
 	}
 }
 
 func OptVersionHeader(svcName, version string) Option {
-	return func(r Router) {
-		r.Use(VersionHeader(svcName, version))
-
+	return func(r *chiWrapper) {
+		if version == "" {
+			version = "unknown"
+		}
+		r.version = version
+		r.svcName = svcName
 	}
 }
 
 func OptTracingMiddleware(log logrus.FieldLogger, svcName string) Option {
-	return func(r Router) {
-		r.Use(tracing.Middleware(log, svcName))
+	return func(r *chiWrapper) {
+		r.svcName = svcName
+		r.enableTracing = true
 	}
 }
-
-

router/router.go

@@ -3,13 +3,25 @@ package router
 import (
 	"net/http"
 
+	"github.com/netlify/netlify-commons/tracing"
+	"github.com/rs/cors"
+
 	"github.com/go-chi/chi"
 	"github.com/sebest/xff"
 	"github.com/sirupsen/logrus"
 )
 
 type chiWrapper struct {
 	chi chi.Router
+
+	version string
+	svcName string
+
+	healthEndpoint string
+	healthHandler  APIHandler
+
+	enableTracing bool
+	enableCORS    bool
 }
 
 // Router wraps the chi router to make it slightly more accessible
@@ -37,21 +49,41 @@ type Router interface {
 
 //  creates a router with sensible defaults (xff, request id, cors)
 func New(log logrus.FieldLogger, options ...Option) Router {
-	r := &chiWrapper{chi.NewRouter()}
+	r := &chiWrapper{
+		chi:     chi.NewRouter(),
+		version: "unknown",
+	}
 
 	xffmw, _ := xff.Default()
 	r.Use(xffmw.Handler)
 	for _, opt := range options {
 		opt(r)
 	}
+	r.Use(VersionHeader(r.svcName, r.version))
+	if r.enableCORS {
+		corsMiddleware := cors.New(cors.Options{
+			AllowedMethods:   []string{"GET", "POST", "PATCH", "PUT", "DELETE"},
+			AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type"},
+			ExposedHeaders:   []string{"Link", "X-Total-Count"},
+			AllowCredentials: true,
+		})
+		r.Use(corsMiddleware.Handler)
+	}
+
+	if r.healthEndpoint != "" {
+		r.Use(HealthCheck(r.healthEndpoint, r.healthHandler))
+	}
+	if r.enableTracing {
+		r.Use(tracing.Middleware(log, r.svcName))
+	}
 
 	return r
 }
 
 // Route allows creating a generic route
 func (r *chiWrapper) Route(pattern string, fn func(Router)) {
 	r.chi.Route(pattern, func(c chi.Router) {
-		fn(&chiWrapper{c})
+		fn(&chiWrapper{chi: c})
 	})
 }