From b58555bc109529b0eee247374c6010bae36cfd47 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Thu, 14 Mar 2024 20:19:54 +0000 Subject: [PATCH] Fix missing info in pool list Without preloading the entity we're listing pools for, we don't get that info when listing pools for a repo/org/enterprise. Signed-off-by: Gabriel Adrian Samfira --- database/sql/enterprise.go | 2 +- database/sql/organizations.go | 2 +- database/sql/repositories.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database/sql/enterprise.go b/database/sql/enterprise.go index dc2629de..274201db 100644 --- a/database/sql/enterprise.go +++ b/database/sql/enterprise.go @@ -239,7 +239,7 @@ func (s *sqlDatabase) FindEnterprisePoolByTags(_ context.Context, enterpriseID s } func (s *sqlDatabase) ListEnterprisePools(ctx context.Context, enterpriseID string) ([]params.Pool, error) { - pools, err := s.listEntityPools(ctx, params.EnterprisePool, enterpriseID, "Tags", "Instances", "Instances.Job") + pools, err := s.listEntityPools(ctx, params.EnterprisePool, enterpriseID, "Tags", "Instances", "Enterprise") if err != nil { return nil, errors.Wrap(err, "fetching pools") } diff --git a/database/sql/organizations.go b/database/sql/organizations.go index 2fd2b5cf..2dee60b4 100644 --- a/database/sql/organizations.go +++ b/database/sql/organizations.go @@ -219,7 +219,7 @@ func (s *sqlDatabase) CreateOrganizationPool(ctx context.Context, orgID string, } func (s *sqlDatabase) ListOrgPools(ctx context.Context, orgID string) ([]params.Pool, error) { - pools, err := s.listEntityPools(ctx, params.OrganizationPool, orgID, "Tags", "Instances") + pools, err := s.listEntityPools(ctx, params.OrganizationPool, orgID, "Tags", "Instances", "Organization") if err != nil { return nil, errors.Wrap(err, "fetching pools") } diff --git a/database/sql/repositories.go b/database/sql/repositories.go index cff10f8a..8131f1f3 100644 --- a/database/sql/repositories.go +++ b/database/sql/repositories.go @@ -219,7 +219,7 @@ func (s *sqlDatabase) CreateRepositoryPool(ctx context.Context, repoID string, p } func (s *sqlDatabase) ListRepoPools(ctx context.Context, repoID string) ([]params.Pool, error) { - pools, err := s.listEntityPools(ctx, params.RepositoryPool, repoID, "Tags", "Instances") + pools, err := s.listEntityPools(ctx, params.RepositoryPool, repoID, "Tags", "Instances", "Repository") if err != nil { return nil, errors.Wrap(err, "fetching pools") }