diff --git a/pkg/identityserver/application_access.go b/pkg/identityserver/application_access.go index 53948552c3..646b1de405 100644 --- a/pkg/identityserver/application_access.go +++ b/pkg/identityserver/application_access.go @@ -125,7 +125,7 @@ func (is *IdentityServer) listApplicationAPIKeys( } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -398,7 +398,7 @@ func (is *IdentityServer) listApplicationCollaborators( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/application_registry.go b/pkg/identityserver/application_registry.go index fde1ffe7fd..43629a84f6 100644 --- a/pkg/identityserver/application_registry.go +++ b/pkg/identityserver/application_registry.go @@ -230,7 +230,7 @@ func (is *IdentityServer) listApplications( // nolint:gocyclo } ctx = store.WithOrder(ctx, req.Order) var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/client_access.go b/pkg/identityserver/client_access.go index fe6d9e0fa0..c6e868f6d9 100644 --- a/pkg/identityserver/client_access.go +++ b/pkg/identityserver/client_access.go @@ -203,7 +203,7 @@ func (is *IdentityServer) listClientCollaborators( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/client_registry.go b/pkg/identityserver/client_registry.go index d82c3b9e5e..d7a6c5fcc3 100644 --- a/pkg/identityserver/client_registry.go +++ b/pkg/identityserver/client_registry.go @@ -249,7 +249,7 @@ func (is *IdentityServer) listClients( ctx = store.WithOrder(ctx, req.Order) var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/end_device_registry.go b/pkg/identityserver/end_device_registry.go index 26538ad815..be42026c1b 100644 --- a/pkg/identityserver/end_device_registry.go +++ b/pkg/identityserver/end_device_registry.go @@ -312,7 +312,7 @@ func (is *IdentityServer) listEndDevices(ctx context.Context, req *ttnpb.ListEnd } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/gateway_access.go b/pkg/identityserver/gateway_access.go index 7e737a0fd1..cf04b142dc 100644 --- a/pkg/identityserver/gateway_access.go +++ b/pkg/identityserver/gateway_access.go @@ -121,7 +121,7 @@ func (is *IdentityServer) listGatewayAPIKeys( } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -389,7 +389,7 @@ func (is *IdentityServer) listGatewayCollaborators( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/gateway_registry.go b/pkg/identityserver/gateway_registry.go index 14dcec63fd..7e6fc199e5 100644 --- a/pkg/identityserver/gateway_registry.go +++ b/pkg/identityserver/gateway_registry.go @@ -406,7 +406,7 @@ func (is *IdentityServer) listGateways( // nolint:gocyclo ctx = store.WithOrder(ctx, req.Order) var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/invitation_registry.go b/pkg/identityserver/invitation_registry.go index ccbcbf47d6..a17f11a368 100644 --- a/pkg/identityserver/invitation_registry.go +++ b/pkg/identityserver/invitation_registry.go @@ -88,7 +88,7 @@ func (is *IdentityServer) listInvitations(ctx context.Context, req *ttnpb.ListIn return nil, errNoInviteRights.New() } var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/notification_registry.go b/pkg/identityserver/notification_registry.go index 89889d6955..e0c2fc13c4 100644 --- a/pkg/identityserver/notification_registry.go +++ b/pkg/identityserver/notification_registry.go @@ -340,7 +340,7 @@ func (is *IdentityServer) listNotifications(ctx context.Context, req *ttnpb.List res := &ttnpb.ListNotificationsResponse{} err := is.store.Transact(ctx, func(ctx context.Context, st store.Store) (err error) { var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/oauth_registry.go b/pkg/identityserver/oauth_registry.go index f1af58fdfe..c1c5a3d4c2 100644 --- a/pkg/identityserver/oauth_registry.go +++ b/pkg/identityserver/oauth_registry.go @@ -30,7 +30,7 @@ func (is *IdentityServer) listOAuthClientAuthorizations(ctx context.Context, req } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -60,7 +60,7 @@ func (is *IdentityServer) listOAuthAccessTokens(ctx context.Context, req *ttnpb. } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/organization_access.go b/pkg/identityserver/organization_access.go index a8e79c3dba..b57ea1c5e8 100644 --- a/pkg/identityserver/organization_access.go +++ b/pkg/identityserver/organization_access.go @@ -129,7 +129,7 @@ func (is *IdentityServer) listOrganizationAPIKeys( } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -402,7 +402,7 @@ func (is *IdentityServer) listOrganizationCollaborators( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/organization_registry.go b/pkg/identityserver/organization_registry.go index 1445363fb5..cf889e1f31 100644 --- a/pkg/identityserver/organization_registry.go +++ b/pkg/identityserver/organization_registry.go @@ -203,7 +203,7 @@ func (is *IdentityServer) listOrganizations( ctx = store.WithOrder(ctx, req.Order) var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/registry_search.go b/pkg/identityserver/registry_search.go index 2fb871b0a7..988b195a97 100644 --- a/pkg/identityserver/registry_search.go +++ b/pkg/identityserver/registry_search.go @@ -73,7 +73,7 @@ func (rs *registrySearch) SearchApplications( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -101,7 +101,7 @@ func (rs *registrySearch) SearchApplications( return err } } - ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindApplications). + ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.Pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindApplications). res.Applications, err = st.FindApplications(ctx, entityIDs, req.FieldMask.GetPaths()) if err != nil { return err @@ -176,7 +176,7 @@ func (rs *registrySearch) SearchClients( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -204,7 +204,7 @@ func (rs *registrySearch) SearchClients( return err } } - ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindClients). + ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.Pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindClients). res.Clients, err = st.FindClients(ctx, entityIDs, req.FieldMask.GetPaths()) if err != nil { return err @@ -282,7 +282,7 @@ func (rs *registrySearch) SearchGateways( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -310,7 +310,7 @@ func (rs *registrySearch) SearchGateways( return err } } - ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindGateways). + ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.Pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindGateways). res.Gateways, err = st.FindGateways(ctx, entityIDs, req.FieldMask.GetPaths()) if err != nil { return err @@ -391,7 +391,7 @@ func (rs *registrySearch) SearchOrganizations( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -419,7 +419,7 @@ func (rs *registrySearch) SearchOrganizations( return err } } - ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindOrganizations). + ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.Pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindOrganizations). res.Organizations, err = st.FindOrganizations(ctx, entityIDs, req.FieldMask.GetPaths()) if err != nil { return err @@ -492,7 +492,7 @@ func (rs *registrySearch) SearchUsers( ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -516,7 +516,7 @@ func (rs *registrySearch) SearchUsers( if len(ids) == 0 { return nil } - ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindUsers). + ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.Pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindUsers). res.Users, err = st.FindUsers(ctx, ids, req.FieldMask.GetPaths()) if err != nil { return err @@ -560,7 +560,7 @@ func (rs *registrySearch) SearchAccounts( // Limit the number of results to 10. var total uint64 - ctx = store.WithPagination(ctx, 10, 1, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, 10, 1, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -606,7 +606,7 @@ func (rs *registrySearch) SearchEndDevices(ctx context.Context, req *ttnpb.Searc ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, rs.IdentityServer.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) @@ -622,7 +622,7 @@ func (rs *registrySearch) SearchEndDevices(ctx context.Context, req *ttnpb.Searc if len(ids) == 0 { return nil } - ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindEndDevices). + ctx = store.WithPagination(ctx, 0, 0, nil, rs.IdentityServer.config.Pagination.DefaultLimit) // Reset pagination (already done in EntitySearch.FindEndDevices). res.EndDevices, err = st.FindEndDevices(ctx, ids, req.FieldMask.GetPaths()) if err != nil { return err diff --git a/pkg/identityserver/user_access.go b/pkg/identityserver/user_access.go index 131ab78b13..2b3d6997b0 100644 --- a/pkg/identityserver/user_access.go +++ b/pkg/identityserver/user_access.go @@ -106,7 +106,7 @@ func (is *IdentityServer) listUserAPIKeys( } ctx = store.WithOrder(ctx, req.Order) var total uint64 - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/user_bookmark_registry.go b/pkg/identityserver/user_bookmark_registry.go index ced8180b99..8510d34ba2 100644 --- a/pkg/identityserver/user_bookmark_registry.go +++ b/pkg/identityserver/user_bookmark_registry.go @@ -55,7 +55,7 @@ func (is *IdentityServer) listUserBookmarks( var total uint64 ctx = store.WithOrder(ctx, req.Order) - ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + ctx = store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/user_registry.go b/pkg/identityserver/user_registry.go index 36724922b2..db4df3cd87 100644 --- a/pkg/identityserver/user_registry.go +++ b/pkg/identityserver/user_registry.go @@ -351,7 +351,7 @@ func (is *IdentityServer) listUsers(ctx context.Context, req *ttnpb.ListUsersReq } ctx = store.WithOrder(ctx, req.Order) var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total) diff --git a/pkg/identityserver/user_session_registry.go b/pkg/identityserver/user_session_registry.go index 8eaf2206ff..bd71a1e0db 100644 --- a/pkg/identityserver/user_session_registry.go +++ b/pkg/identityserver/user_session_registry.go @@ -29,7 +29,7 @@ func (is *IdentityServer) listUserSessions(ctx context.Context, req *ttnpb.ListU } ctx = store.WithOrder(ctx, req.Order) var total uint64 - paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.pagination.DefaultLimit) + paginateCtx := store.WithPagination(ctx, req.Limit, req.Page, &total, is.config.Pagination.DefaultLimit) defer func() { if err == nil { setTotalHeader(ctx, total)