IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Replace short UID generation with more standard UUIDs (#62731)

Browse Source
This commit is contained in:
Ryan McKinley
2023-02-06 17:44:37 -08:00
committed by GitHub
parent ee2e294b4e
commit b1e58eb47e
11 changed files with 64 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/folder/folderimpl/folder.go
View File

@@ -805,9 +805,5 @@ func toFolderError(err error) error {
return dashboards.ErrFolderNotFound
}
if errors.Is(err, dashboards.ErrDashboardFailedGenerateUniqueUid) {
err = dashboards.ErrFolderFailedGenerateUniqueUid
}
return err
}

1
pkg/services/folder/folderimpl/folder_test.go
View File

@@ -300,7 +300,6 @@ func TestIntegrationFolderService(t *testing.T) {
{ActualError: dashboards.ErrDashboardWithSameUIDExists, ExpectedError: dashboards.ErrFolderWithSameUIDExists},
{ActualError: dashboards.ErrDashboardVersionMismatch, ExpectedError: dashboards.ErrFolderVersionMismatch},
{ActualError: dashboards.ErrDashboardNotFound, ExpectedError: dashboards.ErrFolderNotFound},
{ActualError: dashboards.ErrDashboardFailedGenerateUniqueUid, ExpectedError: dashboards.ErrFolderFailedGenerateUniqueUid},
{ActualError: dashboards.ErrDashboardInvalidUid, ExpectedError: dashboards.ErrDashboardInvalidUid},
}