From 21e1008976195d9c13eac96833a4f23c067c0601 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:47:37 +0200 Subject: [PATCH] [v10.3.x] RBAC: Clean up data source permissions after data source deletion (#80723) 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 def1b05a939d2bdf5013a2bbb364b548652e5a73) Co-authored-by: Ieva --- .../accesscontrol/ossaccesscontrol/permissions_services.go | 1 - pkg/services/datasources/service/datasource.go | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go index 5c5725ac55f..aaa75e17cee 100644 --- a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go +++ b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go @@ -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 } diff --git a/pkg/services/datasources/service/datasource.go b/pkg/services/datasources/service/datasource.go index be9dc343378..9a0ec8c7932 100644 --- a/pkg/services/datasources/service/datasource.go +++ b/pkg/services/datasources/service/datasource.go @@ -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) }) }