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

[v10.3.x] RBAC: Clean up data source permissions after data source deletion (#80723)

Browse Source 
RBAC: Clean up data source permissions after data source deletion (#80654)

* clean up data source permissions after data source deletion

* remove a comment

(cherry picked from commit def1b05a93)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-01-17 15:47:37 +02:00
committed by GitHub
co-authored by Ieva
parent 22d91ddb0b
commit 21e1008976
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
-1
View File
@@ -283,7 +283,6 @@ func (e DatasourcePermissionsService) SetPermissions(ctx context.Context, orgID
}
func (e DatasourcePermissionsService) DeleteResourcePermissions(ctx context.Context, orgID int64, resourceID string) error {
// TODO: implement
return nil
}
pkg/services/datasources/service/datasource.go
+5 -1
View File
@@ -273,7 +273,11 @@ func (s *Service) DeleteDataSource(ctx context.Context, cmd *datasources.DeleteD
return s.SecretsStore.Del(ctx, cmd.OrgID, cmd.Name, kvstore.DataSourceSecretType)
}
return s.SQLStore.DeleteDataSource(ctx, cmd)
if err := s.SQLStore.DeleteDataSource(ctx, cmd); err != nil {
return err
}
return s.permissionsService.DeleteResourcePermissions(ctx, cmd.OrgID, cmd.UID)
})
}