Let WalkAll use coredata collection slice types

WalkAll now accepts loaders and callbacks typed as S ~[]T so
exports can use AuditLogEntries and SCIMEvents directly. Pass the
trimmed page slice to walk, not the over-fetched loader result.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
Cursor Agent
2026-07-29 20:40:40 +00:00
parent bff06a3c6d
commit 0132bc78bd
3 changed files with 39 additions and 11 deletions

View File

@@ -95,7 +95,7 @@ func (s *LogExportService) streamAuditLogCSV(
Field: coredata.AuditLogEntryOrderFieldCreatedAt,
Direction: page.OrderDirectionAsc,
},
func(ctx context.Context, cursor *page.Cursor[coredata.AuditLogEntryOrderField]) ([]*coredata.AuditLogEntry, error) {
func(ctx context.Context, cursor *page.Cursor[coredata.AuditLogEntryOrderField]) (coredata.AuditLogEntries, error) {
var logs coredata.AuditLogEntries
if err := logs.LoadByOrganizationID(
ctx,
@@ -110,8 +110,7 @@ func (s *LogExportService) streamAuditLogCSV(
return logs, nil
},
func(pageEntries []*coredata.AuditLogEntry) error {
entries := coredata.AuditLogEntries(pageEntries)
func(entries coredata.AuditLogEntries) error {
actorsByID, err := loadAuditLogActorExportInfo(ctx, conn, entries)
if err != nil {
return err
@@ -154,7 +153,7 @@ func (s *LogExportService) streamSCIMEventCSV(
Field: coredata.SCIMEventOrderFieldCreatedAt,
Direction: page.OrderDirectionAsc,
},
func(ctx context.Context, cursor *page.Cursor[coredata.SCIMEventOrderField]) ([]*coredata.SCIMEvent, error) {
func(ctx context.Context, cursor *page.Cursor[coredata.SCIMEventOrderField]) (coredata.SCIMEvents, error) {
var events coredata.SCIMEvents
if err := events.LoadByOrganizationID(
ctx,
@@ -169,8 +168,7 @@ func (s *LogExportService) streamSCIMEventCSV(
return events, nil
},
func(pageEvents []*coredata.SCIMEvent) error {
events := coredata.SCIMEvents(pageEvents)
func(events coredata.SCIMEvents) error {
profilesByUserName, err := loadSCIMProfileExportInfo(
ctx,
conn,

View File

@@ -38,14 +38,18 @@ const MaxLoadAllPages = 20
// LoadBy* on a fresh receiver).
type Loader[T Paginable[U], U OrderField] func(ctx context.Context, cursor *Cursor[U]) ([]T, error)
// WalkLoader is like Loader but allows coredata collection types (e.g.
// AuditLogEntries) whose underlying type is []T.
type WalkLoader[T Paginable[U], U OrderField, S ~[]T] func(ctx context.Context, cursor *Cursor[U]) (S, error)
// WalkAll walks every matching row via keyset pagination, advancing a
// MaxCursorSize forward cursor until no rows remain, and invokes walk with
// every page of rows. Unlike LoadAll, it does not apply MaxLoadAllPages.
func WalkAll[T Paginable[U], U OrderField](
func WalkAll[T Paginable[U], U OrderField, S ~[]T](
ctx context.Context,
orderBy OrderBy[U],
fetch Loader[T, U],
walk func(rows []T) error,
fetch WalkLoader[T, U, S],
walk func(rows S) error,
) error {
var key *CursorKey
@@ -57,8 +61,8 @@ func WalkAll[T Paginable[U], U OrderField](
return fmt.Errorf("cannot load all rows: %w", err)
}
p := NewPage(rows, cursor)
if err := walk(p.Data); err != nil {
p := NewPage([]T(rows), cursor)
if err := walk(S(p.Data)); err != nil {
return err
}

View File

@@ -212,3 +212,29 @@ func TestWalkAllHasNoPageCap(t *testing.T) {
assert.Equal(t, loadAllValues(store), loadAllValues(got))
assert.Greater(t, fetchs, MaxLoadAllPages)
}
type loadAllItems []*loadAllItem
func TestWalkAllNamedSliceType(t *testing.T) {
t.Parallel()
store := newLoadAllStore(MaxCursorSize + 1)
var got loadAllItems
err := WalkAll(
context.Background(),
ascOrderBy(),
func(_ context.Context, cursor *Cursor[testOrderField]) (loadAllItems, error) {
return loadAllItems(keysetPage(store, cursor)), nil
},
func(rows loadAllItems) error {
got = append(got, rows...)
return nil
},
)
require.NoError(t, err)
require.Len(t, got, len(store))
assert.Equal(t, loadAllValues(store), loadAllValues(got))
}