From b13826c97f032f2a187e3af48d8434c243b5d61c Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 08:59:57 +0300
Subject: [PATCH] pkg items moved from pkg
---
id/system/system.go | 2 +-
id/test/object_id_test.go | 2 +-
{pkg/items => items}/codec.go | 0
{pkg/items => items}/context.go | 0
{pkg/items => items}/errors.go | 0
{pkg/items => items}/events.go | 0
{pkg/items => items}/item.go | 0
{pkg/items => items}/item_test.go | 0
{pkg/items => items}/middleware/access_logging_middleware.go | 4 ++--
{pkg/items => items}/middleware/caching_middleware.go | 2 +-
{pkg/items => items}/middleware/caching_middleware_test.go | 4 ++--
{pkg/items => items}/middleware/client_encode_middleware.go | 2 +-
{pkg/items => items}/middleware/logging_middleware.go | 2 +-
{pkg/items => items}/middleware/middleware.go | 4 ++--
{pkg/items => items}/middleware/recovering_middleware.go | 4 ++--
{pkg/items => items}/middleware/telemetry_middleware.go | 4 ++--
{pkg/items => items}/mocks/Decoder.go | 2 +-
{pkg/items => items}/mocks/Encoder.go | 2 +-
{pkg/items => items}/mocks/ItemObserver.go | 0
{pkg/items => items}/mocks/ItemReadObserver.go | 2 +-
{pkg/items => items}/mocks/Items.go | 2 +-
{pkg/items => items}/mocks/Middleware.go | 2 +-
{pkg/items => items}/mocks/PreSaver.go | 2 +-
{pkg/items => items}/mocks/ProcessDataFunc.go | 0
{pkg/items => items}/mocks/Storage.go | 2 +-
{pkg/items => items}/observer.go | 0
{pkg/items => items}/options.go | 0
{pkg/items => items}/pagination.go | 0
{pkg/items => items}/pagination_test.go | 0
{pkg/items => items}/service.go | 0
{pkg/items => items}/storage.go | 0
{pkg/items => items}/storage_options.go | 0
{pkg/items => items}/stub.go | 0
{pkg/items => items}/transport/client.go | 2 +-
{pkg/items => items}/transport/endpoints.microgen.go | 0
{pkg/items => items}/transport/exchanges.microgen.go | 2 +-
{pkg/items => items}/transport/grpc/client.go | 2 +-
{pkg/items => items}/transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 4 ++--
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/items => items}/transport/grpc/server.go | 4 ++--
{pkg/items => items}/transport/grpc/server.microgen.go | 2 +-
{pkg/items => items}/transport/server.microgen.go | 2 +-
logs/service.go | 2 +-
logs/zap/entry_encoder_test.go | 2 +-
logs/zap/example_test.go | 2 +-
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/extension/storage.go | 2 +-
pkg/files/field.go | 2 +-
pkg/references/field.go | 2 +-
pkg/references/field_test.go | 4 ++--
pkg/references/middleware/access_logging_middleware.go | 2 +-
pkg/references/middleware/client_encode_middleware.go | 2 +-
pkg/references/middleware/error_logging_middleware.go | 2 +-
pkg/references/middleware/recovering_middleware.go | 2 +-
pkg/references/middleware/telemetry_middleware.go | 2 +-
pkg/references/mocks/References.go | 2 +-
pkg/references/reference.go | 2 +-
pkg/references/service.go | 2 +-
pkg/references/transport/client.go | 2 +-
pkg/references/transport/exchanges.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 4 ++--
pkg/setup/item.go | 2 +-
pkg/setup/item_test.go | 4 ++--
pkg/setup/setup_test.go | 4 ++--
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
pkg/template/builder_test.go | 4 ++--
zap/field_test.go | 2 +-
78 files changed, 74 insertions(+), 74 deletions(-)
rename {pkg/items => items}/codec.go (100%)
rename {pkg/items => items}/context.go (100%)
rename {pkg/items => items}/errors.go (100%)
rename {pkg/items => items}/events.go (100%)
rename {pkg/items => items}/item.go (100%)
rename {pkg/items => items}/item_test.go (100%)
rename {pkg/items => items}/middleware/access_logging_middleware.go (98%)
rename {pkg/items => items}/middleware/caching_middleware.go (99%)
rename {pkg/items => items}/middleware/caching_middleware_test.go (99%)
rename {pkg/items => items}/middleware/client_encode_middleware.go (99%)
rename {pkg/items => items}/middleware/logging_middleware.go (99%)
rename {pkg/items => items}/middleware/middleware.go (73%)
rename {pkg/items => items}/middleware/recovering_middleware.go (97%)
rename {pkg/items => items}/middleware/telemetry_middleware.go (99%)
rename {pkg/items => items}/mocks/Decoder.go (95%)
rename {pkg/items => items}/mocks/Encoder.go (96%)
rename {pkg/items => items}/mocks/ItemObserver.go (100%)
rename {pkg/items => items}/mocks/ItemReadObserver.go (98%)
rename {pkg/items => items}/mocks/Items.go (99%)
rename {pkg/items => items}/mocks/Middleware.go (95%)
rename {pkg/items => items}/mocks/PreSaver.go (97%)
rename {pkg/items => items}/mocks/ProcessDataFunc.go (100%)
rename {pkg/items => items}/mocks/Storage.go (99%)
rename {pkg/items => items}/observer.go (100%)
rename {pkg/items => items}/options.go (100%)
rename {pkg/items => items}/pagination.go (100%)
rename {pkg/items => items}/pagination_test.go (100%)
rename {pkg/items => items}/service.go (100%)
rename {pkg/items => items}/storage.go (100%)
rename {pkg/items => items}/storage_options.go (100%)
rename {pkg/items => items}/stub.go (100%)
rename {pkg/items => items}/transport/client.go (99%)
rename {pkg/items => items}/transport/endpoints.microgen.go (100%)
rename {pkg/items => items}/transport/exchanges.microgen.go (99%)
rename {pkg/items => items}/transport/grpc/client.go (96%)
rename {pkg/items => items}/transport/grpc/client.microgen.go (98%)
rename {pkg/items => items}/transport/grpc/protobuf_endpoint_converters.microgen.go (99%)
rename {pkg/items => items}/transport/grpc/protobuf_type_converters.microgen.go (99%)
rename {pkg/items => items}/transport/grpc/server.go (95%)
rename {pkg/items => items}/transport/grpc/server.microgen.go (99%)
rename {pkg/items => items}/transport/server.microgen.go (99%)
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..d9838efe 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -5,11 +5,11 @@ import (
"reflect"
"git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"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"
"git.perx.ru/perxis/perxis-go/pkg/roles"
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa12..092c6669 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -5,10 +5,10 @@ import (
"git.perx.ru/perxis/perxis-go/id"
_ "git.perx.ru/perxis/perxis-go/id/system"
+ "git.perx.ru/perxis/perxis-go/items"
"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"
"git.perx.ru/perxis/perxis-go/pkg/roles"
diff --git a/pkg/items/codec.go b/items/codec.go
similarity index 100%
rename from pkg/items/codec.go
rename to items/codec.go
diff --git a/pkg/items/context.go b/items/context.go
similarity index 100%
rename from pkg/items/context.go
rename to items/context.go
diff --git a/pkg/items/errors.go b/items/errors.go
similarity index 100%
rename from pkg/items/errors.go
rename to items/errors.go
diff --git a/pkg/items/events.go b/items/events.go
similarity index 100%
rename from pkg/items/events.go
rename to items/events.go
diff --git a/pkg/items/item.go b/items/item.go
similarity index 100%
rename from pkg/items/item.go
rename to items/item.go
diff --git a/pkg/items/item_test.go b/items/item_test.go
similarity index 100%
rename from pkg/items/item_test.go
rename to items/item_test.go
diff --git a/pkg/items/middleware/access_logging_middleware.go b/items/middleware/access_logging_middleware.go
similarity index 98%
rename from pkg/items/middleware/access_logging_middleware.go
rename to items/middleware/access_logging_middleware.go
index 2342a6d9..7f211187 100644
--- a/pkg/items/middleware/access_logging_middleware.go
+++ b/items/middleware/access_logging_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/caching_middleware.go b/items/middleware/caching_middleware.go
similarity index 99%
rename from pkg/items/middleware/caching_middleware.go
rename to items/middleware/caching_middleware.go
index 60d3bf80..759d1232 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/items/middleware/caching_middleware.go
@@ -4,10 +4,10 @@ import (
"context"
"strings"
+ service "git.perx.ru/perxis/perxis-go/items"
"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/items/middleware/caching_middleware_test.go
similarity index 99%
rename from pkg/items/middleware/caching_middleware_test.go
rename to items/middleware/caching_middleware_test.go
index 4d777647..3cc9c789 100644
--- a/pkg/items/middleware/caching_middleware_test.go
+++ b/items/middleware/caching_middleware_test.go
@@ -5,12 +5,12 @@ import (
"testing"
"time"
+ "git.perx.ru/perxis/perxis-go/items"
+ itmsmocks "git.perx.ru/perxis/perxis-go/items/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"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/items/middleware/client_encode_middleware.go b/items/middleware/client_encode_middleware.go
similarity index 99%
rename from pkg/items/middleware/client_encode_middleware.go
rename to items/middleware/client_encode_middleware.go
index 873a0e97..dff656b4 100644
--- a/pkg/items/middleware/client_encode_middleware.go
+++ b/items/middleware/client_encode_middleware.go
@@ -3,9 +3,9 @@ package middleware
import (
"context"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
)
diff --git a/pkg/items/middleware/logging_middleware.go b/items/middleware/logging_middleware.go
similarity index 99%
rename from pkg/items/middleware/logging_middleware.go
rename to items/middleware/logging_middleware.go
index 1178719e..ca71db91 100644
--- a/pkg/items/middleware/logging_middleware.go
+++ b/items/middleware/logging_middleware.go
@@ -4,7 +4,7 @@ import (
"context"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
diff --git a/pkg/items/middleware/middleware.go b/items/middleware/middleware.go
similarity index 73%
rename from pkg/items/middleware/middleware.go
rename to items/middleware/middleware.go
index 4ef6a1fd..e0894831 100644
--- a/pkg/items/middleware/middleware.go
+++ b/items/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/recovering_middleware.go b/items/middleware/recovering_middleware.go
similarity index 97%
rename from pkg/items/middleware/recovering_middleware.go
rename to items/middleware/recovering_middleware.go
index d719dd11..9d6397f1 100644
--- a/pkg/items/middleware/recovering_middleware.go
+++ b/items/middleware/recovering_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/telemetry_middleware.go b/items/middleware/telemetry_middleware.go
similarity index 99%
rename from pkg/items/middleware/telemetry_middleware.go
rename to items/middleware/telemetry_middleware.go
index da626aa5..f66b9f1f 100644
--- a/pkg/items/middleware/telemetry_middleware.go
+++ b/items/middleware/telemetry_middleware.go
@@ -4,15 +4,15 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
import (
"context"
"time"
oid "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/items/mocks/Decoder.go b/items/mocks/Decoder.go
similarity index 95%
rename from pkg/items/mocks/Decoder.go
rename to items/mocks/Decoder.go
index fcc4d502..799dd6b3 100644
--- a/pkg/items/mocks/Decoder.go
+++ b/items/mocks/Decoder.go
@@ -3,7 +3,7 @@
package mocks
import (
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/mocks/Encoder.go b/items/mocks/Encoder.go
similarity index 96%
rename from pkg/items/mocks/Encoder.go
rename to items/mocks/Encoder.go
index cd2dd5c9..d36912bd 100644
--- a/pkg/items/mocks/Encoder.go
+++ b/items/mocks/Encoder.go
@@ -3,7 +3,7 @@
package mocks
import (
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/mocks/ItemObserver.go b/items/mocks/ItemObserver.go
similarity index 100%
rename from pkg/items/mocks/ItemObserver.go
rename to items/mocks/ItemObserver.go
diff --git a/pkg/items/mocks/ItemReadObserver.go b/items/mocks/ItemReadObserver.go
similarity index 98%
rename from pkg/items/mocks/ItemReadObserver.go
rename to items/mocks/ItemReadObserver.go
index c6876a5a..f71e94a9 100644
--- a/pkg/items/mocks/ItemReadObserver.go
+++ b/items/mocks/ItemReadObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/mocks/Items.go b/items/mocks/Items.go
similarity index 99%
rename from pkg/items/mocks/Items.go
rename to items/mocks/Items.go
index e134822e..590d55a6 100644
--- a/pkg/items/mocks/Items.go
+++ b/items/mocks/Items.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
mock "github.com/stretchr/testify/mock"
schema "git.perx.ru/perxis/perxis-go/pkg/schema"
diff --git a/pkg/items/mocks/Middleware.go b/items/mocks/Middleware.go
similarity index 95%
rename from pkg/items/mocks/Middleware.go
rename to items/mocks/Middleware.go
index 0bebef84..8edb1f1c 100644
--- a/pkg/items/mocks/Middleware.go
+++ b/items/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/mocks/PreSaver.go b/items/mocks/PreSaver.go
similarity index 97%
rename from pkg/items/mocks/PreSaver.go
rename to items/mocks/PreSaver.go
index 3acc3273..3ae38628 100644
--- a/pkg/items/mocks/PreSaver.go
+++ b/items/mocks/PreSaver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
field "git.perx.ru/perxis/perxis-go/pkg/schema/field"
mock "github.com/stretchr/testify/mock"
diff --git a/pkg/items/mocks/ProcessDataFunc.go b/items/mocks/ProcessDataFunc.go
similarity index 100%
rename from pkg/items/mocks/ProcessDataFunc.go
rename to items/mocks/ProcessDataFunc.go
diff --git a/pkg/items/mocks/Storage.go b/items/mocks/Storage.go
similarity index 99%
rename from pkg/items/mocks/Storage.go
rename to items/mocks/Storage.go
index 4ce04d02..78647187 100644
--- a/pkg/items/mocks/Storage.go
+++ b/items/mocks/Storage.go
@@ -7,7 +7,7 @@ import (
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
diff --git a/pkg/items/observer.go b/items/observer.go
similarity index 100%
rename from pkg/items/observer.go
rename to items/observer.go
diff --git a/pkg/items/options.go b/items/options.go
similarity index 100%
rename from pkg/items/options.go
rename to items/options.go
diff --git a/pkg/items/pagination.go b/items/pagination.go
similarity index 100%
rename from pkg/items/pagination.go
rename to items/pagination.go
diff --git a/pkg/items/pagination_test.go b/items/pagination_test.go
similarity index 100%
rename from pkg/items/pagination_test.go
rename to items/pagination_test.go
diff --git a/pkg/items/service.go b/items/service.go
similarity index 100%
rename from pkg/items/service.go
rename to items/service.go
diff --git a/pkg/items/storage.go b/items/storage.go
similarity index 100%
rename from pkg/items/storage.go
rename to items/storage.go
diff --git a/pkg/items/storage_options.go b/items/storage_options.go
similarity index 100%
rename from pkg/items/storage_options.go
rename to items/storage_options.go
diff --git a/pkg/items/stub.go b/items/stub.go
similarity index 100%
rename from pkg/items/stub.go
rename to items/stub.go
diff --git a/pkg/items/transport/client.go b/items/transport/client.go
similarity index 99%
rename from pkg/items/transport/client.go
rename to items/transport/client.go
index fd5de3f2..5a566bb9 100644
--- a/pkg/items/transport/client.go
+++ b/items/transport/client.go
@@ -5,8 +5,8 @@ package transport
import (
"context"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"github.com/hashicorp/go-multierror"
"google.golang.org/grpc/status"
diff --git a/pkg/items/transport/endpoints.microgen.go b/items/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/items/transport/endpoints.microgen.go
rename to items/transport/endpoints.microgen.go
diff --git a/pkg/items/transport/exchanges.microgen.go b/items/transport/exchanges.microgen.go
similarity index 99%
rename from pkg/items/transport/exchanges.microgen.go
rename to items/transport/exchanges.microgen.go
index be18dc59..5a10ce6c 100644
--- a/pkg/items/transport/exchanges.microgen.go
+++ b/items/transport/exchanges.microgen.go
@@ -3,7 +3,7 @@
package transport
import (
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
schema "git.perx.ru/perxis/perxis-go/pkg/schema"
)
diff --git a/pkg/items/transport/grpc/client.go b/items/transport/grpc/client.go
similarity index 96%
rename from pkg/items/transport/grpc/client.go
rename to items/transport/grpc/client.go
index faea7cc6..21e2ea38 100644
--- a/pkg/items/transport/grpc/client.go
+++ b/items/transport/grpc/client.go
@@ -3,8 +3,8 @@
package transportgrpc
import (
+ transport "git.perx.ru/perxis/perxis-go/items/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/items/transport/grpc/client.microgen.go b/items/transport/grpc/client.microgen.go
similarity index 98%
rename from pkg/items/transport/grpc/client.microgen.go
rename to items/transport/grpc/client.microgen.go
index 228f43fa..225618f2 100644
--- a/pkg/items/transport/grpc/client.microgen.go
+++ b/items/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
+ transport "git.perx.ru/perxis/perxis-go/items/transport"
pb "git.perx.ru/perxis/perxis-go/proto/items"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go b/items/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to items/transport/grpc/protobuf_endpoint_converters.microgen.go
index 47208ce5..c4b73fb7 100644
--- a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/items/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/items"
- transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
+ "git.perx.ru/perxis/perxis-go/items"
+ transport "git.perx.ru/perxis/perxis-go/items/transport"
pb "git.perx.ru/perxis/perxis-go/proto/items"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go b/items/transport/grpc/protobuf_type_converters.microgen.go
similarity index 99%
rename from pkg/items/transport/grpc/protobuf_type_converters.microgen.go
rename to items/transport/grpc/protobuf_type_converters.microgen.go
index 1aba4865..42259cf6 100644
--- a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
+++ b/items/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,9 +7,9 @@ package transportgrpc
import (
"fmt"
+ service "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/filter"
- service "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/schema"
pbcommon "git.perx.ru/perxis/perxis-go/proto/common"
diff --git a/pkg/items/transport/grpc/server.go b/items/transport/grpc/server.go
similarity index 95%
rename from pkg/items/transport/grpc/server.go
rename to items/transport/grpc/server.go
index 4ac8a3b0..c626ec4c 100644
--- a/pkg/items/transport/grpc/server.go
+++ b/items/transport/grpc/server.go
@@ -1,9 +1,9 @@
package transportgrpc
import (
+ "git.perx.ru/perxis/perxis-go/items"
+ "git.perx.ru/perxis/perxis-go/items/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- "git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/items/transport"
pb "git.perx.ru/perxis/perxis-go/proto/items"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/items/transport/grpc/server.microgen.go b/items/transport/grpc/server.microgen.go
similarity index 99%
rename from pkg/items/transport/grpc/server.microgen.go
rename to items/transport/grpc/server.microgen.go
index 2bc78262..55383827 100644
--- a/pkg/items/transport/grpc/server.microgen.go
+++ b/items/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/items/transport"
+ transport "git.perx.ru/perxis/perxis-go/items/transport"
pb "git.perx.ru/perxis/perxis-go/proto/items"
grpc "github.com/go-kit/kit/transport/grpc"
context "golang.org/x/net/context"
diff --git a/pkg/items/transport/server.microgen.go b/items/transport/server.microgen.go
similarity index 99%
rename from pkg/items/transport/server.microgen.go
rename to items/transport/server.microgen.go
index 10d831bb..77e0bed2 100644
--- a/pkg/items/transport/server.microgen.go
+++ b/items/transport/server.microgen.go
@@ -6,8 +6,8 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/items"
endpoint "github.com/go-kit/kit/endpoint"
"github.com/hashicorp/go-multierror"
)
diff --git a/logs/service.go b/logs/service.go
index 34b3b4e6..a2df1a4c 100644
--- a/logs/service.go
+++ b/logs/service.go
@@ -3,7 +3,7 @@ package logs
import (
"context"
- itemstransportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
+ itemstransportgrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc"
"git.perx.ru/perxis/perxis-go/pkg/options"
pb "git.perx.ru/perxis/perxis-go/proto/logs"
)
diff --git a/logs/zap/entry_encoder_test.go b/logs/zap/entry_encoder_test.go
index 13788bda..fd94de7a 100644
--- a/logs/zap/entry_encoder_test.go
+++ b/logs/zap/entry_encoder_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/logs"
- "git.perx.ru/perxis/perxis-go/pkg/items"
logzap "git.perx.ru/perxis/perxis-go/zap"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index dc182fb0..04688dff 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -7,10 +7,10 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/logs"
logmocks "git.perx.ru/perxis/perxis-go/logs/mocks"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/users"
usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
logzap "git.perx.ru/perxis/perxis-go/zap"
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784..f9314d4d 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,6 +3,8 @@ package content
import (
"time"
+ itemsSvc "git.perx.ru/perxis/perxis-go/items/middleware"
+ itemsTransportGrpc "git.perx.ru/perxis/perxis-go/items/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"
@@ -14,8 +16,6 @@ import (
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"
- itemsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
localesSvc "git.perx.ru/perxis/perxis-go/pkg/locales/middleware"
localsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/locales/transport/grpc"
referencesSvc "git.perx.ru/perxis/perxis-go/pkg/references/middleware"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e93..d049c4c6 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,13 +1,13 @@
package content
import (
+ "git.perx.ru/perxis/perxis-go/items"
"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"
"git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/roles"
diff --git a/pkg/delivery/client/adapter.go b/pkg/delivery/client/adapter.go
index df4c1722..bf6aeb9b 100644
--- a/pkg/delivery/client/adapter.go
+++ b/pkg/delivery/client/adapter.go
@@ -3,10 +3,10 @@ package client
import (
"context"
+ "git.perx.ru/perxis/perxis-go/items"
"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..46513c31 100644
--- a/pkg/delivery/client/client.go
+++ b/pkg/delivery/client/client.go
@@ -3,13 +3,13 @@ package client
import (
"time"
+ items "git.perx.ru/perxis/perxis-go/items/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..e73c9626 100644
--- a/pkg/delivery/middleware/telemetry_middleware.go
+++ b/pkg/delivery/middleware/telemetry_middleware.go
@@ -11,11 +11,11 @@ import (
"time"
oid "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"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"
"go.opentelemetry.io/otel"
diff --git a/pkg/delivery/mocks/Delivery.go b/pkg/delivery/mocks/Delivery.go
index 6a10b46a..60e858cf 100644
--- a/pkg/delivery/mocks/Delivery.go
+++ b/pkg/delivery/mocks/Delivery.go
@@ -9,7 +9,7 @@ import (
environments "git.perx.ru/perxis/perxis-go/pkg/environments"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
diff --git a/pkg/delivery/service.go b/pkg/delivery/service.go
index 9f084740..5f17a823 100644
--- a/pkg/delivery/service.go
+++ b/pkg/delivery/service.go
@@ -3,9 +3,9 @@ package delivery
import (
"context"
+ "git.perx.ru/perxis/perxis-go/items"
"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..95d12461 100644
--- a/pkg/delivery/service/service.go
+++ b/pkg/delivery/service/service.go
@@ -3,10 +3,10 @@ package service
import (
"context"
+ "git.perx.ru/perxis/perxis-go/items"
"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..b01fb27f 100644
--- a/pkg/delivery/transport/client.go
+++ b/pkg/delivery/transport/client.go
@@ -5,9 +5,9 @@ package transport
import (
"context"
+ items "git.perx.ru/perxis/perxis-go/items"
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..686d13f7 100644
--- a/pkg/delivery/transport/exchanges.microgen.go
+++ b/pkg/delivery/transport/exchanges.microgen.go
@@ -3,9 +3,9 @@
package transport
import (
+ items "git.perx.ru/perxis/perxis-go/items"
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..3a64c7b3 100644
--- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,10 +7,10 @@ package transportgrpc
import (
"fmt"
+ items "git.perx.ru/perxis/perxis-go/items"
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"
services "git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/schema"
diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go
index c7dd6285..258ad09f 100644
--- a/pkg/extension/storage.go
+++ b/pkg/extension/storage.go
@@ -11,8 +11,8 @@ import (
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
"go.uber.org/zap"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/items"
)
type (
diff --git a/pkg/files/field.go b/pkg/files/field.go
index 73868313..530cf125 100644
--- a/pkg/files/field.go
+++ b/pkg/files/field.go
@@ -8,7 +8,7 @@ import (
"net/url"
"reflect"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
signer "git.perx.ru/perxis/perxis-go/pkg/urlsigner"
"github.com/mitchellh/mapstructure"
diff --git a/pkg/references/field.go b/pkg/references/field.go
index f80e7b5a..17fdcf9d 100644
--- a/pkg/references/field.go
+++ b/pkg/references/field.go
@@ -5,9 +5,9 @@ import (
"fmt"
"reflect"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
)
diff --git a/pkg/references/field_test.go b/pkg/references/field_test.go
index ac9d5c03..adcbb8d9 100644
--- a/pkg/references/field_test.go
+++ b/pkg/references/field_test.go
@@ -6,8 +6,8 @@ import (
"fmt"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
+ "git.perx.ru/perxis/perxis-go/items"
+ "git.perx.ru/perxis/perxis-go/items/mocks"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
"git.perx.ru/perxis/perxis-go/pkg/schema/validate"
diff --git a/pkg/references/middleware/access_logging_middleware.go b/pkg/references/middleware/access_logging_middleware.go
index b5fe1165..2ef50809 100644
--- a/pkg/references/middleware/access_logging_middleware.go
+++ b/pkg/references/middleware/access_logging_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/client_encode_middleware.go b/pkg/references/middleware/client_encode_middleware.go
index b6ea043b..7401ed8c 100644
--- a/pkg/references/middleware/client_encode_middleware.go
+++ b/pkg/references/middleware/client_encode_middleware.go
@@ -3,8 +3,8 @@ package middleware
import (
"context"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
)
diff --git a/pkg/references/middleware/error_logging_middleware.go b/pkg/references/middleware/error_logging_middleware.go
index a68dc8f8..dd831545 100644
--- a/pkg/references/middleware/error_logging_middleware.go
+++ b/pkg/references/middleware/error_logging_middleware.go
@@ -9,7 +9,7 @@ package middleware
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/recovering_middleware.go b/pkg/references/middleware/recovering_middleware.go
index cc8a87ff..4861cb56 100644
--- a/pkg/references/middleware/recovering_middleware.go
+++ b/pkg/references/middleware/recovering_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
"go.uber.org/zap"
)
diff --git a/pkg/references/middleware/telemetry_middleware.go b/pkg/references/middleware/telemetry_middleware.go
index 3e8fbb77..1225945b 100644
--- a/pkg/references/middleware/telemetry_middleware.go
+++ b/pkg/references/middleware/telemetry_middleware.go
@@ -11,8 +11,8 @@ import (
"time"
oid "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
diff --git a/pkg/references/mocks/References.go b/pkg/references/mocks/References.go
index 92c8e290..c20bbdd1 100644
--- a/pkg/references/mocks/References.go
+++ b/pkg/references/mocks/References.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
mock "github.com/stretchr/testify/mock"
references "git.perx.ru/perxis/perxis-go/pkg/references"
diff --git a/pkg/references/reference.go b/pkg/references/reference.go
index 676f208c..30bcef5d 100644
--- a/pkg/references/reference.go
+++ b/pkg/references/reference.go
@@ -3,7 +3,7 @@ package references
import (
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
pb "git.perx.ru/perxis/perxis-go/proto/references"
"go.mongodb.org/mongo-driver/bson"
)
diff --git a/pkg/references/service.go b/pkg/references/service.go
index 2380a787..4567d2c6 100644
--- a/pkg/references/service.go
+++ b/pkg/references/service.go
@@ -3,7 +3,7 @@ package references
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
)
// @microgen grpc
diff --git a/pkg/references/transport/client.go b/pkg/references/transport/client.go
index 45f10f4f..b73d3853 100644
--- a/pkg/references/transport/client.go
+++ b/pkg/references/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- items "git.perx.ru/perxis/perxis-go/pkg/items"
+ items "git.perx.ru/perxis/perxis-go/items"
references "git.perx.ru/perxis/perxis-go/pkg/references"
)
diff --git a/pkg/references/transport/exchanges.microgen.go b/pkg/references/transport/exchanges.microgen.go
index 4d0b51bf..b9d42070 100644
--- a/pkg/references/transport/exchanges.microgen.go
+++ b/pkg/references/transport/exchanges.microgen.go
@@ -3,7 +3,7 @@
package transport
import (
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/references"
)
diff --git a/pkg/references/transport/grpc/protobuf_type_converters.microgen.go b/pkg/references/transport/grpc/protobuf_type_converters.microgen.go
index 965122b7..3b82270f 100644
--- a/pkg/references/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/references/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/items"
- itemstransportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
+ "git.perx.ru/perxis/perxis-go/items"
+ itemstransportgrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc"
service "git.perx.ru/perxis/perxis-go/pkg/references"
itemspb "git.perx.ru/perxis/perxis-go/proto/items"
pb "git.perx.ru/perxis/perxis-go/proto/references"
diff --git a/pkg/setup/item.go b/pkg/setup/item.go
index adf79935..b84a6b7d 100644
--- a/pkg/setup/item.go
+++ b/pkg/setup/item.go
@@ -7,9 +7,9 @@ import (
"go.uber.org/zap"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/items"
)
var (
diff --git a/pkg/setup/item_test.go b/pkg/setup/item_test.go
index 0a128625..6fa7e541 100644
--- a/pkg/setup/item_test.go
+++ b/pkg/setup/item_test.go
@@ -4,12 +4,12 @@ import (
"context"
"testing"
+ itemsMock "git.perx.ru/perxis/perxis-go/items/mocks"
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- itemsMock "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
"github.com/stretchr/testify/mock"
- "git.perx.ru/perxis/perxis-go/pkg/items"
+ "git.perx.ru/perxis/perxis-go/items"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745..a7663b67 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,11 +5,11 @@ import (
"errors"
"testing"
+ itemsMock "git.perx.ru/perxis/perxis-go/items/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"
"git.perx.ru/perxis/perxis-go/pkg/spaces/mocks"
@@ -17,10 +17,10 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"go.uber.org/zap/zaptest"
diff --git a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
index 6797cc20..20bac499 100644
--- a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
"context"
"errors"
- transportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
+ transportgrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc"
transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
empty "google.golang.org/protobuf/types/known/emptypb"
diff --git a/pkg/template/builder_test.go b/pkg/template/builder_test.go
index 128f7064..85622790 100644
--- a/pkg/template/builder_test.go
+++ b/pkg/template/builder_test.go
@@ -5,13 +5,13 @@ import (
"errors"
"testing"
+ "git.perx.ru/perxis/perxis-go/items"
+ mocksitems "git.perx.ru/perxis/perxis-go/items/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"
spsmocks "git.perx.ru/perxis/perxis-go/pkg/spaces/mocks"
"github.com/stretchr/testify/assert"
diff --git a/zap/field_test.go b/zap/field_test.go
index 46c4ee50..9b277f04 100644
--- a/zap/field_test.go
+++ b/zap/field_test.go
@@ -5,8 +5,8 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/items"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/users"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
--
GitLab