From 402345ac08d9cd14c955118fc8aea402de885af9 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Wed, 25 Jan 2023 11:52:01 -0800 Subject: [PATCH] Chore: Fix dashboard service after refactor (#62153) merge refactoring sequence --- pkg/services/store/k8saccess/dashboard_service.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/services/store/k8saccess/dashboard_service.go b/pkg/services/store/k8saccess/dashboard_service.go index de1f93429ef6..ba8347a0077a 100644 --- a/pkg/services/store/k8saccess/dashboard_service.go +++ b/pkg/services/store/k8saccess/dashboard_service.go @@ -6,6 +6,7 @@ import ( "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/dashboards" + "github.com/grafana/grafana/pkg/services/folder" "github.com/grafana/grafana/pkg/services/store/entity" ) @@ -35,31 +36,31 @@ func (s *k8sDashboardService) FindDashboards(ctx context.Context, query *models. return s.orig.FindDashboards(ctx, query) } -func (s *k8sDashboardService) GetDashboard(ctx context.Context, query *dashboards.GetDashboardQuery) error { +func (s *k8sDashboardService) GetDashboard(ctx context.Context, query *dashboards.GetDashboardQuery) (*dashboards.Dashboard, error) { return s.orig.GetDashboard(ctx, query) } -func (s *k8sDashboardService) GetDashboardACLInfoList(ctx context.Context, query *dashboards.GetDashboardACLInfoListQuery) error { +func (s *k8sDashboardService) GetDashboardACLInfoList(ctx context.Context, query *dashboards.GetDashboardACLInfoListQuery) ([]*dashboards.DashboardACLInfoDTO, error) { return s.orig.GetDashboardACLInfoList(ctx, query) } -func (s *k8sDashboardService) GetDashboards(ctx context.Context, query *dashboards.GetDashboardsQuery) error { +func (s *k8sDashboardService) GetDashboards(ctx context.Context, query *dashboards.GetDashboardsQuery) ([]*dashboards.Dashboard, error) { return s.orig.GetDashboards(ctx, query) } -func (s *k8sDashboardService) GetDashboardTags(ctx context.Context, query *dashboards.GetDashboardTagsQuery) error { +func (s *k8sDashboardService) GetDashboardTags(ctx context.Context, query *dashboards.GetDashboardTagsQuery) ([]*dashboards.DashboardTagCloudItem, error) { return s.orig.GetDashboardTags(ctx, query) } -func (s *k8sDashboardService) GetDashboardUIDByID(ctx context.Context, query *dashboards.GetDashboardRefByIDQuery) error { +func (s *k8sDashboardService) GetDashboardUIDByID(ctx context.Context, query *dashboards.GetDashboardRefByIDQuery) (*dashboards.DashboardRef, error) { return s.orig.GetDashboardUIDByID(ctx, query) } -func (s *k8sDashboardService) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error { +func (s *k8sDashboardService) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *folder.HasAdminPermissionInDashboardsOrFoldersQuery) (bool, error) { return s.orig.HasAdminPermissionInDashboardsOrFolders(ctx, query) } -func (s *k8sDashboardService) HasEditPermissionInFolders(ctx context.Context, query *models.HasEditPermissionInFoldersQuery) error { +func (s *k8sDashboardService) HasEditPermissionInFolders(ctx context.Context, query *folder.HasEditPermissionInFoldersQuery) (bool, error) { return s.orig.HasEditPermissionInFolders(ctx, query) }