public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release-12.0.1] Dashboards and Folders: cleanup timestamps and error codes (#104720)

Browse Source 
K8s: Fix timestamps and error codes
This commit is contained in:
Stephanie Hingtgen
2025-04-29 13:44:44 -06:00
committed by GitHub
parent 18a9cd3636
commit 249bf8ac64
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/folder/folderimpl/folder_unifiedstorage_test.go
+23 -5
View File
@@ -54,6 +54,24 @@ func (r rcp) GetRestConfig(ctx context.Context) (*clientrest.Config, error) {
}, nil
}
func compareFoldersNormalizeTime(t *testing.T, expected, actual *folder.Folder) {
require.Equal(t, expected.Title, actual.Title)
require.Equal(t, expected.UID, actual.UID)
require.Equal(t, expected.OrgID, actual.OrgID)
require.Equal(t, expected.URL, actual.URL)
require.Equal(t, expected.Fullpath, actual.Fullpath)
require.Equal(t, expected.FullpathUIDs, actual.FullpathUIDs)
require.Equal(t, expected.CreatedByUID, actual.CreatedByUID)
require.Equal(t, expected.UpdatedByUID, actual.UpdatedByUID)
require.Equal(t, expected.ParentUID, actual.ParentUID)
require.Equal(t, expected.Description, actual.Description)
require.Equal(t, expected.HasACL, actual.HasACL)
require.Equal(t, expected.Version, actual.Version)
require.Equal(t, expected.ManagedBy, actual.ManagedBy)
require.Equal(t, expected.Created.Local(), actual.Created.Local())
require.Equal(t, expected.Updated.Local(), actual.Updated.Local())
}
func TestIntegrationFolderServiceViaUnifiedStorage(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
@@ -313,7 +331,7 @@ func TestIntegrationFolderServiceViaUnifiedStorage(t *testing.T) {
SignedInUser: usr,
})
require.NoError(t, err)
require.Equal(t, f, actualFolder)
compareFoldersNormalizeTime(t, f, actualFolder)
})
t.Run("When creating folder should return error if uid is general", func(t *testing.T) {
@@ -403,8 +421,8 @@ func TestIntegrationFolderServiceViaUnifiedStorage(t *testing.T) {
OrgID: fooFolder.OrgID,
SignedInUser: usr,
})
require.Equal(t, fooFolder, actual)
require.NoError(t, err)
compareFoldersNormalizeTime(t, fooFolder, actual)
})
t.Run("When get folder by uid and uid is general should return the root folder object", func(t *testing.T) {
@@ -437,8 +455,8 @@ func TestIntegrationFolderServiceViaUnifiedStorage(t *testing.T) {
}
actual, err := folderService.Get(context.Background(), query)
require.Equal(t, fooFolder, actual)
require.NoError(t, err)
compareFoldersNormalizeTime(t, fooFolder, actual)
})
t.Run("When get folder by non existing ID should return not found error", func(t *testing.T) {
@@ -471,8 +489,8 @@ func TestIntegrationFolderServiceViaUnifiedStorage(t *testing.T) {
}
actual, err := folderService.Get(context.Background(), query)
require.Equal(t, fooFolder, actual)
require.NoError(t, err)
compareFoldersNormalizeTime(t, fooFolder, actual)
})
t.Run("When get folder by non existing Title should return not found error", func(t *testing.T) {
@@ -847,7 +865,7 @@ func TestGetFoldersFromApiServer(t *testing.T) {
CreatedByUID: ":0",
UpdatedByUID: ":0",
}
require.Equal(t, expectedResult, result)
compareFoldersNormalizeTime(t, expectedResult, result)
fakeK8sClient.AssertExpectations(t)
})
}