From cd5fbab8d6111d7e7aad617a50be507b83794c6c Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Wed, 16 Oct 2024 12:21:42 +0300
Subject: [PATCH] pkg environments moved from pkg
---
{pkg/environments => environments}/environment.go | 0
{pkg/environments => environments}/errors.go | 0
{pkg/environments => environments}/events.go | 0
.../middleware/access_logging_middleware.go | 4 ++--
.../middleware/caching_middleware.go | 2 +-
.../middleware/caching_middleware_test.go | 4 ++--
.../middleware/error_logging_middleware.go | 4 ++--
.../middleware/logging_middleware.go | 2 +-
{pkg/environments => environments}/middleware/middleware.go | 4 ++--
.../middleware/recovering_middleware.go | 4 ++--
.../middleware/telemetry_middleware.go | 4 ++--
.../mocks/EnvironmentConfigurationObserver.go | 2 +-
.../mocks/EnvironmentCreatedObserver.go | 2 +-
.../mocks/EnvironmentDeletedObserver.go | 2 +-
.../mocks/EnvironmentMigratedObserver.go | 2 +-
.../mocks/EnvironmentObserver.go | 0
.../mocks/EnvironmentUpdatedObserver.go | 2 +-
{pkg/environments => environments}/mocks/Environments.go | 2 +-
{pkg/environments => environments}/mocks/Middleware.go | 2 +-
{pkg/environments => environments}/mocks/Storage.go | 2 +-
{pkg/environments => environments}/observer.go | 0
{pkg/environments => environments}/options.go | 0
{pkg/environments => environments}/service.go | 0
{pkg/environments => environments}/service_test.go | 0
{pkg/environments => environments}/storage.go | 0
{pkg/environments => environments}/transport/client.go | 2 +-
.../transport/endpoints.microgen.go | 0
.../transport/exchanges.microgen.go | 2 +-
{pkg/environments => environments}/transport/grpc/client.go | 2 +-
.../transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/environments => environments}/transport/grpc/server.go | 4 ++--
.../transport/grpc/server.microgen.go | 2 +-
.../transport/server.microgen.go | 2 +-
id/system/system.go | 2 +-
id/test/object_id_test.go | 2 +-
pkg/auth/anonymous.go | 2 +-
pkg/auth/client.go | 2 +-
pkg/auth/factory.go | 2 +-
pkg/auth/principal.go | 2 +-
pkg/auth/user.go | 2 +-
pkg/collections/middleware/caching_middleware.go | 2 +-
pkg/collections/middleware/caching_middleware_test.go | 4 ++--
pkg/content/client.go | 4 ++--
pkg/content/content.go | 2 +-
pkg/delivery/client/adapter.go | 2 +-
pkg/delivery/client/client.go | 2 +-
pkg/delivery/middleware/telemetry_middleware.go | 2 +-
pkg/delivery/mocks/Delivery.go | 2 +-
pkg/delivery/service.go | 2 +-
pkg/delivery/service/service.go | 2 +-
pkg/delivery/transport/client.go | 2 +-
pkg/delivery/transport/exchanges.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
pkg/items/context.go | 2 +-
pkg/items/middleware/caching_middleware.go | 2 +-
pkg/items/middleware/caching_middleware_test.go | 4 ++--
pkg/items/pagination_test.go | 2 +-
pkg/roles/role.go | 2 +-
pkg/roles/role_test.go | 4 ++--
pkg/setup/collection_test.go | 4 ++--
pkg/setup/setup_test.go | 2 +-
pkg/template/builder.go | 2 +-
pkg/template/builder_test.go | 4 ++--
pkg/template/system.go | 2 +-
66 files changed, 69 insertions(+), 69 deletions(-)
rename {pkg/environments => environments}/environment.go (100%)
rename {pkg/environments => environments}/errors.go (100%)
rename {pkg/environments => environments}/events.go (100%)
rename {pkg/environments => environments}/middleware/access_logging_middleware.go (95%)
rename {pkg/environments => environments}/middleware/caching_middleware.go (98%)
rename {pkg/environments => environments}/middleware/caching_middleware_test.go (99%)
rename {pkg/environments => environments}/middleware/error_logging_middleware.go (92%)
rename {pkg/environments => environments}/middleware/logging_middleware.go (98%)
rename {pkg/environments => environments}/middleware/middleware.go (73%)
rename {pkg/environments => environments}/middleware/recovering_middleware.go (93%)
rename {pkg/environments => environments}/middleware/telemetry_middleware.go (98%)
rename {pkg/environments => environments}/mocks/EnvironmentConfigurationObserver.go (95%)
rename {pkg/environments => environments}/mocks/EnvironmentCreatedObserver.go (95%)
rename {pkg/environments => environments}/mocks/EnvironmentDeletedObserver.go (95%)
rename {pkg/environments => environments}/mocks/EnvironmentMigratedObserver.go (95%)
rename {pkg/environments => environments}/mocks/EnvironmentObserver.go (100%)
rename {pkg/environments => environments}/mocks/EnvironmentUpdatedObserver.go (95%)
rename {pkg/environments => environments}/mocks/Environments.go (98%)
rename {pkg/environments => environments}/mocks/Middleware.go (94%)
rename {pkg/environments => environments}/mocks/Storage.go (98%)
rename {pkg/environments => environments}/observer.go (100%)
rename {pkg/environments => environments}/options.go (100%)
rename {pkg/environments => environments}/service.go (100%)
rename {pkg/environments => environments}/service_test.go (100%)
rename {pkg/environments => environments}/storage.go (100%)
rename {pkg/environments => environments}/transport/client.go (97%)
rename {pkg/environments => environments}/transport/endpoints.microgen.go (100%)
rename {pkg/environments => environments}/transport/exchanges.microgen.go (95%)
rename {pkg/environments => environments}/transport/grpc/client.go (93%)
rename {pkg/environments => environments}/transport/grpc/client.microgen.go (96%)
rename {pkg/environments => environments}/transport/grpc/protobuf_endpoint_converters.microgen.go (99%)
rename {pkg/environments => environments}/transport/grpc/protobuf_type_converters.microgen.go (98%)
rename {pkg/environments => environments}/transport/grpc/server.go (89%)
rename {pkg/environments => environments}/transport/grpc/server.microgen.go (98%)
rename {pkg/environments => environments}/transport/server.microgen.go (98%)
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 e357e2ec..33ee7897 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 c53f45e8..79d54d94 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 cbac3963..c3454054 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 812de403..6be242a7 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 2cb01129..02a889dc 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 d8e28169..6dd22fcc 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 57a59406..1bd2882d 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 f1fb94c7..38c36fba 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 32c8efd8..d08be4ae 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 6bed116a..bb180558 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 1a101f04..3a8e54a6 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 c529a8b8..7268362f 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 75073188..8a5727e5 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 22da5d02..5f1dd111 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 e88e67e9..9e29cb43 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 37b8f6e5..60c23701 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 d562acc2..c03aed48 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 a1a0ab06..3d438cb8 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 c882782b..73efd7a1 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 aa177145..23a90508 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 97a50a1d..7052e9fa 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 6dde6eca..e765f656 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 ed25b89f..e03c6827 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 04cda991..869f025c 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 d1b8264a..51bc7770 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 c33995d9..c66a79ec 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 2f01fa12..0142397f 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 9fffc863..b40a01c3 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 9db7a568..c258c9c4 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 2394c62a..b3a934d6 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 004db35f..7410ab42 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 29e87945..22fc2348 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 cb95d0d9..49a22037 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 24646008..2ed04e22 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 adc5f784..444b333f 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 1d351e93..ffedc22d 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 df4c1722..34ecb3ea 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 e3fb962c..0d3c4ef4 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 600b6a61..5cd0e411 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 6a10b46a..3ede7437 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 9f084740..00da5f11 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 be711481..b365476f 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 39c11002..f997afcf 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 3e0f4c89..49693fb6 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 7067dc51..bc055899 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 87e600e5..9ac76191 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 60d3bf80..70446640 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 4d777647..1f7e2c2d 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 23d484b8..79673849 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 81feb1e9..4eca5460 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 ca794b18..9c5ee396 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 f1d9e4da..8111094e 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 ff73b745..bc05d78a 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 64530be6..dd3bf463 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 128f7064..822a018f 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 c7dda43f..b9fb1355 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"
)
--
GitLab