public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access Control: Clean up permissions for deprovisioned data sources (#88483)

Browse Source 
* make sure that DS permissions get correctly cleaned up when a DS is deleted through provisioning

* don't attempt to delete a DS if it's not found

* fixes for tests

* fix ds tests

* rename DS service used by DS provisioner to BaseDataSourceService to avoid confusions with the full DS service
This commit is contained in:
Ieva
2024-06-03 16:19:53 +03:00
committed by GitHub
parent f204dd5bf1
commit c16f502ec5
7 changed files with 90 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/mock/service_mock.go
+1 -1
View File
@@ -46,7 +46,7 @@ func (m *MockPermissionsService) SetPermissions(ctx context.Context, orgID int64
func (m *MockPermissionsService) DeleteResourcePermissions(ctx context.Context, orgID int64, resourceID string) error {
mockedArgs := m.Called(ctx, orgID, resourceID)
return mockedArgs.Error(1)
return mockedArgs.Error(0)
}
func (m *MockPermissionsService) MapActions(permission accesscontrol.ResourcePermission) string {