diff --git a/pkg/environments/environment.go b/environments/environment.go
similarity index 100%
rename from pkg/environments/environment.go
rename to environments/environment.go
diff --git a/pkg/environments/errors.go b/environments/errors.go
similarity index 100%
rename from pkg/environments/errors.go
rename to environments/errors.go
diff --git a/pkg/environments/events.go b/environments/events.go
similarity index 100%
rename from pkg/environments/events.go
rename to environments/events.go
diff --git a/pkg/environments/middleware/access_logging_middleware.go b/environments/middleware/access_logging_middleware.go
similarity index 95%
rename from pkg/environments/middleware/access_logging_middleware.go
rename to environments/middleware/access_logging_middleware.go
index e357e2ec9786edb9f67a7b14445558f86938e924..33ee7897e62b6467a1689d10e2de908294118c7e 100644
--- a/pkg/environments/middleware/access_logging_middleware.go
+++ b/environments/middleware/access_logging_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/environments -i Environments -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"go.uber.org/zap"
)
diff --git a/pkg/environments/middleware/caching_middleware.go b/environments/middleware/caching_middleware.go
similarity index 98%
rename from pkg/environments/middleware/caching_middleware.go
rename to environments/middleware/caching_middleware.go
index c53f45e8bdcdb61f59f1af0acf11bc0f412c2629..79d54d944661799cb4d61bd05d4fb96c34e4c08e 100644
--- a/pkg/environments/middleware/caching_middleware.go
+++ b/environments/middleware/caching_middleware.go
@@ -4,9 +4,9 @@ import (
"context"
"strings"
+ service "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/cache"
"git.perx.ru/perxis/perxis-go/pkg/data"
- service "git.perx.ru/perxis/perxis-go/pkg/environments"
)
func makeKey(ss ...string) string {
diff --git a/pkg/environments/middleware/caching_middleware_test.go b/environments/middleware/caching_middleware_test.go
similarity index 99%
rename from pkg/environments/middleware/caching_middleware_test.go
rename to environments/middleware/caching_middleware_test.go
index cbac396352657115e96d98b6715aa7e371a353a8..c34540543f3bdddc44bd2c24339b042780dc6be7 100644
--- a/pkg/environments/middleware/caching_middleware_test.go
+++ b/environments/middleware/caching_middleware_test.go
@@ -5,9 +5,9 @@ import (
"testing"
"time"
+ "git.perx.ru/perxis/perxis-go/environments"
+ mocksenvironments "git.perx.ru/perxis/perxis-go/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- mocksenvironments "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
diff --git a/pkg/environments/middleware/error_logging_middleware.go b/environments/middleware/error_logging_middleware.go
similarity index 92%
rename from pkg/environments/middleware/error_logging_middleware.go
rename to environments/middleware/error_logging_middleware.go
index 812de4033878fe1c6d774730c68d2e6e00489751..6be242a7413152f6e63f4c77ee0b9faf6c718dd8 100644
--- a/pkg/environments/middleware/error_logging_middleware.go
+++ b/environments/middleware/error_logging_middleware.go
@@ -4,12 +4,12 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/environments -i Environments -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
"go.uber.org/zap"
)
diff --git a/pkg/environments/middleware/logging_middleware.go b/environments/middleware/logging_middleware.go
similarity index 98%
rename from pkg/environments/middleware/logging_middleware.go
rename to environments/middleware/logging_middleware.go
index 2cb0112956df53f7d89c489427997e35ddad2c96..02a889dc69c03742e30b8270b0e2516ccb907e3e 100644
--- a/pkg/environments/middleware/logging_middleware.go
+++ b/environments/middleware/logging_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
diff --git a/pkg/environments/middleware/middleware.go b/environments/middleware/middleware.go
similarity index 73%
rename from pkg/environments/middleware/middleware.go
rename to environments/middleware/middleware.go
index d8e2816928241555275aa14a87f03d35ae99bcf7..6dd22fcca1671d089b995ebc52eb571a89f4dc03 100644
--- a/pkg/environments/middleware/middleware.go
+++ b/environments/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/environments -i Environments -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
"go.uber.org/zap"
)
diff --git a/pkg/environments/middleware/recovering_middleware.go b/environments/middleware/recovering_middleware.go
similarity index 93%
rename from pkg/environments/middleware/recovering_middleware.go
rename to environments/middleware/recovering_middleware.go
index 57a59406a38b7051e2ff65d7ca6e41f198e562a6..1bd2882d83f625a3af37d4c25fbf3f807737d561 100644
--- a/pkg/environments/middleware/recovering_middleware.go
+++ b/environments/middleware/recovering_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/environments -i Environments -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
"go.uber.org/zap"
)
diff --git a/pkg/environments/middleware/telemetry_middleware.go b/environments/middleware/telemetry_middleware.go
similarity index 98%
rename from pkg/environments/middleware/telemetry_middleware.go
rename to environments/middleware/telemetry_middleware.go
index f1fb94c767248ac3db42617e9f8c0475ddcece64..38c36fba903a44154426085f29c2a60635357a13 100644
--- a/pkg/environments/middleware/telemetry_middleware.go
+++ b/environments/middleware/telemetry_middleware.go
@@ -4,15 +4,15 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/environments -i Environments -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/environments"
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/environments/mocks/EnvironmentConfigurationObserver.go b/environments/mocks/EnvironmentConfigurationObserver.go
similarity index 95%
rename from pkg/environments/mocks/EnvironmentConfigurationObserver.go
rename to environments/mocks/EnvironmentConfigurationObserver.go
index 32c8efd8b78c3e7af8e4d1d887223329fd76a43a..d08be4ae00ff62abaea6a7a49d4b43233fffb8d7 100644
--- a/pkg/environments/mocks/EnvironmentConfigurationObserver.go
+++ b/environments/mocks/EnvironmentConfigurationObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/EnvironmentCreatedObserver.go b/environments/mocks/EnvironmentCreatedObserver.go
similarity index 95%
rename from pkg/environments/mocks/EnvironmentCreatedObserver.go
rename to environments/mocks/EnvironmentCreatedObserver.go
index 6bed116a9a28f1ad913eed0abb0cd2f2b2931548..bb1805581b45d3a7ba92fa1e6e33bc19f33c33f6 100644
--- a/pkg/environments/mocks/EnvironmentCreatedObserver.go
+++ b/environments/mocks/EnvironmentCreatedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/EnvironmentDeletedObserver.go b/environments/mocks/EnvironmentDeletedObserver.go
similarity index 95%
rename from pkg/environments/mocks/EnvironmentDeletedObserver.go
rename to environments/mocks/EnvironmentDeletedObserver.go
index 1a101f04be093b1b48e89d8173c969beebb66754..3a8e54a63b6017b06d342da4979dee00ccc7dfdd 100644
--- a/pkg/environments/mocks/EnvironmentDeletedObserver.go
+++ b/environments/mocks/EnvironmentDeletedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/EnvironmentMigratedObserver.go b/environments/mocks/EnvironmentMigratedObserver.go
similarity index 95%
rename from pkg/environments/mocks/EnvironmentMigratedObserver.go
rename to environments/mocks/EnvironmentMigratedObserver.go
index c529a8b81f9caecbb4d78b4d10079f406dc88bf6..7268362fb8a473d9da8927e4c56cc2c01314b5c9 100644
--- a/pkg/environments/mocks/EnvironmentMigratedObserver.go
+++ b/environments/mocks/EnvironmentMigratedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/EnvironmentObserver.go b/environments/mocks/EnvironmentObserver.go
similarity index 100%
rename from pkg/environments/mocks/EnvironmentObserver.go
rename to environments/mocks/EnvironmentObserver.go
diff --git a/pkg/environments/mocks/EnvironmentUpdatedObserver.go b/environments/mocks/EnvironmentUpdatedObserver.go
similarity index 95%
rename from pkg/environments/mocks/EnvironmentUpdatedObserver.go
rename to environments/mocks/EnvironmentUpdatedObserver.go
index 75073188aeb89593bf12555d9ada3a7cc9ec7837..8a5727e5fecdc9e4ce2cf35e438efe840b1c40bc 100644
--- a/pkg/environments/mocks/EnvironmentUpdatedObserver.go
+++ b/environments/mocks/EnvironmentUpdatedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/Environments.go b/environments/mocks/Environments.go
similarity index 98%
rename from pkg/environments/mocks/Environments.go
rename to environments/mocks/Environments.go
index 22da5d024c9cd43506a35e6e11a264fff9189a54..5f1dd11154bc7695878a0f4c4b1ab55c9c4c6fa8 100644
--- a/pkg/environments/mocks/Environments.go
+++ b/environments/mocks/Environments.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/Middleware.go b/environments/mocks/Middleware.go
similarity index 94%
rename from pkg/environments/mocks/Middleware.go
rename to environments/mocks/Middleware.go
index e88e67e9c4b541450200ab8cf9f313383366d44b..9e29cb43287f8ef2c25b3bd3e450c1ef9b84940a 100644
--- a/pkg/environments/mocks/Middleware.go
+++ b/environments/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/mocks/Storage.go b/environments/mocks/Storage.go
similarity index 98%
rename from pkg/environments/mocks/Storage.go
rename to environments/mocks/Storage.go
index 37b8f6e5ef7349b4739969b8bba457979a8faad0..60c2370171628ae1759d43ec3cbc94d1095a14e0 100644
--- a/pkg/environments/mocks/Storage.go
+++ b/environments/mocks/Storage.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/environments/observer.go b/environments/observer.go
similarity index 100%
rename from pkg/environments/observer.go
rename to environments/observer.go
diff --git a/pkg/environments/options.go b/environments/options.go
similarity index 100%
rename from pkg/environments/options.go
rename to environments/options.go
diff --git a/pkg/environments/service.go b/environments/service.go
similarity index 100%
rename from pkg/environments/service.go
rename to environments/service.go
diff --git a/pkg/environments/service_test.go b/environments/service_test.go
similarity index 100%
rename from pkg/environments/service_test.go
rename to environments/service_test.go
diff --git a/pkg/environments/storage.go b/environments/storage.go
similarity index 100%
rename from pkg/environments/storage.go
rename to environments/storage.go
diff --git a/pkg/environments/transport/client.go b/environments/transport/client.go
similarity index 97%
rename from pkg/environments/transport/client.go
rename to environments/transport/client.go
index d562acc24da13a6e0de05bedf6d78e419bdc2386..c03aed48ee3f66b6aec555850768b8c5c0527ba2 100644
--- a/pkg/environments/transport/client.go
+++ b/environments/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *environments.Environment) (res0 *environments.Environment, res1 error) {
diff --git a/pkg/environments/transport/endpoints.microgen.go b/environments/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/environments/transport/endpoints.microgen.go
rename to environments/transport/endpoints.microgen.go
diff --git a/pkg/environments/transport/exchanges.microgen.go b/environments/transport/exchanges.microgen.go
similarity index 95%
rename from pkg/environments/transport/exchanges.microgen.go
rename to environments/transport/exchanges.microgen.go
index a1a0ab068d575767c543d8db652c5d8c9a7e02f4..3d438cb83ee157e2fe5ddaea48545ee195542911 100644
--- a/pkg/environments/transport/exchanges.microgen.go
+++ b/environments/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+import environments "git.perx.ru/perxis/perxis-go/environments"
type (
CreateRequest struct {
diff --git a/pkg/environments/transport/grpc/client.go b/environments/transport/grpc/client.go
similarity index 93%
rename from pkg/environments/transport/grpc/client.go
rename to environments/transport/grpc/client.go
index c882782b3cb880317bc4a2e043f96c517136f3c3..73efd7a1d1cb52eccbd86a9e7dd93b84bdd0995c 100644
--- a/pkg/environments/transport/grpc/client.go
+++ b/environments/transport/grpc/client.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ transport "git.perx.ru/perxis/perxis-go/environments/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/environments/transport/grpc/client.microgen.go b/environments/transport/grpc/client.microgen.go
similarity index 96%
rename from pkg/environments/transport/grpc/client.microgen.go
rename to environments/transport/grpc/client.microgen.go
index aa177145521dacc1e91d01db918bd5f2234b2e12..23a905083ae9f0b8c02e2cbe23273dc3a3e6ca9a 100644
--- a/pkg/environments/transport/grpc/client.microgen.go
+++ b/environments/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ transport "git.perx.ru/perxis/perxis-go/environments/transport"
pb "git.perx.ru/perxis/perxis-go/proto/environments"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go b/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to environments/transport/grpc/protobuf_endpoint_converters.microgen.go
index 97a50a1d2cffbb5578d1466b7fee48c396b45d87..7052e9faf2708c4208a0bd3eb03c6f739f4522cd 100644
--- a/pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/environments/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
"context"
"errors"
- transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ transport "git.perx.ru/perxis/perxis-go/environments/transport"
pb "git.perx.ru/perxis/perxis-go/proto/environments"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/environments/transport/grpc/protobuf_type_converters.microgen.go b/environments/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/environments/transport/grpc/protobuf_type_converters.microgen.go
rename to environments/transport/grpc/protobuf_type_converters.microgen.go
index 6dde6ecac8764a23a4435971b3495576c8a0f0d5..e765f6562b8f65b2b5d3e1d96c1c5352faeaa2c6 100644
--- a/pkg/environments/transport/grpc/protobuf_type_converters.microgen.go
+++ b/environments/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
package transportgrpc
import (
- service "git.perx.ru/perxis/perxis-go/pkg/environments"
+ service "git.perx.ru/perxis/perxis-go/environments"
pb "git.perx.ru/perxis/perxis-go/proto/environments"
timestamp "google.golang.org/protobuf/types/known/timestamppb"
)
diff --git a/pkg/environments/transport/grpc/server.go b/environments/transport/grpc/server.go
similarity index 89%
rename from pkg/environments/transport/grpc/server.go
rename to environments/transport/grpc/server.go
index ed25b89f33790c7fedff28aed7868d2a6172af88..e03c68279b79e6d5751686d15bd4adae1789219e 100644
--- a/pkg/environments/transport/grpc/server.go
+++ b/environments/transport/grpc/server.go
@@ -1,8 +1,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ "git.perx.ru/perxis/perxis-go/environments"
+ "git.perx.ru/perxis/perxis-go/environments/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
pb "git.perx.ru/perxis/perxis-go/proto/environments"
grpckit "github.com/go-kit/kit/transport/grpc"
diff --git a/pkg/environments/transport/grpc/server.microgen.go b/environments/transport/grpc/server.microgen.go
similarity index 98%
rename from pkg/environments/transport/grpc/server.microgen.go
rename to environments/transport/grpc/server.microgen.go
index 04cda9910ead1d9004d24d17b0b251ced7c8d093..869f025c2087c8ec9db041bae492a32a0bbd1e26 100644
--- a/pkg/environments/transport/grpc/server.microgen.go
+++ b/environments/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
+ transport "git.perx.ru/perxis/perxis-go/environments/transport"
pb "git.perx.ru/perxis/perxis-go/proto/environments"
grpc "github.com/go-kit/kit/transport/grpc"
context "golang.org/x/net/context"
diff --git a/pkg/environments/transport/server.microgen.go b/environments/transport/server.microgen.go
similarity index 98%
rename from pkg/environments/transport/server.microgen.go
rename to environments/transport/server.microgen.go
index d1b8264ad2a38989b549b3b30a8cd58e7c860554..51bc77703b5cfa478976a8ded76012fa8e474aaa 100644
--- a/pkg/environments/transport/server.microgen.go
+++ b/environments/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
endpoint "github.com/go-kit/kit/endpoint"
)
diff --git a/id/system/system.go b/id/system/system.go
index c33995d905a615b6c24422e27239da34141d4752..c66a79ec44b496d4d9431bd2ff873024388d7f65 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -4,11 +4,11 @@ import (
"context"
"reflect"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa125e376623ceb710bbe594235b8434d853..0142397f1e47d56927a143ce2969e7b8818be0c4 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -3,11 +3,11 @@ package test
import (
"testing"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/id"
_ "git.perx.ru/perxis/perxis-go/id/system"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
diff --git a/pkg/auth/anonymous.go b/pkg/auth/anonymous.go
index 9fffc86351e794758a00f70218d820a3855eb95a..b40a01c3b39c89e2985cd2c16efa21fa761c0a5d 100644
--- a/pkg/auth/anonymous.go
+++ b/pkg/auth/anonymous.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a5683681137c346f6cba91ec3d40c6a331d6..c258c9c464191c7086b8a50bc9490e81f65d8a94 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -4,9 +4,9 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a2f15ca7605959b3f5b31996a5c79a164..b3a934d6b687ebd9806ea1c922a8327d06647b6b 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -3,9 +3,9 @@ package auth
import (
"strings"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/auth/principal.go b/pkg/auth/principal.go
index 004db35f2eab6433b1889861e964666ab4a71a21..7410ab425ee368ed22deae09cdf70836b68d89df 100644
--- a/pkg/auth/principal.go
+++ b/pkg/auth/principal.go
@@ -3,7 +3,7 @@ package auth
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/roles"
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 29e879457bebc4da201ce126c6c140e02989f2c0..22fc234874210acace92dd23dac3f0bb0ea4e25a 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -4,8 +4,8 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index cb95d0d9a8772f91700f5f630fa9bb2631e51937..49a220372dad9007d7ff77886b6d76b63ad1698e 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -3,9 +3,9 @@ package middleware
import (
"context"
+ envService "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/cache"
service "git.perx.ru/perxis/perxis-go/pkg/collections"
- envService "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/schema"
)
diff --git a/pkg/collections/middleware/caching_middleware_test.go b/pkg/collections/middleware/caching_middleware_test.go
index 24646008ba32736ca45f7bcdc7e0a4845c43877d..2ed04e22270023af7d010fcf58e64686cbb45eda 100644
--- a/pkg/collections/middleware/caching_middleware_test.go
+++ b/pkg/collections/middleware/caching_middleware_test.go
@@ -5,11 +5,11 @@ import (
"testing"
"time"
+ "git.perx.ru/perxis/perxis-go/environments"
+ envmocks "git.perx.ru/perxis/perxis-go/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/cache"
"git.perx.ru/perxis/perxis-go/pkg/collections"
colsmocks "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"github.com/stretchr/testify/assert"
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784dff8fccd5b505867bf65efb373a9149d..444b333fc855b29c05eb27da3bcc1810a7474384 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,6 +3,8 @@ package content
import (
"time"
+ environmentsSvc "git.perx.ru/perxis/perxis-go/environments/middleware"
+ environmentsTransportGrpc "git.perx.ru/perxis/perxis-go/environments/transport/grpc"
"git.perx.ru/perxis/perxis-go/pkg/cache"
clientsSvc "git.perx.ru/perxis/perxis-go/pkg/clients/middleware"
clientsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/clients/transport/grpc"
@@ -10,8 +12,6 @@ import (
collaboratorsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport/grpc"
collectionsSvc "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
collectionsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collections/transport/grpc"
- environmentsSvc "git.perx.ru/perxis/perxis-go/pkg/environments/middleware"
- environmentsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/environments/transport/grpc"
invitationsSvc "git.perx.ru/perxis/perxis-go/pkg/invitations/middleware"
invitationsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/invitations/transport/grpc"
itemsSvc "git.perx.ru/perxis/perxis-go/pkg/items/middleware"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..ffedc22d730c35a31da1d69b907f2da5c7396772 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,11 +1,11 @@
package content
import (
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/invitations"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
diff --git a/pkg/delivery/client/adapter.go b/pkg/delivery/client/adapter.go
index df4c1722cae2ee0abb3be12e58e9f5232bac2bb7..34ecb3ea6daf95e86d4dab4bac157ba327e3de02 100644
--- a/pkg/delivery/client/adapter.go
+++ b/pkg/delivery/client/adapter.go
@@ -3,9 +3,9 @@ package client
import (
"context"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/delivery"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
)
diff --git a/pkg/delivery/client/client.go b/pkg/delivery/client/client.go
index e3fb962c22cd76d4adc2cbd5ca9d6195eb9e41d6..0d3c4ef498bf186a9e5ba5bfbc8a5ff1fb2518de 100644
--- a/pkg/delivery/client/client.go
+++ b/pkg/delivery/client/client.go
@@ -3,12 +3,12 @@ package client
import (
"time"
+ environments "git.perx.ru/perxis/perxis-go/environments/middleware"
"git.perx.ru/perxis/perxis-go/pkg/cache"
collections "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
"git.perx.ru/perxis/perxis-go/pkg/delivery"
deliveryservice "git.perx.ru/perxis/perxis-go/pkg/delivery/service"
deliverytransportgrpc "git.perx.ru/perxis/perxis-go/pkg/delivery/transport/grpc"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments/middleware"
items "git.perx.ru/perxis/perxis-go/pkg/items/middleware"
locales "git.perx.ru/perxis/perxis-go/pkg/locales/middleware"
"google.golang.org/grpc"
diff --git a/pkg/delivery/middleware/telemetry_middleware.go b/pkg/delivery/middleware/telemetry_middleware.go
index 600b6a61caec8391507735e01d12d82ee822c8e3..5cd0e41115ce54ae1c5ab277e66d5bbb95edeebf 100644
--- a/pkg/delivery/middleware/telemetry_middleware.go
+++ b/pkg/delivery/middleware/telemetry_middleware.go
@@ -10,11 +10,11 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/environments"
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/delivery"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
diff --git a/pkg/delivery/mocks/Delivery.go b/pkg/delivery/mocks/Delivery.go
index 6a10b46a01d7d3972338b26d2c82de0f46458b51..3ede743763a673dccecd438012fb3380c88eb82f 100644
--- a/pkg/delivery/mocks/Delivery.go
+++ b/pkg/delivery/mocks/Delivery.go
@@ -7,7 +7,7 @@ import (
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
+ environments "git.perx.ru/perxis/perxis-go/environments"
items "git.perx.ru/perxis/perxis-go/pkg/items"
diff --git a/pkg/delivery/service.go b/pkg/delivery/service.go
index 9f084740499a5d620d158c4ef97555d4ed5acca6..00da5f11b574afe87a649cf661c60ce247390e9e 100644
--- a/pkg/delivery/service.go
+++ b/pkg/delivery/service.go
@@ -3,8 +3,8 @@ package delivery
import (
"context"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
)
diff --git a/pkg/delivery/service/service.go b/pkg/delivery/service/service.go
index be71148108f3296ce5a66d6a6f1f347a81671999..b365476f2f5f6dba12004f62f95f8d58df531f17 100644
--- a/pkg/delivery/service/service.go
+++ b/pkg/delivery/service/service.go
@@ -3,9 +3,9 @@ package service
import (
"context"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/delivery"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
)
diff --git a/pkg/delivery/transport/client.go b/pkg/delivery/transport/client.go
index 39c110029c1c78df3ccf4c01ef1073612fbba2c7..f997afcfbf9d789aa3a3bc205ae659de6c30fcc3 100644
--- a/pkg/delivery/transport/client.go
+++ b/pkg/delivery/transport/client.go
@@ -5,8 +5,8 @@ package transport
import (
"context"
+ environments "git.perx.ru/perxis/perxis-go/environments"
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
items "git.perx.ru/perxis/perxis-go/pkg/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
)
diff --git a/pkg/delivery/transport/exchanges.microgen.go b/pkg/delivery/transport/exchanges.microgen.go
index 3e0f4c8958cc3cb58608e4e6676c8c4163a83cd0..49693fb64a722f4977f1c08e2f4b075c0d3e7797 100644
--- a/pkg/delivery/transport/exchanges.microgen.go
+++ b/pkg/delivery/transport/exchanges.microgen.go
@@ -3,8 +3,8 @@
package transport
import (
+ environments "git.perx.ru/perxis/perxis-go/environments"
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
items "git.perx.ru/perxis/perxis-go/pkg/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
)
diff --git a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
index 7067dc51722117ddc00dd6208de6da9bd8a8e9bd..bc0558999eaa94a29b74e0a3009856c094bfc4a7 100644
--- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,8 +7,8 @@ package transportgrpc
import (
"fmt"
+ environments "git.perx.ru/perxis/perxis-go/environments"
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- environments "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/filter"
items "git.perx.ru/perxis/perxis-go/pkg/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
diff --git a/pkg/items/context.go b/pkg/items/context.go
index 87e600e5b40da50381245a626e8228ab20485de8..9ac76191b3f5629cc406995384219e63ab535359 100644
--- a/pkg/items/context.go
+++ b/pkg/items/context.go
@@ -3,8 +3,8 @@ package items
import (
"context"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/clients"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
)
diff --git a/pkg/items/middleware/caching_middleware.go b/pkg/items/middleware/caching_middleware.go
index 60d3bf80250843f2ddc963fe5d242e58f590a3f7..704466406945e342780752b9523584b0e7a5951a 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/pkg/items/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ envService "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- envService "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
service "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/locales"
diff --git a/pkg/items/middleware/caching_middleware_test.go b/pkg/items/middleware/caching_middleware_test.go
index 4d777647788f290acf4e55550c435fa7ba27153a..1f7e2c2d538563f5b65d1d5429dcb5692c316acf 100644
--- a/pkg/items/middleware/caching_middleware_test.go
+++ b/pkg/items/middleware/caching_middleware_test.go
@@ -5,9 +5,9 @@ import (
"testing"
"time"
+ "git.perx.ru/perxis/perxis-go/environments"
+ envmocks "git.perx.ru/perxis/perxis-go/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
itmsmocks "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
diff --git a/pkg/items/pagination_test.go b/pkg/items/pagination_test.go
index 23d484b83e3e21ec3ee7b5f93477ea9d9a9b7cee..79673849801351145fa2fdae270a0047a0f5835b 100644
--- a/pkg/items/pagination_test.go
+++ b/pkg/items/pagination_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/options"
"github.com/stretchr/testify/assert"
diff --git a/pkg/roles/role.go b/pkg/roles/role.go
index 81feb1e909f15d40a918309a25add9c420e25b35..4eca5460790a6a5c731ae6b0f8b38f432cf827c8 100644
--- a/pkg/roles/role.go
+++ b/pkg/roles/role.go
@@ -4,8 +4,8 @@ import (
"context"
"slices"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/data"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/permission"
)
diff --git a/pkg/roles/role_test.go b/pkg/roles/role_test.go
index ca794b1855cd96915dbe2002f144f3b907a50aa3..9c5ee3968b75b721d694bfa8057ec0c9cd33ef68 100644
--- a/pkg/roles/role_test.go
+++ b/pkg/roles/role_test.go
@@ -4,8 +4,8 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- mocksenvs "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
+ "git.perx.ru/perxis/perxis-go/environments"
+ mocksenvs "git.perx.ru/perxis/perxis-go/environments/mocks"
"github.com/stretchr/testify/mock"
)
diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index f1d9e4da1182938249192f8ef410ceecc81c743a..8111094ea18fbc9d5966190dd71ea252301c25dc 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -4,10 +4,10 @@ import (
"context"
"testing"
+ "git.perx.ru/perxis/perxis-go/environments"
+ envmocks "git.perx.ru/perxis/perxis-go/environments/mocks"
mockscollections "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"github.com/stretchr/testify/mock"
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..bc05d78aa790a0d451c8a768c4e232abcbf9c35e 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,10 +5,10 @@ import (
"errors"
"testing"
+ environmentMock "git.perx.ru/perxis/perxis-go/environments/mocks"
clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
collectionMock "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
"git.perx.ru/perxis/perxis-go/pkg/data"
- environmentMock "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
itemsMock "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
rolesMock "git.perx.ru/perxis/perxis-go/pkg/roles/mocks"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/template/builder.go b/pkg/template/builder.go
index 64530be62337de21dc5b93956df261ce5211a302..dd3bf463d765955d5b0aea664ef3443be4a4c4fb 100644
--- a/pkg/template/builder.go
+++ b/pkg/template/builder.go
@@ -5,9 +5,9 @@ import (
"context"
"text/template"
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
)
diff --git a/pkg/template/builder_test.go b/pkg/template/builder_test.go
index 128f706423f3ecc67097a76b8926fbed619eb1ce..822a018fb35a13d1a8c6e5cd5b4b32b065a3bbba 100644
--- a/pkg/template/builder_test.go
+++ b/pkg/template/builder_test.go
@@ -5,11 +5,11 @@ import (
"errors"
"testing"
+ "git.perx.ru/perxis/perxis-go/environments"
+ envsmocks "git.perx.ru/perxis/perxis-go/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/collections"
colsmocks "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
- envsmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/items"
mocksitems "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/template/system.go b/pkg/template/system.go
index c7dda43f08c852f590cd7cfa16ec00709423c7a3..b9fb13559f151113a95943062e494cb8fb5ff69a 100644
--- a/pkg/template/system.go
+++ b/pkg/template/system.go
@@ -1,8 +1,8 @@
package template
import (
+ "git.perx.ru/perxis/perxis-go/environments"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
)