From cc2e352c03d903ed72c113ba11428d0ca35b3392 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 10 May 2023 14:20:50 +0100 Subject: [PATCH] [v10.0.x] Folders: return an error when listing folders if permission guardian returns an error (#68224) Folders: return an error when listing folders if permission guardian returns an error (#68109) return an error when listing folders if perm gaurdian returns an error (cherry picked from commit e51b92991d6efa40456924f7572fb69d35c8989c) Co-authored-by: Ieva --- pkg/services/folder/folderimpl/folder.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go index 83a84bc9ea9..279821885da 100644 --- a/pkg/services/folder/folderimpl/folder.go +++ b/pkg/services/folder/folderimpl/folder.go @@ -183,7 +183,10 @@ func (s *Service) GetChildren(ctx context.Context, cmd *folder.GetChildrenQuery) return nil, err } canView, err := g.CanView() - if err != nil || canView { + if err != nil { + return nil, err + } + if canView { // always expose the dashboard store sequential ID f.ID = dashFolder.ID filtered = append(filtered, f)