From 7871052899a2f08ccdafa84c006b3c10d060fe42 Mon Sep 17 00:00:00 2001 From: Ieva Date: Mon, 5 Jun 2023 15:47:22 +0100 Subject: [PATCH] RBAC: remove unused code (#69470) remove unused code --- .../datasources/permissions/datasource_permissions.go | 6 ------ .../datasources/permissions/datasource_permissions_mocks.go | 5 ----- 2 files changed, 11 deletions(-) diff --git a/pkg/services/datasources/permissions/datasource_permissions.go b/pkg/services/datasources/permissions/datasource_permissions.go index 257264b342f..20e59772ea0 100644 --- a/pkg/services/datasources/permissions/datasource_permissions.go +++ b/pkg/services/datasources/permissions/datasource_permissions.go @@ -5,14 +5,12 @@ import ( "errors" "github.com/grafana/grafana/pkg/services/datasources" - "github.com/grafana/grafana/pkg/services/user" ) var ErrNotImplemented = errors.New("not implemented") type DatasourcePermissionsService interface { FilterDatasourcesBasedOnQueryPermissions(ctx context.Context, cmd *datasources.DatasourcesPermissionFilterQuery) ([]*datasources.DataSource, error) - FilterDatasourceUidsBasedOnQueryPermissions(ctx context.Context, user *user.SignedInUser, datasourceUids []string) ([]string, error) } // dummy method @@ -20,10 +18,6 @@ func (hs *OSSDatasourcePermissionsService) FilterDatasourcesBasedOnQueryPermissi return nil, ErrNotImplemented } -func (hs *OSSDatasourcePermissionsService) FilterDatasourceUidsBasedOnQueryPermissions(ctx context.Context, user *user.SignedInUser, datasourceUids []string) ([]string, error) { - return nil, ErrNotImplemented -} - type OSSDatasourcePermissionsService struct{} func ProvideDatasourcePermissionsService() *OSSDatasourcePermissionsService { diff --git a/pkg/services/datasources/permissions/datasource_permissions_mocks.go b/pkg/services/datasources/permissions/datasource_permissions_mocks.go index f4838ffe36f..73b527b3446 100644 --- a/pkg/services/datasources/permissions/datasource_permissions_mocks.go +++ b/pkg/services/datasources/permissions/datasource_permissions_mocks.go @@ -4,7 +4,6 @@ import ( "context" "github.com/grafana/grafana/pkg/services/datasources" - "github.com/grafana/grafana/pkg/services/user" ) type mockDatasourcePermissionService struct { @@ -13,10 +12,6 @@ type mockDatasourcePermissionService struct { ErrResult error } -func (m *mockDatasourcePermissionService) FilterDatasourceUidsBasedOnQueryPermissions(ctx context.Context, user *user.SignedInUser, datasourceUids []string) ([]string, error) { - return m.DsUidResult, m.ErrResult -} - func (m *mockDatasourcePermissionService) FilterDatasourcesBasedOnQueryPermissions(ctx context.Context, cmd *datasources.DatasourcesPermissionFilterQuery) ([]*datasources.DataSource, error) { return m.DsResult, m.ErrResult }