Annotations: Fix annotations scope resolver (#102612)

* Fix annotations scope resolver

pkg/api/annotations.go

@@ -633,6 +633,7 @@ func AnnotationTypeScopeResolver(annotationsRepo annotations.Repository, feature
 		if annotation.DashboardID == 0 {
 			return []string{accesscontrol.ScopeAnnotationsTypeOrganization}, nil
 		} else {
+			return identity.WithServiceIdentityFn(ctx, orgID, func(ctx context.Context) ([]string, error) {
 				dashboard, err := dashSvc.GetDashboard(ctx, &dashboards.GetDashboardQuery{ID: annotation.DashboardID, OrgID: orgID})
 				if err != nil {
 					return nil, err
@@ -650,6 +651,7 @@ func AnnotationTypeScopeResolver(annotationsRepo annotations.Repository, feature
 					scopes = append(scopes, dashboards.ScopeFoldersProvider.GetResourceScopeUID(folder.GeneralFolderUID))
 				}
 				return scopes, nil
+			})
 		}
 	})
 }

pkg/api/annotations_test.go

@@ -436,8 +436,8 @@ func TestService_AnnotationTypeScopeResolver(t *testing.T) {
 	dashSvc := &dashboards.FakeDashboardService{}
 	rootDash := &dashboards.Dashboard{ID: 1, OrgID: 1, UID: rootDashUID}
 	folderDash := &dashboards.Dashboard{ID: 2, OrgID: 1, UID: folderDashUID, FolderUID: folderUID}
-	dashSvc.On("GetDashboard", context.Background(), &dashboards.GetDashboardQuery{ID: rootDash.ID, OrgID: 1}).Return(rootDash, nil)
+	dashSvc.On("GetDashboard", mock.Anything, &dashboards.GetDashboardQuery{ID: rootDash.ID, OrgID: 1}).Return(rootDash, nil)
-	dashSvc.On("GetDashboard", context.Background(), &dashboards.GetDashboardQuery{ID: folderDash.ID, OrgID: 1}).Return(folderDash, nil)
+	dashSvc.On("GetDashboard", mock.Anything, &dashboards.GetDashboardQuery{ID: folderDash.ID, OrgID: 1}).Return(folderDash, nil)
 
 	rootDashboardAnnotation := annotations.Item{ID: 1, DashboardID: rootDash.ID}
 	folderDashboardAnnotation := annotations.Item{ID: 3, DashboardID: folderDash.ID}