diff --git a/pkg/setup/client.go b/pkg/setup/client.go index c77b9a4c405ef05e2be730154b2e1310fdab1223..f341bb4020dad684fde22f2bfee2dc786827ee8b 100644 --- a/pkg/setup/client.go +++ b/pkg/setup/client.go @@ -93,6 +93,12 @@ func UpdateExistingClient() ClientsOption { } } +func PrepareClients(handler func(client *clients.Client)) ClientsOption { + return func(c *ClientConfig) { + handler(c.client) + } +} + func (s *Setup) InstallClients(ctx context.Context) error { if len(s.Clients) == 0 { return nil @@ -101,9 +107,6 @@ func (s *Setup) InstallClients(ctx context.Context) error { s.logger.Debug("Install clients", zap.String("Space ID", s.SpaceID)) for _, c := range s.Clients { - if s.ClientsPrepareFn != nil { - s.ClientsPrepareFn(c.client) - } err := s.InstallClient(ctx, c) if err != nil { s.logger.Error("Failed to install client", zap.String("Client ID", c.client.ID), zap.String("Client Name", c.client.Name), zap.Error(err)) diff --git a/pkg/setup/collection.go b/pkg/setup/collection.go index 61cbd5d2eccdf01dae3746c46f722bdec7784979..2d3656eaebd339dd9e064cef57e2ff6e501b1e2b 100644 --- a/pkg/setup/collection.go +++ b/pkg/setup/collection.go @@ -134,9 +134,6 @@ func (s *Setup) InstallCollections(ctx context.Context) (err error) { var migrate, setSchema bool for _, c := range s.Collections { - if s.CollectionsPrepareFn != nil { - s.CollectionsPrepareFn(c.collection) - } setSchema, err = s.InstallCollection(ctx, c) if err != nil { s.logger.Error("Failed to install collection", diff --git a/pkg/setup/config.go b/pkg/setup/config.go index 4c666f580f1046848568e7006656343bd33babf7..08e1c740323d4e709e0a2d905ed2b2af2d4ebc5b 100644 --- a/pkg/setup/config.go +++ b/pkg/setup/config.go @@ -18,11 +18,6 @@ type Config struct { Clients []ClientConfig Collections []CollectionConfig Items []ItemConfig - - RolesPrepareFn func(r *roles.Role) - ClientsPrepareFn func(c *clients.Client) - CollectionsPrepareFn func(c *collections.Collection) - ItemsPrepareFn func(i *items.Item) } func NewConfig() *Config { diff --git a/pkg/setup/item.go b/pkg/setup/item.go index af9bee27117a25c6cf584d97a732a47a7fde41f4..af08ea951ad51da0a7cb7057191288d4997faea4 100644 --- a/pkg/setup/item.go +++ b/pkg/setup/item.go @@ -190,9 +190,6 @@ func (s *Setup) InstallItems(ctx context.Context) (err error) { return err } for _, c := range itms { - if s.ItemsPrepareFn != nil { - s.ItemsPrepareFn(c.item) - } if err := s.InstallItem(ctx, exists, c); err != nil { s.logger.Error("Failed to install item", zap.String("ID", c.item.ID), diff --git a/pkg/setup/role.go b/pkg/setup/role.go index d52cbab959af52bd0beb6efd29c72f42caf41f46..ac6e641a97c6160cf29c5353f0176ef110a9bab3 100644 --- a/pkg/setup/role.go +++ b/pkg/setup/role.go @@ -113,9 +113,6 @@ func (s *Setup) InstallRoles(ctx context.Context) error { s.logger.Debug("Install role", zap.String("Space ID", s.SpaceID), zap.Int("Roles", len(s.Roles))) for _, c := range s.Roles { - if s.RolesPrepareFn != nil { - s.RolesPrepareFn(c.role) - } if err := s.InstallRole(ctx, c); err != nil { s.logger.Error("Failed to install role", zap.String("Role ID", c.role.ID), zap.Error(err)) return errors.Wrap(errors.WithDetailf(err, "Возникла ошибка при настройке роли %s(%s)", c.role.ID, c.role.Description), "failed to install role") diff --git a/pkg/setup/setup.go b/pkg/setup/setup.go index 5fb9dfa6f64a1b3bb3af7b1088e8a9ca83337683..9b6473a556e063518a78bf4e30ac1f844c658991 100644 --- a/pkg/setup/setup.go +++ b/pkg/setup/setup.go @@ -68,12 +68,6 @@ func (s *Setup) WithForce(force bool) *Setup { return &setup } -func (s *Setup) WithClientsPrepareFunc(fn func(c *clients.Client)) *Setup { - setup := *s - setup.ClientsPrepareFn = fn - return &setup -} - func (s *Setup) IsForce() bool { return s.force }