Chore: Remove bus from health api (#44897)

* remove bus from health api

* fix health api tests

* use db health query as a method

* use pointer in sqlstore mock

pkg/services/sqlstore/health.go

@@ -3,17 +3,12 @@ package sqlstore
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/models"
 )
 
-func init() {
-	bus.AddHandler("sql", GetDBHealthQuery)
-}
-
 // GetDBHealthQuery executes a query to check
 // the availability of the database.
-func GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error {
+func (ss *SQLStore) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error {
 	return withDbSession(ctx, x, func(session *DBSession) error {
 		_, err := session.Exec("SELECT 1")
 		return err

pkg/services/sqlstore/health_test.go

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

pkg/services/sqlstore/mockstore/mockstore.go

@@ -584,3 +584,7 @@ func (m *SQLStoreMock) GetTempUserByCode(ctx context.Context, query *models.GetT
 func (m *SQLStoreMock) ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error {
 	return m.ExpectedError
 }
+
+func (m *SQLStoreMock) GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error {
+	return m.ExpectedError
+}

pkg/services/sqlstore/sqlstore.go

@@ -82,11 +82,11 @@ func ProvideServiceForTests(migrations registry.DatabaseMigrator) (*SQLStore, er
 	return initTestDB(migrations, InitTestDBOpt{EnsureDefaultOrgAndUser: true})
 }
 
-func newSQLStore(cfg *setting.Cfg, cacheService *localcache.CacheService, bus bus.Bus, engine *xorm.Engine,
+func newSQLStore(cfg *setting.Cfg, cacheService *localcache.CacheService, b bus.Bus, engine *xorm.Engine,
 	migrations registry.DatabaseMigrator, tracer tracing.Tracer, opts ...InitTestDBOpt) (*SQLStore, error) {
 	ss := &SQLStore{
 		Cfg:                         cfg,
-		Bus:                         bus,
+		Bus:                         b,
 		CacheService:                cacheService,
 		log:                         log.New("sqlstore"),
 		skipEnsureDefaultOrgAndUser: false,
@@ -133,6 +133,8 @@ func newSQLStore(cfg *setting.Cfg, cacheService *localcache.CacheService, bus bu
 	ss.addDashboardProvisioningQueryAndCommandHandlers()
 	ss.addOrgQueryAndCommandHandlers()
 
+	bus.AddHandler("sql", ss.GetDBHealthQuery)
+
 	// if err := ss.Reset(); err != nil {
 	// 	return nil, err
 	// }

pkg/services/sqlstore/store.go

@@ -147,4 +147,5 @@ type Store interface {
 	GetTempUsersQuery(ctx context.Context, query *models.GetTempUsersQuery) error
 	GetTempUserByCode(ctx context.Context, query *models.GetTempUserByCodeQuery) error
 	ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error
+	GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error
 }