From 96384b51819f18ee40487cea2f549a44e79d10a3 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Tue, 8 Oct 2024 15:14:23 +0200 Subject: [PATCH] CloudMigrations: cover cases where library panel has no folder (#94405) --- .../cloudmigrationimpl/cloudmigration_test.go | 1 + .../cloudmigration/cloudmigrationimpl/snapshot_mgmt.go | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go index 5787a5156a1..74944e407fe 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go @@ -672,6 +672,7 @@ func TestGetParentNames(t *testing.T) { }, libraryElements: []libraryElement{ {UID: "libraryElementUID-0", FolderUID: &libraryElementFolderUID}, + {UID: "libraryElementUID-1"}, }, expectedDashParentNames: []string{"", "Folder A", "Folder B"}, expectedFoldParentNames: []string{"Folder A"}, diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go b/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go index 45f6eefc74a..5c9df830110 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/snapshot_mgmt.go @@ -588,7 +588,9 @@ func (s *Service) getParentNames(ctx context.Context, signedInUser *user.SignedI parentFolderUIDsSet[f.ParentUID] = struct{}{} } for _, libraryElement := range libraryElements { - parentFolderUIDsSet[*libraryElement.FolderUID] = struct{}{} + if libraryElement.FolderUID != nil { + parentFolderUIDsSet[*libraryElement.FolderUID] = struct{}{} + } } parentFolderUIDsSlice := make([]string, 0, len(parentFolderUIDsSet)) for parentFolderUID := range parentFolderUIDsSet { @@ -610,7 +612,9 @@ func (s *Service) getParentNames(ctx context.Context, signedInUser *user.SignedI parentNamesByType[cloudmigration.FolderDataType][f.UID] = foldersUIDsToFolderName[f.ParentUID] } for _, libraryElement := range libraryElements { - parentNamesByType[cloudmigration.LibraryElementDataType][libraryElement.UID] = foldersUIDsToFolderName[*libraryElement.FolderUID] + if libraryElement.FolderUID != nil { + parentNamesByType[cloudmigration.LibraryElementDataType][libraryElement.UID] = foldersUIDsToFolderName[*libraryElement.FolderUID] + } } return parentNamesByType, err