IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

migrate handlers to new register

Browse Source
This commit is contained in:
bergquist 2017-09-13 14:53:38 +02:00 committed by Carl Bergquist
parent f842265388
commit 6372e22180
3 changed files with 161 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
pkg/api/api.go
View File

@ -10,7 +10,7 @@ import (
// Register adds http routes // Register adds http routes
func (hs *HttpServer) registerRoutes() { func (hs *HttpServer) registerRoutes() {
r := hs.macaron macaronR := hs.macaron
reqSignedIn := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true}) reqSignedIn := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true})
reqGrafanaAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true}) reqGrafanaAdmin := middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true})
reqEditorRole := middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN) reqEditorRole := middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN)
@ -19,7 +19,9 @@ func (hs *HttpServer) registerRoutes() {
bind := binding.Bind bind := binding.Bind
// automatically set HEAD for every GET // automatically set HEAD for every GET
r.SetAutoHead(true) macaronR.SetAutoHead(true)
r := newRouteRegister()
// not logged in views // not logged in views
r.Get("/", reqSignedIn, Index) r.Get("/", reqSignedIn, Index)
@ -98,195 +100,195 @@ func (hs *HttpServer) registerRoutes() {
r.Get("/api/login/ping", quota("session"), LoginApiPing) r.Get("/api/login/ping", quota("session"), LoginApiPing)
// authed api // authed api
r.Group("/api", func() { r.Group("/api", func(apiRoute RouteRegister) {
// user (signed in) // user (signed in)
r.Group("/user", func() { apiRoute.Group("/user", func(userRoute RouteRegister) {
r.Get("/", wrap(GetSignedInUser)) userRoute.Get("/", wrap(GetSignedInUser))
r.Put("/", bind(m.UpdateUserCommand{}), wrap(UpdateSignedInUser)) userRoute.Put("/", bind(m.UpdateUserCommand{}), wrap(UpdateSignedInUser))
r.Post("/using/:id", wrap(UserSetUsingOrg)) userRoute.Post("/using/:id", wrap(UserSetUsingOrg))
r.Get("/orgs", wrap(GetSignedInUserOrgList)) userRoute.Get("/orgs", wrap(GetSignedInUserOrgList))
r.Post("/stars/dashboard/:id", wrap(StarDashboard)) userRoute.Post("/stars/dashboard/:id", wrap(StarDashboard))
r.Delete("/stars/dashboard/:id", wrap(UnstarDashboard)) userRoute.Delete("/stars/dashboard/:id", wrap(UnstarDashboard))
r.Put("/password", bind(m.ChangeUserPasswordCommand{}), wrap(ChangeUserPassword)) userRoute.Put("/password", bind(m.ChangeUserPasswordCommand{}), wrap(ChangeUserPassword))
r.Get("/quotas", wrap(GetUserQuotas)) userRoute.Get("/quotas", wrap(GetUserQuotas))
r.Put("/helpflags/:id", wrap(SetHelpFlag)) userRoute.Put("/helpflags/:id", wrap(SetHelpFlag))
// For dev purpose // For dev purpose
r.Get("/helpflags/clear", wrap(ClearHelpFlags)) userRoute.Get("/helpflags/clear", wrap(ClearHelpFlags))
r.Get("/preferences", wrap(GetUserPreferences)) userRoute.Get("/preferences", wrap(GetUserPreferences))
r.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), wrap(UpdateUserPreferences)) userRoute.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), wrap(UpdateUserPreferences))
}) })
// users (admin permission required) // users (admin permission required)
r.Group("/users", func() { apiRoute.Group("/users", func(usersRoute RouteRegister) {
r.Get("/", wrap(SearchUsers)) usersRoute.Get("/", wrap(SearchUsers))
r.Get("/search", wrap(SearchUsersWithPaging)) usersRoute.Get("/search", wrap(SearchUsersWithPaging))
r.Get("/:id", wrap(GetUserById)) usersRoute.Get("/:id", wrap(GetUserById))
r.Get("/:id/orgs", wrap(GetUserOrgList)) usersRoute.Get("/:id/orgs", wrap(GetUserOrgList))
// query parameters /users/lookup?loginOrEmail=admin@example.com // query parameters /users/lookup?loginOrEmail=admin@example.com
r.Get("/lookup", wrap(GetUserByLoginOrEmail)) usersRoute.Get("/lookup", wrap(GetUserByLoginOrEmail))
r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser)) usersRoute.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser))
r.Post("/:id/using/:orgId", wrap(UpdateUserActiveOrg)) usersRoute.Post("/:id/using/:orgId", wrap(UpdateUserActiveOrg))
}, reqGrafanaAdmin) }, reqGrafanaAdmin)
// org information available to all users. // org information available to all users.
r.Group("/org", func() { apiRoute.Group("/org", func(orgRoute RouteRegister) {
r.Get("/", wrap(GetOrgCurrent)) orgRoute.Get("/", wrap(GetOrgCurrent))
r.Get("/quotas", wrap(GetOrgQuotas)) orgRoute.Get("/quotas", wrap(GetOrgQuotas))
}) })
// current org // current org
r.Group("/org", func() { apiRoute.Group("/org", func(orgRoute RouteRegister) {
r.Put("/", bind(dtos.UpdateOrgForm{}), wrap(UpdateOrgCurrent)) orgRoute.Put("/", bind(dtos.UpdateOrgForm{}), wrap(UpdateOrgCurrent))
r.Put("/address", bind(dtos.UpdateOrgAddressForm{}), wrap(UpdateOrgAddressCurrent)) orgRoute.Put("/address", bind(dtos.UpdateOrgAddressForm{}), wrap(UpdateOrgAddressCurrent))
r.Post("/users", quota("user"), bind(m.AddOrgUserCommand{}), wrap(AddOrgUserToCurrentOrg)) orgRoute.Post("/users", quota("user"), bind(m.AddOrgUserCommand{}), wrap(AddOrgUserToCurrentOrg))
r.Get("/users", wrap(GetOrgUsersForCurrentOrg)) orgRoute.Get("/users", wrap(GetOrgUsersForCurrentOrg))
r.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUserForCurrentOrg)) orgRoute.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUserForCurrentOrg))
r.Delete("/users/:userId", wrap(RemoveOrgUserForCurrentOrg)) orgRoute.Delete("/users/:userId", wrap(RemoveOrgUserForCurrentOrg))
// invites // invites
r.Get("/invites", wrap(GetPendingOrgInvites)) orgRoute.Get("/invites", wrap(GetPendingOrgInvites))
r.Post("/invites", quota("user"), bind(dtos.AddInviteForm{}), wrap(AddOrgInvite)) orgRoute.Post("/invites", quota("user"), bind(dtos.AddInviteForm{}), wrap(AddOrgInvite))
r.Patch("/invites/:code/revoke", wrap(RevokeInvite)) orgRoute.Patch("/invites/:code/revoke", wrap(RevokeInvite))
// prefs // prefs
r.Get("/preferences", wrap(GetOrgPreferences)) orgRoute.Get("/preferences", wrap(GetOrgPreferences))
r.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), wrap(UpdateOrgPreferences)) orgRoute.Put("/preferences", bind(dtos.UpdatePrefsCmd{}), wrap(UpdateOrgPreferences))
}, reqOrgAdmin) }, reqOrgAdmin)
// create new org // create new org
r.Post("/orgs", quota("org"), bind(m.CreateOrgCommand{}), wrap(CreateOrg)) apiRoute.Post("/orgs", quota("org"), bind(m.CreateOrgCommand{}), wrap(CreateOrg))
// search all orgs // search all orgs
r.Get("/orgs", reqGrafanaAdmin, wrap(SearchOrgs)) apiRoute.Get("/orgs", reqGrafanaAdmin, wrap(SearchOrgs))
// orgs (admin routes) // orgs (admin routes)
r.Group("/orgs/:orgId", func() { apiRoute.Group("/orgs/:orgId", func(orgsRoute RouteRegister) {
r.Get("/", wrap(GetOrgById)) orgsRoute.Get("/", wrap(GetOrgById))
r.Put("/", bind(dtos.UpdateOrgForm{}), wrap(UpdateOrg)) orgsRoute.Put("/", bind(dtos.UpdateOrgForm{}), wrap(UpdateOrg))
r.Put("/address", bind(dtos.UpdateOrgAddressForm{}), wrap(UpdateOrgAddress)) orgsRoute.Put("/address", bind(dtos.UpdateOrgAddressForm{}), wrap(UpdateOrgAddress))
r.Delete("/", wrap(DeleteOrgById)) orgsRoute.Delete("/", wrap(DeleteOrgById))
r.Get("/users", wrap(GetOrgUsers)) orgsRoute.Get("/users", wrap(GetOrgUsers))
r.Post("/users", bind(m.AddOrgUserCommand{}), wrap(AddOrgUser)) orgsRoute.Post("/users", bind(m.AddOrgUserCommand{}), wrap(AddOrgUser))
r.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUser)) orgsRoute.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUser))
r.Delete("/users/:userId", wrap(RemoveOrgUser)) orgsRoute.Delete("/users/:userId", wrap(RemoveOrgUser))
r.Get("/quotas", wrap(GetOrgQuotas)) orgsRoute.Get("/quotas", wrap(GetOrgQuotas))
r.Put("/quotas/:target", bind(m.UpdateOrgQuotaCmd{}), wrap(UpdateOrgQuota)) orgsRoute.Put("/quotas/:target", bind(m.UpdateOrgQuotaCmd{}), wrap(UpdateOrgQuota))
}, reqGrafanaAdmin) }, reqGrafanaAdmin)
// orgs (admin routes) // orgs (admin routes)
r.Group("/orgs/name/:name", func() { apiRoute.Group("/orgs/name/:name", func(orgsRoute RouteRegister) {
r.Get("/", wrap(GetOrgByName)) orgsRoute.Get("/", wrap(GetOrgByName))
}, reqGrafanaAdmin) }, reqGrafanaAdmin)
// auth api keys // auth api keys
r.Group("/auth/keys", func() { apiRoute.Group("/auth/keys", func(keysRoute RouteRegister) {
r.Get("/", wrap(GetApiKeys)) keysRoute.Get("/", wrap(GetApiKeys))
r.Post("/", quota("api_key"), bind(m.AddApiKeyCommand{}), wrap(AddApiKey)) keysRoute.Post("/", quota("api_key"), bind(m.AddApiKeyCommand{}), wrap(AddApiKey))
r.Delete("/:id", wrap(DeleteApiKey)) keysRoute.Delete("/:id", wrap(DeleteApiKey))
}, reqOrgAdmin) }, reqOrgAdmin)
// Preferences // Preferences
r.Group("/preferences", func() { apiRoute.Group("/preferences", func(prefRoute RouteRegister) {
r.Post("/set-home-dash", bind(m.SavePreferencesCommand{}), wrap(SetHomeDashboard)) prefRoute.Post("/set-home-dash", bind(m.SavePreferencesCommand{}), wrap(SetHomeDashboard))
}) })
// Data sources // Data sources
r.Group("/datasources", func() { apiRoute.Group("/datasources", func(datasourceRoute RouteRegister) {
r.Get("/", wrap(GetDataSources)) datasourceRoute.Get("/", wrap(GetDataSources))
r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource) datasourceRoute.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource)) datasourceRoute.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
r.Delete("/:id", DeleteDataSourceById) datasourceRoute.Delete("/:id", DeleteDataSourceById)
r.Delete("/name/:name", DeleteDataSourceByName) datasourceRoute.Delete("/name/:name", DeleteDataSourceByName)
r.Get("/:id", wrap(GetDataSourceById)) datasourceRoute.Get("/:id", wrap(GetDataSourceById))
r.Get("/name/:name", wrap(GetDataSourceByName)) datasourceRoute.Get("/name/:name", wrap(GetDataSourceByName))
}, reqOrgAdmin) }, reqOrgAdmin)
r.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn) apiRoute.Get("/datasources/id/:name", wrap(GetDataSourceIdByName), reqSignedIn)
r.Get("/plugins", wrap(GetPluginList)) apiRoute.Get("/plugins", wrap(GetPluginList))
r.Get("/plugins/:pluginId/settings", wrap(GetPluginSettingById)) apiRoute.Get("/plugins/:pluginId/settings", wrap(GetPluginSettingById))
r.Get("/plugins/:pluginId/markdown/:name", wrap(GetPluginMarkdown)) apiRoute.Get("/plugins/:pluginId/markdown/:name", wrap(GetPluginMarkdown))
r.Group("/plugins", func() { apiRoute.Group("/plugins", func(pluginRoute RouteRegister) {
r.Get("/:pluginId/dashboards/", wrap(GetPluginDashboards)) pluginRoute.Get("/:pluginId/dashboards/", wrap(GetPluginDashboards))
r.Post("/:pluginId/settings", bind(m.UpdatePluginSettingCmd{}), wrap(UpdatePluginSetting)) pluginRoute.Post("/:pluginId/settings", bind(m.UpdatePluginSettingCmd{}), wrap(UpdatePluginSetting))
}, reqOrgAdmin) }, reqOrgAdmin)
r.Get("/frontend/settings/", GetFrontendSettings) apiRoute.Get("/frontend/settings/", GetFrontendSettings)
r.Any("/datasources/proxy/:id/*", reqSignedIn, hs.ProxyDataSourceRequest) apiRoute.Any("/datasources/proxy/:id/*", reqSignedIn, hs.ProxyDataSourceRequest)
r.Any("/datasources/proxy/:id", reqSignedIn, hs.ProxyDataSourceRequest) apiRoute.Any("/datasources/proxy/:id", reqSignedIn, hs.ProxyDataSourceRequest)
// Dashboard // Dashboard
r.Group("/dashboards", func() { apiRoute.Group("/dashboards", func(dashboardRoute RouteRegister) {
r.Get("/db/:slug", GetDashboard) dashboardRoute.Get("/db/:slug", GetDashboard)
r.Delete("/db/:slug", reqEditorRole, DeleteDashboard) dashboardRoute.Delete("/db/:slug", reqEditorRole, DeleteDashboard)
r.Get("/id/:dashboardId/versions", wrap(GetDashboardVersions)) dashboardRoute.Get("/id/:dashboardId/versions", wrap(GetDashboardVersions))
r.Get("/id/:dashboardId/versions/:id", wrap(GetDashboardVersion)) dashboardRoute.Get("/id/:dashboardId/versions/:id", wrap(GetDashboardVersion))
r.Post("/id/:dashboardId/restore", reqEditorRole, bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion)) dashboardRoute.Post("/id/:dashboardId/restore", reqEditorRole, bind(dtos.RestoreDashboardVersionCommand{}), wrap(RestoreDashboardVersion))
r.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), wrap(CalculateDashboardDiff)) dashboardRoute.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), wrap(CalculateDashboardDiff))
r.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), wrap(PostDashboard)) dashboardRoute.Post("/db", reqEditorRole, bind(m.SaveDashboardCommand{}), wrap(PostDashboard))
r.Get("/file/:file", GetDashboardFromJsonFile) dashboardRoute.Get("/file/:file", GetDashboardFromJsonFile)
r.Get("/home", wrap(GetHomeDashboard)) dashboardRoute.Get("/home", wrap(GetHomeDashboard))
r.Get("/tags", GetDashboardTags) dashboardRoute.Get("/tags", GetDashboardTags)
r.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard)) dashboardRoute.Post("/import", bind(dtos.ImportDashboardCommand{}), wrap(ImportDashboard))
}) })
// Dashboard snapshots // Dashboard snapshots
r.Group("/dashboard/snapshots", func() { apiRoute.Group("/dashboard/snapshots", func(dashboardRoute RouteRegister) {
r.Get("/", wrap(SearchDashboardSnapshots)) dashboardRoute.Get("/", wrap(SearchDashboardSnapshots))
}) })
// Playlist // Playlist
r.Group("/playlists", func() { apiRoute.Group("/playlists", func(playlistRoute RouteRegister) {
r.Get("/", wrap(SearchPlaylists)) playlistRoute.Get("/", wrap(SearchPlaylists))
r.Get("/:id", ValidateOrgPlaylist, wrap(GetPlaylist)) playlistRoute.Get("/:id", ValidateOrgPlaylist, wrap(GetPlaylist))
r.Get("/:id/items", ValidateOrgPlaylist, wrap(GetPlaylistItems)) playlistRoute.Get("/:id/items", ValidateOrgPlaylist, wrap(GetPlaylistItems))
r.Get("/:id/dashboards", ValidateOrgPlaylist, wrap(GetPlaylistDashboards)) playlistRoute.Get("/:id/dashboards", ValidateOrgPlaylist, wrap(GetPlaylistDashboards))
r.Delete("/:id", reqEditorRole, ValidateOrgPlaylist, wrap(DeletePlaylist)) playlistRoute.Delete("/:id", reqEditorRole, ValidateOrgPlaylist, wrap(DeletePlaylist))
r.Put("/:id", reqEditorRole, bind(m.UpdatePlaylistCommand{}), ValidateOrgPlaylist, wrap(UpdatePlaylist)) playlistRoute.Put("/:id", reqEditorRole, bind(m.UpdatePlaylistCommand{}), ValidateOrgPlaylist, wrap(UpdatePlaylist))
r.Post("/", reqEditorRole, bind(m.CreatePlaylistCommand{}), wrap(CreatePlaylist)) playlistRoute.Post("/", reqEditorRole, bind(m.CreatePlaylistCommand{}), wrap(CreatePlaylist))
}) })
// Search // Search
r.Get("/search/", Search) apiRoute.Get("/search/", Search)
// metrics // metrics
r.Post("/tsdb/query", bind(dtos.MetricRequest{}), wrap(QueryMetrics)) apiRoute.Post("/tsdb/query", bind(dtos.MetricRequest{}), wrap(QueryMetrics))
r.Get("/tsdb/testdata/scenarios", wrap(GetTestDataScenarios)) apiRoute.Get("/tsdb/testdata/scenarios", wrap(GetTestDataScenarios))
r.Get("/tsdb/testdata/gensql", reqGrafanaAdmin, wrap(GenerateSqlTestData)) apiRoute.Get("/tsdb/testdata/gensql", reqGrafanaAdmin, wrap(GenerateSqlTestData))
r.Get("/tsdb/testdata/random-walk", wrap(GetTestDataRandomWalk)) apiRoute.Get("/tsdb/testdata/random-walk", wrap(GetTestDataRandomWalk))
r.Group("/alerts", func() { apiRoute.Group("/alerts", func(alertsRoute RouteRegister) {
r.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest)) alertsRoute.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest))
r.Post("/:alertId/pause", bind(dtos.PauseAlertCommand{}), wrap(PauseAlert), reqEditorRole) alertsRoute.Post("/:alertId/pause", bind(dtos.PauseAlertCommand{}), wrap(PauseAlert), reqEditorRole)
r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert)) alertsRoute.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert))
r.Get("/", wrap(GetAlerts)) alertsRoute.Get("/", wrap(GetAlerts))
r.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard)) alertsRoute.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard))
}) })
r.Get("/alert-notifications", wrap(GetAlertNotifications)) apiRoute.Get("/alert-notifications", wrap(GetAlertNotifications))
r.Get("/alert-notifiers", wrap(GetAlertNotifiers)) apiRoute.Get("/alert-notifiers", wrap(GetAlertNotifiers))
r.Group("/alert-notifications", func() { apiRoute.Group("/alert-notifications", func(alertNotifications RouteRegister) {
r.Post("/test", bind(dtos.NotificationTestCommand{}), wrap(NotificationTest)) alertNotifications.Post("/test", bind(dtos.NotificationTestCommand{}), wrap(NotificationTest))
r.Post("/", bind(m.CreateAlertNotificationCommand{}), wrap(CreateAlertNotification)) alertNotifications.Post("/", bind(m.CreateAlertNotificationCommand{}), wrap(CreateAlertNotification))
r.Put("/:notificationId", bind(m.UpdateAlertNotificationCommand{}), wrap(UpdateAlertNotification)) alertNotifications.Put("/:notificationId", bind(m.UpdateAlertNotificationCommand{}), wrap(UpdateAlertNotification))
r.Get("/:notificationId", wrap(GetAlertNotificationById)) alertNotifications.Get("/:notificationId", wrap(GetAlertNotificationById))
r.Delete("/:notificationId", wrap(DeleteAlertNotification)) alertNotifications.Delete("/:notificationId", wrap(DeleteAlertNotification))
}, reqEditorRole) }, reqEditorRole)
r.Get("/annotations", wrap(GetAnnotations)) apiRoute.Get("/annotations", wrap(GetAnnotations))
r.Post("/annotations/mass-delete", reqOrgAdmin, bind(dtos.DeleteAnnotationsCmd{}), wrap(DeleteAnnotations)) apiRoute.Post("/annotations/mass-delete", reqOrgAdmin, bind(dtos.DeleteAnnotationsCmd{}), wrap(DeleteAnnotations))
r.Group("/annotations", func() { apiRoute.Group("/annotations", func(annotationsRoute RouteRegister) {
r.Post("/", bind(dtos.PostAnnotationsCmd{}), wrap(PostAnnotation)) annotationsRoute.Post("/", bind(dtos.PostAnnotationsCmd{}), wrap(PostAnnotation))
}, reqEditorRole) }, reqEditorRole)
// error test // error test
@ -295,16 +297,16 @@ func (hs *HttpServer) registerRoutes() {
}, reqSignedIn) }, reqSignedIn)
// admin api // admin api
r.Group("/api/admin", func() { r.Group("/api/admin", func(adminRoute RouteRegister) {
r.Get("/settings", AdminGetSettings) adminRoute.Get("/settings", AdminGetSettings)
r.Post("/users", bind(dtos.AdminCreateUserForm{}), AdminCreateUser) adminRoute.Post("/users", bind(dtos.AdminCreateUserForm{}), AdminCreateUser)
r.Put("/users/:id/password", bind(dtos.AdminUpdateUserPasswordForm{}), AdminUpdateUserPassword) adminRoute.Put("/users/:id/password", bind(dtos.AdminUpdateUserPasswordForm{}), AdminUpdateUserPassword)
r.Put("/users/:id/permissions", bind(dtos.AdminUpdateUserPermissionsForm{}), AdminUpdateUserPermissions) adminRoute.Put("/users/:id/permissions", bind(dtos.AdminUpdateUserPermissionsForm{}), AdminUpdateUserPermissions)
r.Delete("/users/:id", AdminDeleteUser) adminRoute.Delete("/users/:id", AdminDeleteUser)
r.Get("/users/:id/quotas", wrap(GetUserQuotas)) adminRoute.Get("/users/:id/quotas", wrap(GetUserQuotas))
r.Put("/users/:id/quotas/:target", bind(m.UpdateUserQuotaCmd{}), wrap(UpdateUserQuota)) adminRoute.Put("/users/:id/quotas/:target", bind(m.UpdateUserQuotaCmd{}), wrap(UpdateUserQuota))
r.Get("/stats", AdminGetStats) adminRoute.Get("/stats", AdminGetStats)
r.Post("/pause-all-alerts", bind(dtos.PauseAllAlertsCommand{}), wrap(PauseAllAlerts)) adminRoute.Post("/pause-all-alerts", bind(dtos.PauseAllAlertsCommand{}), wrap(PauseAllAlerts))
}, reqGrafanaAdmin) }, reqGrafanaAdmin)
// rendering // rendering
@ -323,7 +325,9 @@ func (hs *HttpServer) registerRoutes() {
// streams // streams
//r.Post("/api/streams/push", reqSignedIn, bind(dtos.StreamMessage{}), liveConn.PushToStream) //r.Post("/api/streams/push", reqSignedIn, bind(dtos.StreamMessage{}), liveConn.PushToStream)
InitAppPluginRoutes(r) r.Register(macaronR)
r.NotFound(NotFoundHandler) InitAppPluginRoutes(macaronR)
macaronR.NotFound(NotFoundHandler)
} }

23
pkg/api/route_register.go
View File

@ -7,7 +7,7 @@ import (
) )
type Router interface { type Router interface {
Route(pattern, method string, handlers ...macaron.Handler) Handle(method, pattern string, handlers []macaron.Handler) *macaron.Route
} }
type RouteRegister interface { type RouteRegister interface {
@ -15,10 +15,12 @@ type RouteRegister interface {
Post(string, ...macaron.Handler) Post(string, ...macaron.Handler)
Delete(string, ...macaron.Handler) Delete(string, ...macaron.Handler)
Put(string, ...macaron.Handler) Put(string, ...macaron.Handler)
Patch(string, ...macaron.Handler)
Any(string, ...macaron.Handler)
Group(string, func(RouteRegister), ...macaron.Handler) Group(string, func(RouteRegister), ...macaron.Handler)
Register(Router) Register(Router) *macaron.Router
} }
func newRouteRegister() RouteRegister { func newRouteRegister() RouteRegister {
@ -53,17 +55,22 @@ func (rr *routeRegister) Group(pattern string, fn func(rr RouteRegister), handle
rr.groups = append(rr.groups, group) rr.groups = append(rr.groups, group)
} }
func (rr *routeRegister) Register(router Router) { func (rr *routeRegister) Register(router Router) *macaron.Router {
for _, r := range rr.routes { for _, r := range rr.routes {
router.Route(r.pattern, r.method, r.handlers...) router.Handle(r.method, r.pattern, r.handlers)
} }
for _, g := range rr.groups { for _, g := range rr.groups {
g.Register(router) g.Register(router)
} }
return &macaron.Router{}
} }
func (rr *routeRegister) route(pattern, method string, handlers ...macaron.Handler) { func (rr *routeRegister) route(pattern, method string, handlers ...macaron.Handler) {
//inject metrics
//inject tracing
rr.routes = append(rr.routes, route{ rr.routes = append(rr.routes, route{
method: method, method: method,
pattern: rr.prefix + pattern, pattern: rr.prefix + pattern,
@ -86,3 +93,11 @@ func (rr *routeRegister) Delete(pattern string, handlers ...macaron.Handler) {
func (rr *routeRegister) Put(pattern string, handlers ...macaron.Handler) { func (rr *routeRegister) Put(pattern string, handlers ...macaron.Handler) {
rr.route(pattern, http.MethodPut, handlers...) rr.route(pattern, http.MethodPut, handlers...)
} }
func (rr *routeRegister) Patch(pattern string, handlers ...macaron.Handler) {
rr.route(pattern, http.MethodPatch, handlers...)
}
func (rr *routeRegister) Any(pattern string, handlers ...macaron.Handler) {
rr.route(pattern, "*", handlers...)
}

4
pkg/api/route_register_test.go
View File

@ -11,12 +11,14 @@ type fakeRouter struct {
route []route route []route
} }
func (fr *fakeRouter) Route(pattern, method string, handlers ...macaron.Handler) { func (fr *fakeRouter) Handle(method, pattern string, handlers []macaron.Handler) *macaron.Route {
fr.route = append(fr.route, route{ fr.route = append(fr.route, route{
pattern: pattern, pattern: pattern,
method: method, method: method,
handlers: handlers, handlers: handlers,
}) })
return &macaron.Route{}
} }
func emptyHandlers(n int) []macaron.Handler { func emptyHandlers(n int) []macaron.Handler {