Chore: Add CloudWatch HTTP API tests (#29691)

* CloudWatch: Add HTTP API tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/api/api.go

@@ -232,7 +232,7 @@ func (hs *HTTPServer) registerRoutes() {
 
 		// orgs (admin routes)
 		apiRoute.Group("/orgs/name/:name", func(orgsRoute routing.RouteRegister) {
-			orgsRoute.Get("/", Wrap(GetOrgByName))
+			orgsRoute.Get("/", Wrap(hs.GetOrgByName))
 		}, reqGrafanaAdmin)
 
 		// auth api keys

pkg/api/http_server.go

@@ -15,6 +15,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/search"
 	"github.com/grafana/grafana/pkg/services/shorturls"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
 
 	"github.com/grafana/grafana/pkg/plugins/backendplugin"
 
@@ -77,6 +78,7 @@ type HTTPServer struct {
 	ShortURLService      *shorturls.ShortURLService       `inject:""`
 	Live                 *live.GrafanaLive                `inject:""`
 	ContextHandler       *contexthandler.ContextHandler   `inject:""`
+	SQLStore             *sqlstore.SQLStore               `inject:""`
 	Listener             net.Listener
 }
 

pkg/api/metrics.go

@@ -47,7 +47,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricReq
 		if i == 0 && !hasExpr {
 			ds, err = hs.DatasourceCache.GetDatasource(datasourceID, c.SignedInUser, c.SkipCache)
 			if err != nil {
-				hs.log.Debug("Encountered error getting data source", "err", err)
+				hs.log.Debug("Encountered error getting data source", "err", err, "id", datasourceID)
 				if errors.Is(err, models.ErrDataSourceAccessDenied) {
 					return Error(403, "Access denied to data source", err)
 				}

pkg/api/org.go

@@ -22,16 +22,15 @@ func GetOrgByID(c *models.ReqContext) Response {
 }
 
 // Get /api/orgs/name/:name
-func GetOrgByName(c *models.ReqContext) Response {
-	query := models.GetOrgByNameQuery{Name: c.Params(":name")}
-	if err := bus.Dispatch(&query); err != nil {
+func (hs *HTTPServer) GetOrgByName(c *models.ReqContext) Response {
+	org, err := hs.SQLStore.GetOrgByName(c.Params(":name"))
+	if err != nil {
 		if errors.Is(err, models.ErrOrgNotFound) {
 			return Error(404, "Organization not found", err)
 		}
 
 		return Error(500, "Failed to get organization", err)
 	}
-	org := query.Result
 	result := models.OrgDetailsDTO{
 		Id:   org.Id,
 		Name: org.Name,

pkg/api/routing/route_register.go

@@ -43,6 +43,9 @@ type RouteRegister interface {
 	// Register iterates over all routes added to the RouteRegister
 	// and add them to the `Router` pass as an parameter.
 	Register(Router)
+
+	// Reset resets the route register.
+	Reset()
 }
 
 type RegisterNamedMiddleware func(name string) macaron.Handler
@@ -71,6 +74,16 @@ type routeRegister struct {
 	groups          []*routeRegister
 }
 
+func (rr *routeRegister) Reset() {
+	if rr == nil {
+		return
+	}
+
+	rr.routes = nil
+	rr.groups = nil
+	rr.subfixHandlers = nil
+}
+
 func (rr *routeRegister) Insert(pattern string, fn func(RouteRegister), handlers ...macaron.Handler) {
 	// loop over all groups at current level
 	for _, g := range rr.groups {