From 82049ba6acf4a4445278f9765b98af2a26555924 Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Mon, 10 Jul 2023 10:29:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?=
=?UTF-8?q?=D0=BE=20=D0=9F=D0=A0:=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5?=
=?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0?=
=?UTF-8?q?=D0=BD=D1=82=D0=B0=20ExtensionMetadataKey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/extension/extension.go | 2 ++
pkg/setup/collection.go | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 26d9b6d5..fb8044c7 100644
--- a/pkg/extension/extension.go
+++ b/pkg/extension/extension.go
@@ -21,6 +21,8 @@ const (
StateInstalled = pb.SpaceExtensions_INSTALLED
StateInProgress = pb.SpaceExtensions_IN_PROGRESS
StateFail = pb.SpaceExtensions_FAIL
+
+ ExtensionMetadataKey = "extension"
)
type (
diff --git a/pkg/setup/collection.go b/pkg/setup/collection.go
index 375fedf6..bb0fc2d9 100644
--- a/pkg/setup/collection.go
+++ b/pkg/setup/collection.go
@@ -8,6 +8,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
+ "git.perx.ru/perxis/perxis-go/pkg/extension"
"go.uber.org/zap"
)
@@ -16,7 +17,6 @@ var (
ErrInstallCollections = errors.New("failed to install collections")
ErrUninstallCollections = errors.New("failed to uninstall collections")
ErrCollectionAlreadyExists = errors.New("failed to uninstall collections")
- key = "extension"
)
type CollectionsOption func(c *CollectionConfig)
@@ -158,7 +158,7 @@ func (s *Setup) InstallCollection(ctx context.Context, c CollectionConfig) (setS
return false, err
}
} else {
- if collection.Schema.Metadata != nil && exist.Schema.Metadata[key] != collection.Schema.Metadata[key] && !s.IsForce() {
+ if collection.Schema.Metadata != nil && exist.Schema.Metadata[extension.ExtensionMetadataKey] != collection.Schema.Metadata[extension.ExtensionMetadataKey] && !s.IsForce() {
return false, ErrCollectionAlreadyExists
}
--
GitLab