From a7f39bde985477ecf788b75acc5933b6954693f0 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Wed, 11 Sep 2024 13:40:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/setup/client.go | 9 ++++++---
pkg/setup/collection.go | 3 ---
pkg/setup/config.go | 5 -----
pkg/setup/item.go | 3 ---
pkg/setup/role.go | 3 ---
pkg/setup/setup.go | 6 ------
6 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/pkg/setup/client.go b/pkg/setup/client.go
index c77b9a4c..f341bb40 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 61cbd5d2..2d3656ea 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 4c666f58..08e1c740 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 af9bee27..af08ea95 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 d52cbab9..ac6e641a 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 5fb9dfa6..9b6473a5 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
}
--
GitLab