Skip to content

Commit 42e7ec9

Browse files
ryantxuryantxu
authored
Chore: cleanup dashboard service names (grafana#64442)
1 parent 39a4634 commit 42e7ec9

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

‎pkg/api/dashboard_permission_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
4646
Cfg: settings,
4747
SQLStore: mockSQLStore,
4848
Features: features,
49-
DashboardService: dashboardservice.ProvideDashboardService(
49+
DashboardService: dashboardservice.ProvideDashboardServiceImpl(
5050
settings, dashboardStore, foldertest.NewFakeFolderStore(t), nil, features, folderPermissions, dashboardPermissions, ac,
5151
folderSvc,
5252
),

‎pkg/api/dashboard_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
986986
cfg, dashboardStore, folderStore, db.InitTestDB(t), featuremgmt.WithFeatures())
987987

988988
if dashboardService == nil {
989-
dashboardService = service.ProvideDashboardService(
989+
dashboardService = service.ProvideDashboardServiceImpl(
990990
cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
991991
ac, folderSvc,
992992
)
@@ -999,7 +999,7 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
999999
SQLStore: sc.sqlStore,
10001000
ProvisioningService: provisioningService,
10011001
AccessControl: accesscontrolmock.New(),
1002-
dashboardProvisioningService: service.ProvideDashboardService(
1002+
dashboardProvisioningService: service.ProvideDashboardServiceImpl(
10031003
cfg, dashboardStore, folderStore, nil, features, folderPermissions, dashboardPermissions,
10041004
ac, folderSvc,
10051005
),

‎pkg/api/folder_permission_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
4444
folderService: folderService,
4545
folderPermissionsService: folderPermissions,
4646
dashboardPermissionsService: dashboardPermissions,
47-
DashboardService: service.ProvideDashboardService(
47+
DashboardService: service.ProvideDashboardServiceImpl(
4848
settings, dashboardStore, foldertest.NewFakeFolderStore(t), nil, features, folderPermissions, dashboardPermissions, ac,
4949
folderService,
5050
),

‎pkg/cmd/grafana-cli/runner/wire.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ var wireSet = wire.NewSet(
251251
teamguardianDatabase.ProvideTeamGuardianStore,
252252
wire.Bind(new(teamguardian.Store), new(*teamguardianDatabase.TeamGuardianStoreImpl)),
253253
teamguardianManager.ProvideService,
254-
dashboardservice.ProvideDashboardService, //DashboardServiceImpl
254+
dashboardservice.ProvideDashboardServiceImpl,
255255
dashboardstore.ProvideDashboardStore,
256-
dashboardservice.ProvideSimpleDashboardService,
256+
dashboardservice.ProvideDashboardService,
257257
dashboardservice.ProvideDashboardProvisioningService,
258258
dashboardservice.ProvideDashboardPluginService,
259259
folderimpl.ProvideDashboardFolderStore,

‎pkg/server/wire.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,13 @@ var wireBasicSet = wire.NewSet(
290290
teamguardianManager.ProvideService,
291291
featuremgmt.ProvideManagerService,
292292
featuremgmt.ProvideToggles,
293-
dashboardservice.ProvideDashboardService, // DashboardServiceImpl
293+
dashboardservice.ProvideDashboardServiceImpl,
294+
dashboardservice.ProvideDashboardService,
295+
dashboardservice.ProvideDashboardProvisioningService,
296+
dashboardservice.ProvideDashboardPluginService,
294297
dashboardstore.ProvideDashboardStore,
295298
folderimpl.ProvideService,
296299
folderimpl.ProvideDashboardFolderStore,
297-
dashboardservice.ProvideSimpleDashboardService,
298-
dashboardservice.ProvideDashboardProvisioningService,
299-
dashboardservice.ProvideDashboardPluginService,
300300
wire.Bind(new(folder.FolderStore), new(*folderimpl.DashboardFolderStoreImpl)),
301301
dashboardimportservice.ProvideService,
302302
wire.Bind(new(dashboardimport.Service), new(*dashboardimportservice.ImportDashboardService)),

‎pkg/services/dashboards/service/dashboard_service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type DashboardServiceImpl struct {
5050
}
5151

5252
// This is the uber service that implements a three smaller services
53-
func ProvideDashboardService(
53+
func ProvideDashboardServiceImpl(
5454
cfg *setting.Cfg, dashboardStore dashboards.Store, folderStore folder.FolderStore, dashAlertExtractor alerting.DashAlertExtractor,
5555
features featuremgmt.FeatureToggles, folderPermissionsService accesscontrol.FolderPermissionsService,
5656
dashboardPermissionsService accesscontrol.DashboardPermissionsService, ac accesscontrol.AccessControl,

‎pkg/services/dashboards/service/dashboard_service_integration_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ func permissionScenario(t *testing.T, desc string, canSave bool, fn permissionSc
828828
dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
829829
require.NoError(t, err)
830830
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
831-
service := ProvideDashboardService(
831+
service := ProvideDashboardServiceImpl(
832832
cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
833833
featuremgmt.WithFeatures(),
834834
accesscontrolmock.NewMockedPermissionsService(),
@@ -889,7 +889,7 @@ func callSaveWithResult(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSt
889889
dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
890890
require.NoError(t, err)
891891
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
892-
service := ProvideDashboardService(
892+
service := ProvideDashboardServiceImpl(
893893
cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
894894
featuremgmt.WithFeatures(),
895895
accesscontrolmock.NewMockedPermissionsService(),
@@ -912,7 +912,7 @@ func callSaveWithError(t *testing.T, cmd dashboards.SaveDashboardCommand, sqlSto
912912
dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
913913
require.NoError(t, err)
914914
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
915-
service := ProvideDashboardService(
915+
service := ProvideDashboardServiceImpl(
916916
cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
917917
featuremgmt.WithFeatures(),
918918
accesscontrolmock.NewMockedPermissionsService(),
@@ -953,7 +953,7 @@ func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, sqlSto
953953
dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
954954
require.NoError(t, err)
955955
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
956-
service := ProvideDashboardService(
956+
service := ProvideDashboardServiceImpl(
957957
cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
958958
featuremgmt.WithFeatures(),
959959
accesscontrolmock.NewMockedPermissionsService(),
@@ -995,7 +995,7 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore db.DB) *da
995995
dashboardStore, err := database.ProvideDashboardStore(sqlStore, cfg, featuremgmt.WithFeatures(), tagimpl.ProvideService(sqlStore, cfg), quotaService)
996996
require.NoError(t, err)
997997
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
998-
service := ProvideDashboardService(
998+
service := ProvideDashboardServiceImpl(
999999
cfg, dashboardStore, folderStore, &dummyDashAlertExtractor{},
10001000
featuremgmt.WithFeatures(),
10011001
accesscontrolmock.NewMockedPermissionsService(),

‎pkg/services/dashboards/service/service.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"github.com/grafana/grafana/pkg/services/featuremgmt"
66
)
77

8-
func ProvideSimpleDashboardService(
8+
func ProvideDashboardService(
99
features featuremgmt.FeatureToggles,
10-
svc *DashboardServiceImpl,
10+
orig *DashboardServiceImpl,
1111
) dashboards.DashboardService {
12-
return svc
12+
return orig
1313
}
1414

1515
func ProvideDashboardProvisioningService(

‎pkg/services/libraryelements/libraryelements_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func createDashboard(t *testing.T, sqlStore db.DB, user user.SignedInUser, dash
295295
folderPermissions := acmock.NewMockedPermissionsService()
296296
dashboardPermissions := acmock.NewMockedPermissionsService()
297297
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
298-
service := dashboardservice.ProvideDashboardService(
298+
service := dashboardservice.ProvideDashboardServiceImpl(
299299
cfg, dashboardStore, folderStore, dashAlertExtractor,
300300
features, folderPermissions, dashboardPermissions, ac,
301301
foldertest.NewFakeService(),
@@ -441,7 +441,7 @@ func testScenario(t *testing.T, desc string, fn func(t *testing.T, sc scenarioCo
441441
folderPermissions := acmock.NewMockedPermissionsService()
442442
dashboardPermissions := acmock.NewMockedPermissionsService()
443443
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
444-
dashboardService := dashboardservice.ProvideDashboardService(
444+
dashboardService := dashboardservice.ProvideDashboardServiceImpl(
445445
sqlStore.Cfg, dashboardStore, folderStore, nil,
446446
features, folderPermissions, dashboardPermissions, ac,
447447
foldertest.NewFakeService(),

‎pkg/services/librarypanels/librarypanels_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ func createDashboard(t *testing.T, sqlStore db.DB, user *user.SignedInUser, dash
707707
dashAlertService := alerting.ProvideDashAlertExtractorService(nil, nil, nil)
708708
ac := acmock.New()
709709
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
710-
service := dashboardservice.ProvideDashboardService(
710+
service := dashboardservice.ProvideDashboardServiceImpl(
711711
cfg, dashboardStore, folderStore, dashAlertService,
712712
featuremgmt.WithFeatures(), acmock.NewMockedPermissionsService(), acmock.NewMockedPermissionsService(), ac,
713713
foldertest.NewFakeService(),

‎pkg/services/ngalert/tests/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func SetupTestEnv(tb testing.TB, baseInterval time.Duration) (*ngalert.AlertNG,
8181

8282
folderStore := folderimpl.ProvideDashboardFolderStore(sqlStore)
8383

84-
dashboardService := dashboardservice.ProvideDashboardService(
84+
dashboardService := dashboardservice.ProvideDashboardServiceImpl(
8585
cfg, dashboardStore, folderStore, nil,
8686
features, folderPermissions, dashboardPermissions, ac,
8787
foldertest.NewFakeService(),

0 commit comments

Comments
 (0)