Chore: Remove bus from admin (#44920)

* Chore: Remove bus from admin

* fix test

Co-authored-by: Ying WANG <ying.wang@grafana.com>

pkg/api/admin.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/models"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/setting"
@@ -19,10 +18,10 @@ func (hs *HTTPServer) AdminGetSettings(c *models.ReqContext) response.Response {
 	return response.JSON(http.StatusOK, settings)
 }
 
-func AdminGetStats(c *models.ReqContext) response.Response {
+func (hs *HTTPServer) AdminGetStats(c *models.ReqContext) response.Response {
 	statsQuery := models.GetAdminStatsQuery{}
 
-	if err := bus.Dispatch(c.Req.Context(), &statsQuery); err != nil {
+	if err := hs.SQLStore.GetAdminStats(c.Req.Context(), &statsQuery); err != nil {
 		return response.Error(500, "Failed to get admin stats from database", err)
 	}
 

pkg/api/admin_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/sqlstore/mockstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/stretchr/testify/assert"
 )
@@ -147,6 +148,7 @@ func TestAdmin_AccessControl(t *testing.T) {
 			sc, hs := setupAccessControlScenarioContext(t, cfg, test.url, test.permissions)
 			sc.resp = httptest.NewRecorder()
 			hs.SettingsProvider = &setting.OSSImpl{Cfg: cfg}
+			hs.SQLStore = mockstore.NewSQLStoreMock()
 
 			var err error
 			sc.req, err = http.NewRequest(test.method, test.url, nil)

pkg/api/api.go

@@ -463,7 +463,7 @@ func (hs *HTTPServer) registerRoutes() {
 		if hs.Features.IsEnabled(featuremgmt.FlagShowFeatureFlagsInUI) {
 			adminRoute.Get("/settings/features", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), hs.Features.HandleGetSettings)
 		}
-		adminRoute.Get("/stats", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionServerStatsRead)), routing.Wrap(AdminGetStats))
+		adminRoute.Get("/stats", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionServerStatsRead)), routing.Wrap(hs.AdminGetStats))
 		adminRoute.Post("/pause-all-alerts", reqGrafanaAdmin, routing.Wrap(hs.PauseAllAlerts))
 
 		if hs.ThumbService != nil {

pkg/services/sqlstore/mockstore/mockstore.go

@@ -23,6 +23,10 @@ func NewSQLStoreMock() *SQLStoreMock {
 	return &SQLStoreMock{}
 }
 
+func (m *SQLStoreMock) GetAdminStats(ctx context.Context, query *models.GetAdminStatsQuery) error {
+	return m.ExpectedError
+}
+
 func (m *SQLStoreMock) DeleteExpiredSnapshots(ctx context.Context, cmd *models.DeleteExpiredSnapshotsCommand) error {
 	return m.ExpectedError
 }

pkg/services/sqlstore/sqlstore.go

@@ -115,6 +115,7 @@ func newSQLStore(cfg *setting.Cfg, cacheService *localcache.CacheService, b bus.
 	ss.Bus.SetTransactionManager(ss)
 
 	// Register handlers
+	ss.addStatsQueryAndCommandHandlers()
 	ss.addUserQueryAndCommandHandlers()
 	ss.addAlertNotificationUidByIdHandler()
 	ss.addPreferencesQueryAndCommandHandlers()

pkg/services/sqlstore/stats.go

@@ -13,11 +13,14 @@ func init() {
 	bus.AddHandler("sql", GetSystemStats)
 	bus.AddHandler("sql", GetDataSourceStats)
 	bus.AddHandler("sql", GetDataSourceAccessStats)
-	bus.AddHandler("sql", GetAdminStats)
 	bus.AddHandler("sql", GetAlertNotifiersUsageStats)
 	bus.AddHandler("sql", GetSystemUserCountStats)
 }
 
+func (ss *SQLStore) addStatsQueryAndCommandHandlers() {
+	bus.AddHandler("sql", ss.GetAdminStats)
+}
+
 const activeUserTimeLimit = time.Hour * 24 * 30
 const dailyActiveUserTimeLimit = time.Hour * 24
 
@@ -141,7 +144,7 @@ func viewersPermissionsCounterSQL(statName string, isFolder bool, permission mod
 	) AS ` + statName + `, `
 }
 
-func GetAdminStats(ctx context.Context, query *models.GetAdminStatsQuery) error {
+func (ss *SQLStore) GetAdminStats(ctx context.Context, query *models.GetAdminStatsQuery) error {
 	now := time.Now()
 	activeEndDate := now.Add(-activeUserTimeLimit)
 	dailyActiveEndDate := now.Add(-dailyActiveUserTimeLimit)

pkg/services/sqlstore/stats_integration_test.go

@@ -12,9 +12,9 @@ import (
 )
 
 func TestIntegration_GetAdminStats(t *testing.T) {
-	InitTestDB(t)
+	sqlStore := InitTestDB(t)
 
 	query := models.GetAdminStatsQuery{}
-	err := GetAdminStats(context.Background(), &query)
+	err := sqlStore.GetAdminStats(context.Background(), &query)
 	require.NoError(t, err)
 }

pkg/services/sqlstore/stats_test.go

@@ -56,7 +56,7 @@ func TestStatsDataAccess(t *testing.T) {
 
 	t.Run("Get admin stats should not result in error", func(t *testing.T) {
 		query := models.GetAdminStatsQuery{}
-		err := GetAdminStats(context.Background(), &query)
+		err := sqlStore.GetAdminStats(context.Background(), &query)
 		assert.NoError(t, err)
 	})
 }

pkg/services/sqlstore/store.go

@@ -8,6 +8,7 @@ import (
 )
 
 type Store interface {
+	GetAdminStats(ctx context.Context, query *models.GetAdminStatsQuery) error
 	DeleteExpiredSnapshots(ctx context.Context, cmd *models.DeleteExpiredSnapshotsCommand) error
 	CreateDashboardSnapshot(ctx context.Context, cmd *models.CreateDashboardSnapshotCommand) error
 	DeleteDashboardSnapshot(ctx context.Context, cmd *models.DeleteDashboardSnapshotCommand) error