Skip to content

Commit

Permalink
is: Fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryaplots
ryaplots committed Oct 15, 2024
1 parent 56c1cdd commit 0c4a94a
Show file tree
Hide file tree
Showing 19 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions pkg/identityserver/application_access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 128 in pkg/identityserver/application_access.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down Expand Up @@ -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)

Check failure on line 401 in pkg/identityserver/application_access.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/application_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 233 in pkg/identityserver/application_registry.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/client_access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 206 in pkg/identityserver/client_access.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/client_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 252 in pkg/identityserver/client_registry.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
10 changes: 5 additions & 5 deletions pkg/identityserver/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ import (
)

// Config for the Identity Server.

type Pagination struct {
DefaultLimit uint32 `name:"default-limit" description:"The default limit applied to paginated requests if not specified"`
}
type Config struct {
DatabaseURI string `name:"database-uri" description:"Database connection URI"`
UserRegistration struct {
Expand Down Expand Up @@ -125,7 +121,11 @@ type Config struct {
TenantID string `name:"tenant-id" description:"Tenant ID"`
} `name:"network"`
TelemetryQueue telemetry.TaskQueue `name:"-"`
Pagination Pagination `name:"pagination" description:"Pagination settings"`
Pagination pagination `name:"pagination" description:"Pagination settings"`
}

type pagination struct {
DefaultLimit uint32 `name:"default-limit" description:"The default limit applied to paginated requests if not specified"`
}

type emailTemplatesConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/end_device_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 315 in pkg/identityserver/end_device_registry.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
4 changes: 2 additions & 2 deletions pkg/identityserver/gateway_access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 124 in pkg/identityserver/gateway_access.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down Expand Up @@ -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)

Check failure on line 392 in pkg/identityserver/gateway_access.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/gateway_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 409 in pkg/identityserver/gateway_registry.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/invitation_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 91 in pkg/identityserver/invitation_registry.go

View workflow job for this annotation

GitHub Actions / Tests 

is.config.pagination undefined (type *Config has no field or method pagination, but does have Pagination)
defer func() {
if err == nil {
setTotalHeader(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/notification_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/identityserver/oauth_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/identityserver/organization_access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/organization_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions pkg/identityserver/registry_search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/identityserver/store/pagination_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestPagination(t *testing.T) {

a, ctx := test.New(t)

limit, offset := LimitAndOffsetFromContext(WithPagination(ctx, tc.limit, tc.page, nil))
limit, offset := LimitAndOffsetFromContext(WithPagination(ctx, tc.limit, tc.page, nil, 10))

a.So(limit, should.Equal, tc.expectedLimit)
a.So(offset, should.Equal, tc.expectedOffset)
Expand All @@ -77,7 +77,7 @@ func TestPagination(t *testing.T) {
SetTotal(ctx, total)
a.So(totalCount, should.BeZeroValue)

ctx = WithPagination(ctx, 5, 1, &totalCount)
ctx = WithPagination(ctx, 5, 1, &totalCount, 10)
a.So(totalCount, should.BeZeroValue)

SetTotal(ctx, total)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/user_access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/user_bookmark_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/user_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/identityserver/user_session_registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0c4a94a

Please sign in to comment.