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

* clean up data source permissions after data source deletion

* remove a comment
pull/80706/head
Ieva 1 year ago committed by GitHub
parent 4291bf4d69
commit def1b05a93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
  2. 6
      pkg/services/datasources/service/datasource.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
}

@ -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)
})
}

Loading…
Cancel
Save