dashboards: revert adding api for retrieving uid by slug

Since we're already have possibility to get a dashboard by slug
it makes little sense to have a separate endpoint in api for
retrieving uid by slug.
#7883

pkg/api/api.go

@@ -245,7 +245,6 @@ func (hs *HttpServer) registerRoutes() {
 			dashboardRoute.Get("/uid/:uid", wrap(GetDashboard))
 
 			dashboardRoute.Get("/db/:slug", wrap(GetDashboard))
-			dashboardRoute.Get("/db/:slug/uid", wrap(GetDashboardUidBySlug))
 			dashboardRoute.Delete("/db/:slug", reqEditorRole, wrap(DeleteDashboard))
 
 			dashboardRoute.Post("/calculate-diff", bind(dtos.CalculateDiffOptions{}), wrap(CalculateDashboardDiff))

pkg/api/dashboard.go

@@ -119,21 +119,6 @@ func GetDashboard(c *middleware.Context) Response {
 	return Json(200, dto)
 }
 
-func GetDashboardUidBySlug(c *middleware.Context) Response {
-	dash, rsp := getDashboardHelper(c.OrgId, c.Params(":slug"), 0, "")
-	if rsp != nil {
-		return rsp
-	}
-
-	guardian := guardian.NewDashboardGuardian(dash.Id, c.OrgId, c.SignedInUser)
-	if canView, err := guardian.CanView(); err != nil || !canView {
-		fmt.Printf("%v", err)
-		return dashboardGuardianResponse(err)
-	}
-
-	return Json(200, util.DynMap{"uid": dash.Uid})
-}
-
 func getUserLogin(userId int64) string {
 	query := m.GetUserByIdQuery{Id: userId}
 	err := bus.Dispatch(&query)

pkg/api/dashboard_test.go

@@ -47,11 +47,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 			return nil
 		})
 
-		bus.AddHandler("test", func(query *m.GetDashboardUidBySlugQuery) error {
-			query.Result = fakeDash.Uid
-			return nil
-		})
-
 		viewerRole := m.ROLE_VIEWER
 		editorRole := m.ROLE_EDITOR
 
@@ -109,14 +104,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				uid := GetDashboardUidBySlugShouldReturn200(sc)
-
-				Convey("Should return uid", func() {
-					So(uid, ShouldEqual, fakeDash.Uid)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 403)
@@ -173,14 +160,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				uid := GetDashboardUidBySlugShouldReturn200(sc)
-
-				Convey("Should return uid", func() {
-					So(uid, ShouldEqual, fakeDash.Uid)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 200)
@@ -262,11 +241,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 			return nil
 		})
 
-		bus.AddHandler("test", func(query *m.GetDashboardUidBySlugQuery) error {
-			query.Result = fakeDash.Uid
-			return nil
-		})
-
 		bus.AddHandler("test", func(query *m.GetTeamsByUserQuery) error {
 			query.Result = []*m.Team{}
 			return nil
@@ -310,14 +284,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				CallGetDashboardUidBySlug(sc)
-
-				Convey("Should be denied access", func() {
-					So(sc.resp.Code, ShouldEqual, 403)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 403)
@@ -372,14 +338,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				CallGetDashboardUidBySlug(sc)
-
-				Convey("Should be denied access", func() {
-					So(sc.resp.Code, ShouldEqual, 403)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 403)
@@ -445,14 +403,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				uid := GetDashboardUidBySlugShouldReturn200(sc)
-
-				Convey("Should return uid", func() {
-					So(uid, ShouldEqual, fakeDash.Uid)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 200)
@@ -524,14 +474,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				uid := GetDashboardUidBySlugShouldReturn200(sc)
-
-				Convey("Should return uid", func() {
-					So(uid, ShouldEqual, fakeDash.Uid)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 403)
@@ -582,14 +524,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				uid := GetDashboardUidBySlugShouldReturn200(sc)
-
-				Convey("Should return uid", func() {
-					So(uid, ShouldEqual, fakeDash.Uid)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 200)
@@ -658,14 +592,6 @@ func TestDashboardApiEndpoint(t *testing.T) {
 				})
 			})
 
-			loggedInUserScenarioWithRole("When calling GET on", "GET", "/api/dashboards/db/child-dash/uid", "/api/dashboards/db/:slug/uid", role, func(sc *scenarioContext) {
-				uid := GetDashboardUidBySlugShouldReturn200(sc)
-
-				Convey("Should return uid", func() {
-					So(uid, ShouldEqual, fakeDash.Uid)
-				})
-			})
-
 			loggedInUserScenarioWithRole("When calling DELETE on", "DELETE", "/api/dashboards/db/child-dash", "/api/dashboards/db/:slug", role, func(sc *scenarioContext) {
 				CallDeleteDashboard(sc)
 				So(sc.resp.Code, ShouldEqual, 403)
@@ -706,20 +632,6 @@ func GetDashboardShouldReturn200(sc *scenarioContext) dtos.DashboardFullWithMeta
 	return dash
 }
 
-func GetDashboardUidBySlugShouldReturn200(sc *scenarioContext) string {
-	CallGetDashboardUidBySlug(sc)
-
-	So(sc.resp.Code, ShouldEqual, 200)
-
-	result := sc.ToJson()
-	return result.Get("uid").MustString()
-}
-
-func CallGetDashboardUidBySlug(sc *scenarioContext) {
-	sc.handlerFunc = GetDashboardUidBySlug
-	sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
-}
-
 func CallGetDashboardVersion(sc *scenarioContext) {
 	bus.AddHandler("test", func(query *m.GetDashboardVersionQuery) error {
 		query.Result = &m.DashboardVersion{}

pkg/models/dashboards.go

@@ -231,9 +231,3 @@ type GetDashboardSlugByIdQuery struct {
 	Id     int64
 	Result string
 }
-
-type GetDashboardUidBySlugQuery struct {
-	OrgId  int64
-	Slug   string
-	Result string
-}