diff --git a/id/system/system.go b/id/system/system.go
index c33995d905a615b6c24422e27239da34141d4752..d6ac96e356c3c0e74b9d29c6573fcb8a4555d76e 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -5,12 +5,12 @@ import (
"reflect"
"git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa125e376623ceb710bbe594235b8434d853..f688b0b45501e9107ccb0e2252046a7f947660d7 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -5,11 +5,11 @@ import (
"git.perx.ru/perxis/perxis-go/id"
_ "git.perx.ru/perxis/perxis-go/id/system"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/locales/errors.go b/locales/errors.go
similarity index 100%
rename from pkg/locales/errors.go
rename to locales/errors.go
diff --git a/pkg/locales/events.go b/locales/events.go
similarity index 100%
rename from pkg/locales/events.go
rename to locales/events.go
diff --git a/pkg/locales/locale.go b/locales/locale.go
similarity index 100%
rename from pkg/locales/locale.go
rename to locales/locale.go
diff --git a/pkg/locales/locale_test.go b/locales/locale_test.go
similarity index 100%
rename from pkg/locales/locale_test.go
rename to locales/locale_test.go
diff --git a/pkg/locales/middleware/access_logging_middleware.go b/locales/middleware/access_logging_middleware.go
similarity index 92%
rename from pkg/locales/middleware/access_logging_middleware.go
rename to locales/middleware/access_logging_middleware.go
index ab31fc8c81ec51af35e63ab8eadbc400a9b717db..a4b9784d2df7a405b395dc9de3d841ea822746b4 100644
--- a/pkg/locales/middleware/access_logging_middleware.go
+++ b/locales/middleware/access_logging_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/locales -i Locales -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
"go.uber.org/zap"
)
diff --git a/pkg/locales/middleware/caching_middleware.go b/locales/middleware/caching_middleware.go
similarity index 96%
rename from pkg/locales/middleware/caching_middleware.go
rename to locales/middleware/caching_middleware.go
index 64f82bc2347323140674cb7375bfe41a36a5bfb0..9781b324936bb93c0ec892954d7f6ec54d5f270a 100644
--- a/pkg/locales/middleware/caching_middleware.go
+++ b/locales/middleware/caching_middleware.go
@@ -3,9 +3,9 @@ package middleware
import (
"context"
+ service "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/cache"
"git.perx.ru/perxis/perxis-go/pkg/data"
- service "git.perx.ru/perxis/perxis-go/pkg/locales"
)
func CachingMiddleware(cache cache.Cache) Middleware {
diff --git a/pkg/locales/middleware/caching_middleware_test.go b/locales/middleware/caching_middleware_test.go
similarity index 98%
rename from pkg/locales/middleware/caching_middleware_test.go
rename to locales/middleware/caching_middleware_test.go
index 25b542c840c228324f843267ae3968f96d0ddfe5..40b9f5ba89ea3157fac7f9838eac26750a82f217 100644
--- a/pkg/locales/middleware/caching_middleware_test.go
+++ b/locales/middleware/caching_middleware_test.go
@@ -5,9 +5,9 @@ import (
"testing"
"time"
+ "git.perx.ru/perxis/perxis-go/locales"
+ locmocks "git.perx.ru/perxis/perxis-go/locales/mocks"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
- locmocks "git.perx.ru/perxis/perxis-go/pkg/locales/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/locales/middleware/error_logging_middleware.go b/locales/middleware/error_logging_middleware.go
similarity index 89%
rename from pkg/locales/middleware/error_logging_middleware.go
rename to locales/middleware/error_logging_middleware.go
index 0dd4ae2e6748c35fa7a0592c274a9dfeb86f5d7b..762f400a349a23c3d94a309697ec7ef45222eb2f 100644
--- a/pkg/locales/middleware/error_logging_middleware.go
+++ b/locales/middleware/error_logging_middleware.go
@@ -4,12 +4,12 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/locales -i Locales -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
+ "git.perx.ru/perxis/perxis-go/locales"
"go.uber.org/zap"
)
diff --git a/pkg/locales/middleware/logging_middleware.go b/locales/middleware/logging_middleware.go
similarity index 98%
rename from pkg/locales/middleware/logging_middleware.go
rename to locales/middleware/logging_middleware.go
index 2b6bfea5281a89bf9050094fe2d631fed200c9a4..af99bc7db81c9a85a4b9aa00ff4f08e1668df4e6 100644
--- a/pkg/locales/middleware/logging_middleware.go
+++ b/locales/middleware/logging_middleware.go
@@ -4,7 +4,7 @@ import (
"context"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
+ "git.perx.ru/perxis/perxis-go/locales"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/locales/middleware/middleware.go b/locales/middleware/middleware.go
similarity index 73%
rename from pkg/locales/middleware/middleware.go
rename to locales/middleware/middleware.go
index 28c61113902b15acf844d8a6251f0369159128a0..357a2cc2e0ac4cc33fa26562d7580a33a9c20717 100644
--- a/pkg/locales/middleware/middleware.go
+++ b/locales/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/locales -i Locales -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/locales"
+ "git.perx.ru/perxis/perxis-go/locales"
"go.uber.org/zap"
)
diff --git a/pkg/locales/middleware/recovering_middleware.go b/locales/middleware/recovering_middleware.go
similarity index 90%
rename from pkg/locales/middleware/recovering_middleware.go
rename to locales/middleware/recovering_middleware.go
index 85f14bdbe6493c40c24c91bf539e33b9ca7e397b..b72cc3ef11d15c1821861f6f392c906702fbb22e 100644
--- a/pkg/locales/middleware/recovering_middleware.go
+++ b/locales/middleware/recovering_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/locales -i Locales -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
+ "git.perx.ru/perxis/perxis-go/locales"
"go.uber.org/zap"
)
diff --git a/pkg/locales/middleware/telemetry_middleware.go b/locales/middleware/telemetry_middleware.go
similarity index 97%
rename from pkg/locales/middleware/telemetry_middleware.go
rename to locales/middleware/telemetry_middleware.go
index 709a6bab9a23210954ae0c756e6c10ac7fa2bd05..62ffc2f8d3f645b1524a2e836533631dd79ace5c 100644
--- a/pkg/locales/middleware/telemetry_middleware.go
+++ b/locales/middleware/telemetry_middleware.go
@@ -4,15 +4,15 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/locales -i Locales -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/locales"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/locales/mocks/Locales.go b/locales/mocks/Locales.go
similarity index 98%
rename from pkg/locales/mocks/Locales.go
rename to locales/mocks/Locales.go
index 6519e3cc9b5e02895fa22b778c15437737f606de..6d0f0d1e00d5989f6c715628fd53dac411cffa3c 100644
--- a/pkg/locales/mocks/Locales.go
+++ b/locales/mocks/Locales.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/locales/mocks/Middleware.go b/locales/mocks/Middleware.go
similarity index 95%
rename from pkg/locales/mocks/Middleware.go
rename to locales/mocks/Middleware.go
index bab6711d69138d1b72529c89c979f9e03dd47cd1..fea87768ab3c66bb731ceac59d8383dd978365f3 100644
--- a/pkg/locales/mocks/Middleware.go
+++ b/locales/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/locales/mocks/Storage.go b/locales/mocks/Storage.go
similarity index 98%
rename from pkg/locales/mocks/Storage.go
rename to locales/mocks/Storage.go
index 42946781b45c100bfb962fde0a2f6098699cec80..a691a5a5f82a6241de00f9516d6e8c2661090c3c 100644
--- a/pkg/locales/mocks/Storage.go
+++ b/locales/mocks/Storage.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
mock "github.com/stretchr/testify/mock"
options "git.perx.ru/perxis/perxis-go/pkg/options"
diff --git a/pkg/locales/observer.go b/locales/observer.go
similarity index 100%
rename from pkg/locales/observer.go
rename to locales/observer.go
diff --git a/pkg/locales/service.go b/locales/service.go
similarity index 100%
rename from pkg/locales/service.go
rename to locales/service.go
diff --git a/pkg/locales/storage.go b/locales/storage.go
similarity index 100%
rename from pkg/locales/storage.go
rename to locales/storage.go
diff --git a/pkg/locales/transport/client.go b/locales/transport/client.go
similarity index 95%
rename from pkg/locales/transport/client.go
rename to locales/transport/client.go
index 1aa9dc5169737c91ef96c981405ec6dbcea048c2..d755e7dbbd2f39183f45ba828890016aa60b69cb 100644
--- a/pkg/locales/transport/client.go
+++ b/locales/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *locales.Locale) (res0 *locales.Locale, res1 error) {
diff --git a/pkg/locales/transport/endpoints.microgen.go b/locales/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/locales/transport/endpoints.microgen.go
rename to locales/transport/endpoints.microgen.go
diff --git a/pkg/locales/transport/exchanges.microgen.go b/locales/transport/exchanges.microgen.go
similarity index 91%
rename from pkg/locales/transport/exchanges.microgen.go
rename to locales/transport/exchanges.microgen.go
index 14a4f1a6492f172de8f2b3df62ae6f632804f62f..5c8834f80cf56d8ffe5f72b3d58d37748ca6ef4c 100644
--- a/pkg/locales/transport/exchanges.microgen.go
+++ b/locales/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+import locales "git.perx.ru/perxis/perxis-go/locales"
type (
CreateRequest struct {
diff --git a/pkg/locales/transport/grpc/client.go b/locales/transport/grpc/client.go
similarity index 90%
rename from pkg/locales/transport/grpc/client.go
rename to locales/transport/grpc/client.go
index 877400ddeeaa54b265e43407bff4a9df548ff1be..0191ef77e5760d72a6191024a76d894b54ede08b 100644
--- a/pkg/locales/transport/grpc/client.go
+++ b/locales/transport/grpc/client.go
@@ -3,8 +3,8 @@
package transportgrpc
import (
+ transport "git.perx.ru/perxis/perxis-go/locales/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/locales/transport/grpc/client.microgen.go b/locales/transport/grpc/client.microgen.go
similarity index 94%
rename from pkg/locales/transport/grpc/client.microgen.go
rename to locales/transport/grpc/client.microgen.go
index a8c0b9fcb06a8ed08edf72e495ceb240e2e53b80..40e7fba937943106b78095fa1793e0da20cc4778 100644
--- a/pkg/locales/transport/grpc/client.microgen.go
+++ b/locales/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
+ transport "git.perx.ru/perxis/perxis-go/locales/transport"
pb "git.perx.ru/perxis/perxis-go/proto/locales"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go b/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 98%
rename from pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to locales/transport/grpc/protobuf_endpoint_converters.microgen.go
index c9c534131bf7e3be03bce9aeadfa3957d252ae2f..a21833c7426de2686ac39529fa4daf90e05089e2 100644
--- a/pkg/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/locales/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
"context"
"errors"
- transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
+ transport "git.perx.ru/perxis/perxis-go/locales/transport"
pb "git.perx.ru/perxis/perxis-go/proto/locales"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/locales/transport/grpc/protobuf_type_converters.microgen.go b/locales/transport/grpc/protobuf_type_converters.microgen.go
similarity index 95%
rename from pkg/locales/transport/grpc/protobuf_type_converters.microgen.go
rename to locales/transport/grpc/protobuf_type_converters.microgen.go
index 4932a7d497ea2d0df148dddbfb0a7bbda3dca300..5ca9fdcc08e6af75a544db375d4bef1957bcce67 100644
--- a/pkg/locales/transport/grpc/protobuf_type_converters.microgen.go
+++ b/locales/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
package transportgrpc
import (
- service "git.perx.ru/perxis/perxis-go/pkg/locales"
+ service "git.perx.ru/perxis/perxis-go/locales"
pb "git.perx.ru/perxis/perxis-go/proto/locales"
)
diff --git a/pkg/locales/transport/grpc/server.go b/locales/transport/grpc/server.go
similarity index 86%
rename from pkg/locales/transport/grpc/server.go
rename to locales/transport/grpc/server.go
index ca4f95aeff638c95da871d40b9ce999b1b108299..1dee207144d05d485715e4130a4e27582f54fcd3 100644
--- a/pkg/locales/transport/grpc/server.go
+++ b/locales/transport/grpc/server.go
@@ -1,9 +1,9 @@
package transportgrpc
import (
+ "git.perx.ru/perxis/perxis-go/locales"
+ "git.perx.ru/perxis/perxis-go/locales/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
pb "git.perx.ru/perxis/perxis-go/proto/locales"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/locales/transport/grpc/server.microgen.go b/locales/transport/grpc/server.microgen.go
similarity index 96%
rename from pkg/locales/transport/grpc/server.microgen.go
rename to locales/transport/grpc/server.microgen.go
index 80778f883bafb2aba5d926526b162cded6db53a7..c3a6307dc8228f6f403375087a4cc3a949fa0543 100644
--- a/pkg/locales/transport/grpc/server.microgen.go
+++ b/locales/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/locales/transport"
+ transport "git.perx.ru/perxis/perxis-go/locales/transport"
pb "git.perx.ru/perxis/perxis-go/proto/locales"
grpc "github.com/go-kit/kit/transport/grpc"
context "golang.org/x/net/context"
diff --git a/pkg/locales/transport/server.microgen.go b/locales/transport/server.microgen.go
similarity index 96%
rename from pkg/locales/transport/server.microgen.go
rename to locales/transport/server.microgen.go
index 081edcd5c304fa5526e031181e80c78903b1e707..081d9d5e4e5fa691fe07e5fbfd734dcc148f2cdf 100644
--- a/pkg/locales/transport/server.microgen.go
+++ b/locales/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
endpoint "github.com/go-kit/kit/endpoint"
)
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784dff8fccd5b505867bf65efb373a9149d..9b52fcc5cea55a64555d1d153737bfe9b2d7c7ad 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,6 +3,8 @@ package content
import (
"time"
+ localesSvc "git.perx.ru/perxis/perxis-go/locales/middleware"
+ localsTransportGrpc "git.perx.ru/perxis/perxis-go/locales/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"
@@ -16,8 +18,6 @@ import (
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"
referencesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/references/transport/grpc"
rolesSvc "git.perx.ru/perxis/perxis-go/pkg/roles/middleware"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..fa106819f8c73a0da6f23a05bdf1cb83d8c93131 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,6 +1,7 @@
package content
import (
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
@@ -8,7 +9,6 @@ import (
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/delivery/client/adapter.go b/pkg/delivery/client/adapter.go
index df4c1722cae2ee0abb3be12e58e9f5232bac2bb7..ead31486c043d15b2ceceef6a2b402577f5c488d 100644
--- a/pkg/delivery/client/adapter.go
+++ b/pkg/delivery/client/adapter.go
@@ -3,11 +3,11 @@ package client
import (
"context"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
)
type envsAdapter struct {
diff --git a/pkg/delivery/client/client.go b/pkg/delivery/client/client.go
index e3fb962c22cd76d4adc2cbd5ca9d6195eb9e41d6..aed1f03c8c8d18f695e349cbc604674c6f46eb12 100644
--- a/pkg/delivery/client/client.go
+++ b/pkg/delivery/client/client.go
@@ -3,6 +3,7 @@ package client
import (
"time"
+ locales "git.perx.ru/perxis/perxis-go/locales/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"
@@ -10,7 +11,6 @@ import (
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..f3e4eb7db5591769839a9570dda23dd90701f921 100644
--- a/pkg/delivery/middleware/telemetry_middleware.go
+++ b/pkg/delivery/middleware/telemetry_middleware.go
@@ -11,12 +11,12 @@ import (
"time"
oid "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/delivery/mocks/Delivery.go b/pkg/delivery/mocks/Delivery.go
index 6a10b46a01d7d3972338b26d2c82de0f46458b51..df329f82f8066da8d2f02996b4e92ea2d9ec6277 100644
--- a/pkg/delivery/mocks/Delivery.go
+++ b/pkg/delivery/mocks/Delivery.go
@@ -11,7 +11,7 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/delivery/service.go b/pkg/delivery/service.go
index 9f084740499a5d620d158c4ef97555d4ed5acca6..f741921df4aef01e79335b05dbc7ddf3882e86df 100644
--- a/pkg/delivery/service.go
+++ b/pkg/delivery/service.go
@@ -3,10 +3,10 @@ package delivery
import (
"context"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
)
// @microgen grpc
diff --git a/pkg/delivery/service/service.go b/pkg/delivery/service/service.go
index be71148108f3296ce5a66d6a6f1f347a81671999..c4d3584bd1bf95b84b4342e3683857d66719e447 100644
--- a/pkg/delivery/service/service.go
+++ b/pkg/delivery/service/service.go
@@ -3,11 +3,11 @@ package service
import (
"context"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
)
type Config struct {
diff --git a/pkg/delivery/service/service_test.go b/pkg/delivery/service/service_test.go
index 88bcc16f63b3e00c84c8e02cd2939600339400d4..bd85d5ace83cd93d34d066e75348b45909adfa55 100644
--- a/pkg/delivery/service/service_test.go
+++ b/pkg/delivery/service/service_test.go
@@ -4,8 +4,8 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/locales/mocks"
+ "git.perx.ru/perxis/perxis-go/locales"
+ "git.perx.ru/perxis/perxis-go/locales/mocks"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/delivery/transport/client.go b/pkg/delivery/transport/client.go
index 39c110029c1c78df3ccf4c01ef1073612fbba2c7..abb4f80b77b8c93c89f68e5200c8e4e8212d27f6 100644
--- a/pkg/delivery/transport/client.go
+++ b/pkg/delivery/transport/client.go
@@ -5,10 +5,10 @@ package transport
import (
"context"
+ locales "git.perx.ru/perxis/perxis-go/locales"
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"
)
func (set EndpointsSet) ListLocales(arg0 context.Context, arg1 string) (res0 []*locales.Locale, res1 error) {
diff --git a/pkg/delivery/transport/exchanges.microgen.go b/pkg/delivery/transport/exchanges.microgen.go
index 3e0f4c8958cc3cb58608e4e6676c8c4163a83cd0..01b6abed27725db40b4fde55d9d68e4edb9daba9 100644
--- a/pkg/delivery/transport/exchanges.microgen.go
+++ b/pkg/delivery/transport/exchanges.microgen.go
@@ -3,10 +3,10 @@
package transport
import (
+ locales "git.perx.ru/perxis/perxis-go/locales"
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"
)
type (
diff --git a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
index 7067dc51722117ddc00dd6208de6da9bd8a8e9bd..ee99ee1308d38bbe362ab1595ce4872d4a165d1d 100644
--- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
@@ -7,11 +7,11 @@ package transportgrpc
import (
"fmt"
+ locales "git.perx.ru/perxis/perxis-go/locales"
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"
collectionspb "git.perx.ru/perxis/perxis-go/proto/collections"
diff --git a/pkg/items/item.go b/pkg/items/item.go
index dc56fe63284be6885cf4560578df0bf77729e359..c749d241000e8f89729bd441801ae66243255d43 100644
--- a/pkg/items/item.go
+++ b/pkg/items/item.go
@@ -5,9 +5,9 @@ import (
"fmt"
"time"
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
"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/localizer"
diff --git a/pkg/items/middleware/caching_middleware.go b/pkg/items/middleware/caching_middleware.go
index 60d3bf80250843f2ddc963fe5d242e58f590a3f7..0a074834698b62f8d882ae3747d88415148dd203 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/pkg/items/middleware/caching_middleware.go
@@ -4,11 +4,11 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/locales"
"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"
)
func makeKey(ss ...string) string {
diff --git a/pkg/items/mocks/Storage.go b/pkg/items/mocks/Storage.go
index 4ce04d02d6985f5e4da86137d74763999da02136..997dc380a297051781f12afdcfd5f7148cd7a540 100644
--- a/pkg/items/mocks/Storage.go
+++ b/pkg/items/mocks/Storage.go
@@ -9,7 +9,7 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
- locales "git.perx.ru/perxis/perxis-go/pkg/locales"
+ locales "git.perx.ru/perxis/perxis-go/locales"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/storage.go b/pkg/items/storage.go
index f673e92290e22cd3ab28f25f1b1d5d35ad84bdde..81213edbd0b0bb07834b83ea827c92a893fbc361 100644
--- a/pkg/items/storage.go
+++ b/pkg/items/storage.go
@@ -3,8 +3,8 @@ package items
import (
"context"
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
)
type Storage interface {
diff --git a/pkg/items/storage_options.go b/pkg/items/storage_options.go
index a56232fb22b2cac5a8555952b5898bf229fc875a..556362643411704244c95153f8a1e27bc89017cf 100644
--- a/pkg/items/storage_options.go
+++ b/pkg/items/storage_options.go
@@ -1,7 +1,7 @@
package items
import (
- "git.perx.ru/perxis/perxis-go/pkg/locales"
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/options"
)
diff --git a/pkg/schema/localizer/localizer.go b/pkg/schema/localizer/localizer.go
index 4cc99d6075447c3eefe249f0b2963dca436c6e4f..c9c6fd7cbfec78e1490ceeae9a9d8c6e8d9637c1 100644
--- a/pkg/schema/localizer/localizer.go
+++ b/pkg/schema/localizer/localizer.go
@@ -4,8 +4,8 @@ import (
"context"
"reflect"
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
"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/walk"
diff --git a/pkg/schema/localizer/localizer_test.go b/pkg/schema/localizer/localizer_test.go
index ab6b277cdcad36a1ffdd217f1ec198a2bf958f9f..576691cf0bda1131064c8b1cf7c02af07d0740aa 100644
--- a/pkg/schema/localizer/localizer_test.go
+++ b/pkg/schema/localizer/localizer_test.go
@@ -3,7 +3,7 @@ package localizer
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/locales"
+ "git.perx.ru/perxis/perxis-go/locales"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
"github.com/stretchr/testify/assert"