From 2b3e50ebdd666b1c06c5e84bf3d2f9306f007a8d Mon Sep 17 00:00:00 2001 From: Jim Date: Mon, 5 Jun 2023 12:53:59 -0400 Subject: [PATCH] fix (listing): return all resources from listing requests (#3278) --- .../daemon/controller/handlers/accounts/account_service.go | 6 +++--- .../controller/handlers/authmethods/authmethod_service.go | 2 +- .../controller/handlers/authtokens/authtoken_service.go | 2 +- .../controller/handlers/credentials/credential_service.go | 2 +- .../handlers/credentialstores/credentialstore_service.go | 4 ++-- internal/daemon/controller/handlers/groups/group_service.go | 2 +- .../handlers/host_catalogs/host_catalog_service.go | 4 ++-- .../controller/handlers/host_sets/host_set_service.go | 3 ++- internal/daemon/controller/handlers/hosts/host_service.go | 2 +- .../handlers/managed_groups/managed_group_service.go | 4 ++-- internal/daemon/controller/handlers/roles/role_service.go | 2 +- internal/daemon/controller/handlers/scopes/scope_service.go | 2 +- .../daemon/controller/handlers/sessions/session_service.go | 2 +- internal/daemon/controller/handlers/users/user_service.go | 2 +- .../daemon/controller/handlers/workers/worker_service.go | 2 +- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/internal/daemon/controller/handlers/accounts/account_service.go b/internal/daemon/controller/handlers/accounts/account_service.go index 81667ca8ae..305b5b6f80 100644 --- a/internal/daemon/controller/handlers/accounts/account_service.go +++ b/internal/daemon/controller/handlers/accounts/account_service.go @@ -827,7 +827,7 @@ func (s Service) listFromRepo(ctx context.Context, authMethodId string) ([]auth. if err != nil { return nil, errors.Wrap(ctx, err, op) } - pwl, err := pwRepo.ListAccounts(ctx, authMethodId) + pwl, err := pwRepo.ListAccounts(ctx, authMethodId, password.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } @@ -839,7 +839,7 @@ func (s Service) listFromRepo(ctx context.Context, authMethodId string) ([]auth. if err != nil { return nil, errors.Wrap(ctx, err, op) } - oidcl, err := oidcRepo.ListAccounts(ctx, authMethodId) + oidcl, err := oidcRepo.ListAccounts(ctx, authMethodId, oidc.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } @@ -851,7 +851,7 @@ func (s Service) listFromRepo(ctx context.Context, authMethodId string) ([]auth. if err != nil { return nil, errors.Wrap(ctx, err, op) } - ldapList, err := ldapRepo.ListAccounts(ctx, authMethodId) + ldapList, err := ldapRepo.ListAccounts(ctx, authMethodId, ldap.WithLimit(ctx, -1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } diff --git a/internal/daemon/controller/handlers/authmethods/authmethod_service.go b/internal/daemon/controller/handlers/authmethods/authmethod_service.go index 6143d35c4b..231b4eea61 100644 --- a/internal/daemon/controller/handlers/authmethods/authmethod_service.go +++ b/internal/daemon/controller/handlers/authmethods/authmethod_service.go @@ -511,7 +511,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string, authResult if err != nil { return nil, errors.Wrap(ctx, err, op) } - ol, err := oidcRepo.ListAuthMethods(ctx, scopeIds, oidc.WithUnauthenticatedUser(reqCtx.UserId == globals.AnonymousUserId)) + ol, err := oidcRepo.ListAuthMethods(ctx, scopeIds, oidc.WithUnauthenticatedUser(reqCtx.UserId == globals.AnonymousUserId), oidc.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } diff --git a/internal/daemon/controller/handlers/authtokens/authtoken_service.go b/internal/daemon/controller/handlers/authtokens/authtoken_service.go index f1936628fe..410c857d74 100644 --- a/internal/daemon/controller/handlers/authtokens/authtoken_service.go +++ b/internal/daemon/controller/handlers/authtokens/authtoken_service.go @@ -267,7 +267,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]*authto if err != nil { return nil, err } - ul, err := repo.ListAuthTokens(ctx, scopeIds) + ul, err := repo.ListAuthTokens(ctx, scopeIds, authtoken.WithLimit(-1)) if err != nil { return nil, err } diff --git a/internal/daemon/controller/handlers/credentials/credential_service.go b/internal/daemon/controller/handlers/credentials/credential_service.go index 6e2ece318b..696e337aef 100644 --- a/internal/daemon/controller/handlers/credentials/credential_service.go +++ b/internal/daemon/controller/handlers/credentials/credential_service.go @@ -307,7 +307,7 @@ func (s Service) listFromRepo(ctx context.Context, storeId string) ([]credential if err != nil { return nil, errors.Wrap(ctx, err, op) } - up, err := repo.ListCredentials(ctx, storeId) + up, err := repo.ListCredentials(ctx, storeId, static.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } diff --git a/internal/daemon/controller/handlers/credentialstores/credentialstore_service.go b/internal/daemon/controller/handlers/credentialstores/credentialstore_service.go index 3c097d61c0..33ba832ec3 100644 --- a/internal/daemon/controller/handlers/credentialstores/credentialstore_service.go +++ b/internal/daemon/controller/handlers/credentialstores/credentialstore_service.go @@ -363,7 +363,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]credent if err != nil { return nil, errors.Wrap(ctx, err, op) } - vaultCsl, err := vaultRepo.ListCredentialStores(ctx, scopeIds) + vaultCsl, err := vaultRepo.ListCredentialStores(ctx, scopeIds, vault.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } @@ -372,7 +372,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]credent if err != nil { return nil, errors.Wrap(ctx, err, op) } - staticCsl, err := staticRepo.ListCredentialStores(ctx, scopeIds) + staticCsl, err := staticRepo.ListCredentialStores(ctx, scopeIds, static.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } diff --git a/internal/daemon/controller/handlers/groups/group_service.go b/internal/daemon/controller/handlers/groups/group_service.go index 6903c52f5e..ef7140413b 100644 --- a/internal/daemon/controller/handlers/groups/group_service.go +++ b/internal/daemon/controller/handlers/groups/group_service.go @@ -492,7 +492,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]*iam.Gr if err != nil { return nil, errors.Wrap(ctx, err, op) } - gl, err := repo.ListGroups(ctx, scopeIds) + gl, err := repo.ListGroups(ctx, scopeIds, iam.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } diff --git a/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go index 87a6d399d4..3e2e9cf8b5 100644 --- a/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go +++ b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go @@ -444,7 +444,7 @@ func (s Service) listFromRepo(ctx context.Context, projectIds []string) ([]host. if err != nil { return nil, nil, err } - ul, err := repo.ListCatalogs(ctx, projectIds) + ul, err := repo.ListCatalogs(ctx, projectIds, static.WithLimit(-1)) if err != nil { return nil, nil, err } @@ -456,7 +456,7 @@ func (s Service) listFromRepo(ctx context.Context, projectIds []string) ([]host. if err != nil { return nil, nil, err } - pl, plgs, err := pluginRepo.ListCatalogs(ctx, projectIds) + pl, plgs, err := pluginRepo.ListCatalogs(ctx, projectIds, host.WithLimit(-1)) if err != nil { return nil, nil, err } diff --git a/internal/daemon/controller/handlers/host_sets/host_set_service.go b/internal/daemon/controller/handlers/host_sets/host_set_service.go index be60ae2731..fae3f8c84d 100644 --- a/internal/daemon/controller/handlers/host_sets/host_set_service.go +++ b/internal/daemon/controller/handlers/host_sets/host_set_service.go @@ -633,7 +633,7 @@ func (s Service) listFromRepo(ctx context.Context, catalogId string, opt ...host if err != nil { return nil, nil, err } - sl, err := repo.ListSets(ctx, catalogId) + sl, err := repo.ListSets(ctx, catalogId, static.WithLimit(-1)) if err != nil { return nil, nil, errors.Wrap(ctx, err, op) } @@ -645,6 +645,7 @@ func (s Service) listFromRepo(ctx context.Context, catalogId string, opt ...host if err != nil { return nil, nil, err } + opt = append(opt, host.WithLimit(-1)) sl, hsplg, err := repo.ListSets(ctx, catalogId, opt...) if err != nil { return nil, nil, errors.Wrap(ctx, err, op) diff --git a/internal/daemon/controller/handlers/hosts/host_service.go b/internal/daemon/controller/handlers/hosts/host_service.go index f9d4140c22..9750afb814 100644 --- a/internal/daemon/controller/handlers/hosts/host_service.go +++ b/internal/daemon/controller/handlers/hosts/host_service.go @@ -418,7 +418,7 @@ func (s Service) listFromRepo(ctx context.Context, catalogId string) ([]host.Hos if err != nil { return nil, nil, err } - hl, err := repo.ListHosts(ctx, catalogId) + hl, err := repo.ListHosts(ctx, catalogId, static.WithLimit(-1)) if err != nil { return nil, nil, err } diff --git a/internal/daemon/controller/handlers/managed_groups/managed_group_service.go b/internal/daemon/controller/handlers/managed_groups/managed_group_service.go index e47f208243..cf9f0b7ea2 100644 --- a/internal/daemon/controller/handlers/managed_groups/managed_group_service.go +++ b/internal/daemon/controller/handlers/managed_groups/managed_group_service.go @@ -586,7 +586,7 @@ func (s Service) listFromRepo(ctx context.Context, authMethodId string) ([]auth. if err != nil { return nil, errors.Wrap(ctx, err, op) } - oidcl, err := oidcRepo.ListManagedGroups(ctx, authMethodId) + oidcl, err := oidcRepo.ListManagedGroups(ctx, authMethodId, oidc.WithLimit(-1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } @@ -598,7 +598,7 @@ func (s Service) listFromRepo(ctx context.Context, authMethodId string) ([]auth. if err != nil { return nil, errors.Wrap(ctx, err, op) } - oidcl, err := ldapRepo.ListManagedGroups(ctx, authMethodId) + oidcl, err := ldapRepo.ListManagedGroups(ctx, authMethodId, ldap.WithLimit(ctx, -1)) if err != nil { return nil, errors.Wrap(ctx, err, op) } diff --git a/internal/daemon/controller/handlers/roles/role_service.go b/internal/daemon/controller/handlers/roles/role_service.go index 09ffd0be5f..766a8e7f98 100644 --- a/internal/daemon/controller/handlers/roles/role_service.go +++ b/internal/daemon/controller/handlers/roles/role_service.go @@ -617,7 +617,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]*iam.Ro if err != nil { return nil, err } - rl, err := repo.ListRoles(ctx, scopeIds) + rl, err := repo.ListRoles(ctx, scopeIds, iam.WithLimit(-1)) if err != nil { return nil, err } diff --git a/internal/daemon/controller/handlers/scopes/scope_service.go b/internal/daemon/controller/handlers/scopes/scope_service.go index e2e1bc1a22..8a292b5436 100644 --- a/internal/daemon/controller/handlers/scopes/scope_service.go +++ b/internal/daemon/controller/handlers/scopes/scope_service.go @@ -666,7 +666,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]*iam.Sc if err != nil { return nil, err } - scps, err := repo.ListScopes(ctx, scopeIds) + scps, err := repo.ListScopes(ctx, scopeIds, iam.WithLimit(-1)) if err != nil { return nil, handlers.ApiErrorWithCodeAndMessage(codes.Internal, "Unable to list scopes: %v", err) } diff --git a/internal/daemon/controller/handlers/sessions/session_service.go b/internal/daemon/controller/handlers/sessions/session_service.go index 781317e1a3..50f48b429e 100644 --- a/internal/daemon/controller/handlers/sessions/session_service.go +++ b/internal/daemon/controller/handlers/sessions/session_service.go @@ -161,7 +161,7 @@ func (s Service) ListSessions(ctx context.Context, req *pbs.ListSessionsRequest) return nil, errors.Wrap(ctx, err, op) } - sesList, err := repo.ListSessions(ctx, session.WithTerminated(req.GetIncludeTerminated())) + sesList, err := repo.ListSessions(ctx, session.WithTerminated(req.GetIncludeTerminated()), session.WithLimit(-1)) if err != nil { return nil, err } diff --git a/internal/daemon/controller/handlers/users/user_service.go b/internal/daemon/controller/handlers/users/user_service.go index aa99711611..f27730af0e 100644 --- a/internal/daemon/controller/handlers/users/user_service.go +++ b/internal/daemon/controller/handlers/users/user_service.go @@ -492,7 +492,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]*iam.Us if err != nil { return nil, err } - ul, err := repo.ListUsers(ctx, scopeIds) + ul, err := repo.ListUsers(ctx, scopeIds, iam.WithLimit(-1)) if err != nil { return nil, err } diff --git a/internal/daemon/controller/handlers/workers/worker_service.go b/internal/daemon/controller/handlers/workers/worker_service.go index f211b07d8b..ea43ad2aa6 100644 --- a/internal/daemon/controller/handlers/workers/worker_service.go +++ b/internal/daemon/controller/handlers/workers/worker_service.go @@ -552,7 +552,7 @@ func (s Service) listFromRepo(ctx context.Context, scopeIds []string) ([]*server if err != nil { return nil, err } - wl, err := repo.ListWorkers(ctx, scopeIds, server.WithLiveness(-1)) + wl, err := repo.ListWorkers(ctx, scopeIds, server.WithLiveness(-1), server.WithLimit(-1)) if err != nil { return nil, err }