From 411ad8fb5903af5d74e71c17647649ed673edffd Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 09:01:39 +0300
Subject: [PATCH] pkg locales moved from pkg
---
id/system/system.go | 2 +-
id/test/object_id_test.go | 2 +-
{pkg/locales => locales}/errors.go | 0
{pkg/locales => locales}/events.go | 0
{pkg/locales => locales}/locale.go | 0
{pkg/locales => locales}/locale_test.go | 0
.../middleware/access_logging_middleware.go | 4 ++--
{pkg/locales => locales}/middleware/caching_middleware.go | 2 +-
.../locales => locales}/middleware/caching_middleware_test.go | 4 ++--
.../middleware/error_logging_middleware.go | 4 ++--
{pkg/locales => locales}/middleware/logging_middleware.go | 2 +-
{pkg/locales => locales}/middleware/middleware.go | 4 ++--
{pkg/locales => locales}/middleware/recovering_middleware.go | 4 ++--
{pkg/locales => locales}/middleware/telemetry_middleware.go | 4 ++--
{pkg/locales => locales}/mocks/Locales.go | 2 +-
{pkg/locales => locales}/mocks/Middleware.go | 2 +-
{pkg/locales => locales}/mocks/Storage.go | 2 +-
{pkg/locales => locales}/observer.go | 0
{pkg/locales => locales}/service.go | 0
{pkg/locales => locales}/storage.go | 0
{pkg/locales => locales}/transport/client.go | 2 +-
{pkg/locales => locales}/transport/endpoints.microgen.go | 0
{pkg/locales => locales}/transport/exchanges.microgen.go | 2 +-
{pkg/locales => locales}/transport/grpc/client.go | 2 +-
{pkg/locales => locales}/transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/locales => locales}/transport/grpc/server.go | 4 ++--
{pkg/locales => locales}/transport/grpc/server.microgen.go | 2 +-
{pkg/locales => locales}/transport/server.microgen.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/service/service_test.go | 4 ++--
pkg/delivery/transport/client.go | 2 +-
pkg/delivery/transport/exchanges.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
pkg/items/item.go | 2 +-
pkg/items/middleware/caching_middleware.go | 2 +-
pkg/items/mocks/Storage.go | 2 +-
pkg/items/storage.go | 2 +-
pkg/items/storage_options.go | 2 +-
pkg/schema/localizer/localizer.go | 2 +-
pkg/schema/localizer/localizer_test.go | 2 +-
49 files changed, 50 insertions(+), 50 deletions(-)
rename {pkg/locales => locales}/errors.go (100%)
rename {pkg/locales => locales}/events.go (100%)
rename {pkg/locales => locales}/locale.go (100%)
rename {pkg/locales => locales}/locale_test.go (100%)
rename {pkg/locales => locales}/middleware/access_logging_middleware.go (92%)
rename {pkg/locales => locales}/middleware/caching_middleware.go (96%)
rename {pkg/locales => locales}/middleware/caching_middleware_test.go (98%)
rename {pkg/locales => locales}/middleware/error_logging_middleware.go (89%)
rename {pkg/locales => locales}/middleware/logging_middleware.go (98%)
rename {pkg/locales => locales}/middleware/middleware.go (73%)
rename {pkg/locales => locales}/middleware/recovering_middleware.go (90%)
rename {pkg/locales => locales}/middleware/telemetry_middleware.go (97%)
rename {pkg/locales => locales}/mocks/Locales.go (98%)
rename {pkg/locales => locales}/mocks/Middleware.go (95%)
rename {pkg/locales => locales}/mocks/Storage.go (98%)
rename {pkg/locales => locales}/observer.go (100%)
rename {pkg/locales => locales}/service.go (100%)
rename {pkg/locales => locales}/storage.go (100%)
rename {pkg/locales => locales}/transport/client.go (95%)
rename {pkg/locales => locales}/transport/endpoints.microgen.go (100%)
rename {pkg/locales => locales}/transport/exchanges.microgen.go (91%)
rename {pkg/locales => locales}/transport/grpc/client.go (90%)
rename {pkg/locales => locales}/transport/grpc/client.microgen.go (94%)
rename {pkg/locales => locales}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%)
rename {pkg/locales => locales}/transport/grpc/protobuf_type_converters.microgen.go (95%)
rename {pkg/locales => locales}/transport/grpc/server.go (86%)
rename {pkg/locales => locales}/transport/grpc/server.microgen.go (96%)
rename {pkg/locales => locales}/transport/server.microgen.go (96%)
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..d6ac96e3 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 2f01fa12..f688b0b4 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 ab31fc8c..a4b9784d 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 64f82bc2..9781b324 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 25b542c8..40b9f5ba 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 0dd4ae2e..762f400a 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 2b6bfea5..af99bc7d 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 28c61113..357a2cc2 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 85f14bdb..b72cc3ef 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 709a6bab..62ffc2f8 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 6519e3cc..6d0f0d1e 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 bab6711d..fea87768 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 42946781..a691a5a5 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 1aa9dc51..d755e7db 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 14a4f1a6..5c8834f8 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 877400dd..0191ef77 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 a8c0b9fc..40e7fba9 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 c9c53413..a21833c7 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 4932a7d4..5ca9fdcc 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 ca4f95ae..1dee2071 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 80778f88..c3a6307d 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 081edcd5..081d9d5e 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 adc5f784..9b52fcc5 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 1d351e93..fa106819 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 df4c1722..ead31486 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 e3fb962c..aed1f03c 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 600b6a61..f3e4eb7d 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 6a10b46a..df329f82 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 9f084740..f741921d 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 be711481..c4d3584b 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 88bcc16f..bd85d5ac 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 39c11002..abb4f80b 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 3e0f4c89..01b6abed 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 7067dc51..ee99ee13 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 dc56fe63..c749d241 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 60d3bf80..0a074834 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 4ce04d02..997dc380 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 f673e922..81213edb 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 a56232fb..55636264 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 4cc99d60..c9c6fd7c 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 ab6b277c..576691cf 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"
--
GitLab