opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 14:42:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

CloudMigrations: cover cases where library panel has no folder (#94405)

Browse Source
This commit is contained in:
Matheus Macabu
2024-10-08 15:14:23 +02:00
committed by GitHub
parent ee65f89533
commit 96384b5181
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go
View File

@ -672,6 +672,7 @@ func TestGetParentNames(t *testing.T) {
}, },
libraryElements: []libraryElement{ libraryElements: []libraryElement{
{UID: "libraryElementUID-0", FolderUID: &libraryElementFolderUID}, {UID: "libraryElementUID-0", FolderUID: &libraryElementFolderUID},
{UID: "libraryElementUID-1"},
}, },
expectedDashParentNames: []string{"", "Folder A", "Folder B"}, expectedDashParentNames: []string{"", "Folder A", "Folder B"},
expectedFoldParentNames: []string{"Folder A"}, expectedFoldParentNames: []string{"Folder A"},

4
pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go
View File

@ -588,8 +588,10 @@ func (s *Service) getParentNames(ctx context.Context, signedInUser *user.SignedI
parentFolderUIDsSet[f.ParentUID] = struct{}{} parentFolderUIDsSet[f.ParentUID] = struct{}{}
} }
for _, libraryElement := range libraryElements { for _, libraryElement := range libraryElements {
if libraryElement.FolderUID != nil {
parentFolderUIDsSet[*libraryElement.FolderUID] = struct{}{} parentFolderUIDsSet[*libraryElement.FolderUID] = struct{}{}
} }
}
parentFolderUIDsSlice := make([]string, 0, len(parentFolderUIDsSet)) parentFolderUIDsSlice := make([]string, 0, len(parentFolderUIDsSet))
for parentFolderUID := range parentFolderUIDsSet { for parentFolderUID := range parentFolderUIDsSet {
parentFolderUIDsSlice = append(parentFolderUIDsSlice, parentFolderUID) parentFolderUIDsSlice = append(parentFolderUIDsSlice, parentFolderUID)
@ -610,8 +612,10 @@ func (s *Service) getParentNames(ctx context.Context, signedInUser *user.SignedI
parentNamesByType[cloudmigration.FolderDataType][f.UID] = foldersUIDsToFolderName[f.ParentUID] parentNamesByType[cloudmigration.FolderDataType][f.UID] = foldersUIDsToFolderName[f.ParentUID]
} }
for _, libraryElement := range libraryElements { for _, libraryElement := range libraryElements {
if libraryElement.FolderUID != nil {
parentNamesByType[cloudmigration.LibraryElementDataType][libraryElement.UID] = foldersUIDsToFolderName[*libraryElement.FolderUID] parentNamesByType[cloudmigration.LibraryElementDataType][libraryElement.UID] = foldersUIDsToFolderName[*libraryElement.FolderUID]
} }
}
return parentNamesByType, err return parentNamesByType, err
} }