mirror of
https://github.com/grafana/grafana.git
synced 2026-08-14 07:04:57 -05:00
Dashboard Alert Extractor: Create service for dashboard extractor and remove bus (#45518)
* Create DashAlertService service * Remove no used dashboard service from plugin's manager that generates dependency cycle in Enterprise * Remove bus for dashboard permissions * Remove bus from dashboard extractor service * Add missing argument * Fix wire * Fix lint * More goimports * Use datasource service instead sql calls * Fix integration test
This commit is contained in:
@@ -15,6 +15,7 @@ import (
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
"github.com/grafana/grafana/pkg/services/accesscontrol"
|
||||
"github.com/grafana/grafana/pkg/services/datasources"
|
||||
"github.com/grafana/grafana/pkg/services/datasources/permissions"
|
||||
"github.com/grafana/grafana/pkg/services/sqlstore/mockstore"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -29,7 +30,7 @@ const (
|
||||
|
||||
func TestDataSourcesProxy_userLoggedIn(t *testing.T) {
|
||||
mockSQLStore := mockstore.NewSQLStoreMock()
|
||||
mockDatasourcePermissionService := newMockDatasourcePermissionService()
|
||||
mockDatasourcePermissionService := permissions.NewMockDatasourcePermissionService()
|
||||
loggedInUserScenario(t, "When calling GET on", "/api/datasources/", "/api/datasources/", func(sc *scenarioContext) {
|
||||
// Stubs the database query
|
||||
ds := []*models.DataSource{
|
||||
@@ -38,7 +39,7 @@ func TestDataSourcesProxy_userLoggedIn(t *testing.T) {
|
||||
{Name: "BBB"},
|
||||
{Name: "aaa"},
|
||||
}
|
||||
mockDatasourcePermissionService.dsResult = ds
|
||||
mockDatasourcePermissionService.DsResult = ds
|
||||
|
||||
// handler func being tested
|
||||
hs := &HTTPServer{
|
||||
@@ -209,8 +210,8 @@ func TestAPI_Datasources_AccessControl(t *testing.T) {
|
||||
dsServiceMock := &dataSourcesServiceMock{
|
||||
expectedDatasource: &testDatasource,
|
||||
}
|
||||
dsPermissionService := newMockDatasourcePermissionService()
|
||||
dsPermissionService.dsResult = []*models.DataSource{
|
||||
dsPermissionService := permissions.NewMockDatasourcePermissionService()
|
||||
dsPermissionService.DsResult = []*models.DataSource{
|
||||
&testDatasource,
|
||||
}
|
||||
|
||||
@@ -505,9 +506,9 @@ func TestAPI_Datasources_AccessControl(t *testing.T) {
|
||||
// mock sqlStore and datasource permission service
|
||||
dsServiceMock.expectedError = test.expectedSQLError
|
||||
dsServiceMock.expectedDatasource = test.expectedDS
|
||||
dsPermissionService.dsResult = []*models.DataSource{test.expectedDS}
|
||||
dsPermissionService.DsResult = []*models.DataSource{test.expectedDS}
|
||||
if test.expectedDS == nil {
|
||||
dsPermissionService.dsResult = nil
|
||||
dsPermissionService.DsResult = nil
|
||||
}
|
||||
hs.DataSourcesService = dsServiceMock
|
||||
hs.DatasourcePermissionsService = dsPermissionService
|
||||
|
||||
Reference in New Issue
Block a user