Move avail. route output to /routes endpoint

cmd/crust/main.go

@@ -23,7 +23,6 @@ import (
 	"github.com/crusttech/crust/internal/config"
 	"github.com/crusttech/crust/internal/metrics"
 	"github.com/crusttech/crust/internal/middleware"
-	"github.com/crusttech/crust/internal/routes"
 	"github.com/crusttech/crust/internal/subscription"
 )
 
@@ -136,8 +135,6 @@ func main() {
 		}
 		r.HandleFunc("/*", serveIndex("webapp", "index.html", fileserver))
 
-		routes.Print(r)
-
 		go http.Serve(listener, r)
 		<-ctx.Done()
 	}

compose/routes.go

@@ -9,14 +9,12 @@ import (
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/config"
 	"github.com/crusttech/crust/internal/middleware"
-	"github.com/crusttech/crust/internal/routes"
 )
 
 func Routes(ctx context.Context) *chi.Mux {
 	r := chi.NewRouter()
 	middleware.Mount(ctx, r, flags.http)
 	MountRoutes(ctx, r)
-	routes.Print(r)
 	middleware.MountSystemRoutes(ctx, r, flags.http)
 	return r
 }

internal/middleware/mount.go

@@ -2,6 +2,10 @@ package middleware
 
 import (
 	"context"
+	"fmt"
+	"net/http"
+	"reflect"
+	"runtime"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
@@ -32,4 +36,23 @@ func MountSystemRoutes(ctx context.Context, r chi.Router, opts *config.HTTP) {
 	metrics.MountRoutes(r, opts)
 	r.Mount("/debug", middleware.Profiler())
 	r.Get("/version", version.HttpHandler)
+
+	r.Get("/routes", func(w http.ResponseWriter, req *http.Request) {
+		var printRoutes func(chi.Routes, string)
+
+		printRoutes = func(r chi.Routes, pfix string) {
+			routes := r.Routes()
+			for _, route := range routes {
+				if route.SubRoutes != nil && len(route.SubRoutes.Routes()) > 0 {
+					printRoutes(route.SubRoutes, pfix+route.Pattern[:len(route.Pattern)-2])
+				} else {
+					for method, fn := range route.Handlers {
+						fmt.Fprintf(w, "%-8s %-80s -> %s\n", method, pfix+route.Pattern, runtime.FuncForPC(reflect.ValueOf(fn).Pointer()).Name())
+					}
+				}
+			}
+		}
+
+		printRoutes(r, "")
+	})
 }

internal/routes/print.go

@@ -1,27 +0,0 @@
-package routes
-
-import (
-	"fmt"
-	"reflect"
-	"runtime"
-
-	"github.com/go-chi/chi"
-)
-
-func Print(r chi.Router) {
-	var printRoutes func(chi.Routes, string, string)
-	printRoutes = func(r chi.Routes, indent string, prefix string) {
-		routes := r.Routes()
-		for _, route := range routes {
-			if route.SubRoutes != nil && len(route.SubRoutes.Routes()) > 0 {
-				fmt.Printf(indent+"%s - with %d handlers, %d subroutes\n", route.Pattern, len(route.Handlers), len(route.SubRoutes.Routes()))
-				printRoutes(route.SubRoutes, indent+"\t", prefix+route.Pattern[:len(route.Pattern)-2])
-			} else {
-				for key, fn := range route.Handlers {
-					fmt.Printf("%s%s\t%s -> %s\n", indent, key, prefix+route.Pattern, runtime.FuncForPC(reflect.ValueOf(fn).Pointer()).Name())
-				}
-			}
-		}
-	}
-	printRoutes(r, "", "")
-}

messaging/routes.go

@@ -8,7 +8,6 @@ import (
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/config"
 	"github.com/crusttech/crust/internal/middleware"
-	"github.com/crusttech/crust/internal/routes"
 	"github.com/crusttech/crust/messaging/rest"
 	"github.com/crusttech/crust/messaging/websocket"
 )
@@ -17,7 +16,6 @@ func Routes(ctx context.Context) *chi.Mux {
 	r := chi.NewRouter()
 	middleware.Mount(ctx, r, flags.http)
 	MountRoutes(ctx, r)
-	routes.Print(r)
 	middleware.MountSystemRoutes(ctx, r, flags.http)
 	return r
 }

system/routes.go

@@ -8,7 +8,6 @@ import (
 	"github.com/crusttech/crust/internal/auth"
 	"github.com/crusttech/crust/internal/config"
 	"github.com/crusttech/crust/internal/middleware"
-	"github.com/crusttech/crust/internal/routes"
 	"github.com/crusttech/crust/system/rest"
 )
 
@@ -16,7 +15,6 @@ func Routes(ctx context.Context) *chi.Mux {
 	r := chi.NewRouter()
 	middleware.Mount(ctx, r, flags.http)
 	MountRoutes(ctx, r)
-	routes.Print(r)
 	middleware.MountSystemRoutes(ctx, r, flags.http)
 	return r
 }