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

Unified storage bugfix legacy folders getting first page (#109554)

Browse Source 
* When creating a new continue token, it defaults to page 1. Also use constants for default limit and page number.

* Update tests for continue token.

* When listing legacy folders, the continue token will have all paging info in it. Simplifies paging logic and fixes bug when limit not specified.

* Adds regression test to ensure default page limit is enforced.

* remove test comment
This commit is contained in:
owensmallwood
2025-08-13 08:50:28 -06:00
committed by GitHub
parent 8134919536
commit 384ec28dfd
4 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/folders/continue_test.go
+5 -5
View File
@@ -10,15 +10,15 @@ import (
func TestContinueToken(t *testing.T) {
token, err := readContinueToken(&internalversion.ListOptions{})
require.NoError(t, err)
require.Equal(t, int64(100), token.limit)
require.Equal(t, int64(0), token.page)
require.Equal(t, int64(defaultPageLimit), token.limit)
require.Equal(t, int64(defaultPageNumber), token.page)
next := token.GetNextPageToken()
require.Equal(t, "MTAwfDE=", next)
require.Equal(t, "MTAwfDI=", next)
token, err = readContinueToken(&internalversion.ListOptions{Continue: next})
require.NoError(t, err)
require.Equal(t, int64(100), token.limit)
require.Equal(t, int64(1), token.page) // <<< +1
require.Equal(t, int64(defaultPageLimit), token.limit)
require.Equal(t, int64(defaultPageNumber+1), token.page) // <<< +1
// Error if the limit has changed
_, err = readContinueToken(&internalversion.ListOptions{Continue: next, Limit: 50})