From 23d3df464a0631719e4f59870e8d93aaf7239ceb Mon Sep 17 00:00:00 2001 From: Danis Kirasirov <kirasirov@perx.ru> Date: Fri, 8 Nov 2024 12:18:08 +0000 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D0=BF=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=8D=D0=BB=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B5=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/extension/storage.go | 3 ++- pkg/setup/item.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go index c7dd6285..a9204a20 100644 --- a/pkg/extension/storage.go +++ b/pkg/extension/storage.go @@ -7,6 +7,7 @@ import ( "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/data" "git.perx.ru/perxis/perxis-go/pkg/errors" + "git.perx.ru/perxis/perxis-go/pkg/options" "git.perx.ru/perxis/perxis-go/pkg/setup" pb "git.perx.ru/perxis/perxis-go/proto/extensions" "go.uber.org/zap" @@ -77,7 +78,7 @@ func (s *storage) GetExtension(ctx context.Context, spaceID, envID string, exten // FindExtensions возвращает состояния расширений в пространстве func (s *storage) FindExtensions(ctx context.Context, spaceID, envID string, extensions ...string) ([]*Info, error) { - itms, _, err := s.content.Items.Find(ctx, spaceID, envID, ExtensionsCollection.ID, &items.Filter{ID: extensions}) + itms, _, err := s.content.Items.Find(ctx, spaceID, envID, ExtensionsCollection.ID, &items.Filter{ID: extensions}, items.NewFindOptions(options.New(0, 10000))) if err != nil && !strings.Contains(err.Error(), collections.ErrNotFound.Error()) { return nil, err } diff --git a/pkg/setup/item.go b/pkg/setup/item.go index adf79935..12ba05f5 100644 --- a/pkg/setup/item.go +++ b/pkg/setup/item.go @@ -10,6 +10,7 @@ import ( "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/errors" "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/pkg/options" ) var ( @@ -323,7 +324,7 @@ func (s *Setup) getItems(ctx context.Context, collID string, confs Items) (map[s s.EnvironmentID, collID, &items.Filter{ID: confs.GetIDs()}, - &items.FindOptions{Regular: true, Hidden: true, Templates: true}, + &items.FindOptions{Regular: true, Hidden: true, Templates: true, FindOptions: *options.New(0, len(confs))}, ) if err != nil { -- GitLab