diff --git a/handler.go b/handler.go index 3a7ee7aa2..c67a961ee 100644 --- a/handler.go +++ b/handler.go @@ -56,13 +56,6 @@ func NewHandler() *Handler { func NewRouter(handler *Handler) *mux.Router { router := mux.NewRouter() - router.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux).Methods("GET") - router.HandleFunc("/debug/vars", handler.handleExpvar).Methods("GET") - router.HandleFunc("/schema", handler.handleGetSchema).Methods("GET") - router.HandleFunc("/query", handler.handlePostQuery).Methods("POST") - router.HandleFunc("/import", handler.handlePostImport).Methods("POST") - router.HandleFunc("/export", handler.handleGetExport).Methods("GET") - router.HandleFunc("/slices/max", handler.handleGetSliceMax).Methods("GET") router.HandleFunc("/db", handler.handleGetDB).Methods("GET") router.HandleFunc("/db", handler.handlePostDB).Methods("POST") router.HandleFunc("/db", handler.handleDeleteDB).Methods("DELETE") @@ -72,19 +65,26 @@ func NewRouter(handler *Handler) *mux.Router { router.HandleFunc("/db/time_quantum", handler.handlePatchDBTimeQuantum).Methods("PATCH") router.HandleFunc("/db/{db}/time-quantum", handler.handlePatchDBTimeQuantum).Methods("PATCH") router.HandleFunc("/db/attr/diff", handler.handlePostDBAttrDiff).Methods("POST") + router.PathPrefix("/debug/pprof/").Handler(http.DefaultServeMux).Methods("GET") + router.HandleFunc("/debug/vars", handler.handleExpvar).Methods("GET") + router.HandleFunc("/export", handler.handleGetExport).Methods("GET") router.HandleFunc("/frame", handler.handlePostFrame).Methods("POST") router.HandleFunc("/frame", handler.handleDeleteFrame).Methods("DELETE") - router.HandleFunc("/frame/time_quantum", handler.handlePatchFrameTimeQuantum).Methods("PATCH") router.HandleFunc("/frame/attr/diff", handler.handlePostFrameAttrDiff).Methods("POST") - router.HandleFunc("/fragment/nodes", handler.handleGetFragmentNodes).Methods("GET") + router.HandleFunc("/frame/restore", handler.handlePostFrameRestore).Methods("POST") + router.HandleFunc("/frame/time_quantum", handler.handlePatchFrameTimeQuantum).Methods("PATCH") + router.HandleFunc("/frame/views", handler.handleGetFrameViews).Methods("GET") + router.HandleFunc("/fragment/block/data", handler.handleGetFragmentBlockData).Methods("GET") + router.HandleFunc("/fragment/blocks", handler.handleGetFragmentBlocks).Methods("GET") router.HandleFunc("/fragment/data", handler.handleGetFragmentData).Methods("GET") router.HandleFunc("/fragment/data", handler.handlePostFragmentData).Methods("POST") - router.HandleFunc("/fragment/blocks", handler.handleGetFragmentBlocks).Methods("GET") - router.HandleFunc("/fragment/block/data", handler.handleGetFragmentBlockData).Methods("GET") - router.HandleFunc("/frame/restore", handler.handlePostFrameRestore).Methods("POST") + router.HandleFunc("/fragment/nodes", handler.handleGetFragmentNodes).Methods("GET") + router.HandleFunc("/import", handler.handlePostImport).Methods("POST") router.HandleFunc("/nodes", handler.handleGetNodes).Methods("GET") + router.HandleFunc("/query", handler.handlePostQuery).Methods("POST") + router.HandleFunc("/schema", handler.handleGetSchema).Methods("GET") + router.HandleFunc("/slices/max", handler.handleGetSliceMax).Methods("GET") router.HandleFunc("/version", handler.handleGetVersion).Methods("GET") - router.HandleFunc("/frame/views", handler.handleGetFrameViews).Methods("GET") // TODO: Apply MethodNotAllowed statuses to all endpoints. // Ideally this would be automatic, as described in this (wontfix) ticket: