правки

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))

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",

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 {

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),

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")

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
 }