diff --git a/assets/templates/middleware/telemetry_content b/assets/templates/middleware/telemetry_content
index ba993954167ae96ff87e8050b3a52aa4b74e2b4f..2f514a1c73af4e8b43b5a1d9b942ffab63f56201 100644
--- a/assets/templates/middleware/telemetry_content
+++ b/assets/templates/middleware/telemetry_content
@@ -2,7 +2,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
pkgId "git.perx.ru/perxis/perxis-go/id"
diff --git a/assets/templates/middleware/telemetry_default b/assets/templates/middleware/telemetry_default
index 1e67da298b9287352454b1f6a95f3021d524a8af..2ee0b43fe995b03dc516de792297f1b102ee92e8 100644
--- a/assets/templates/middleware/telemetry_default
+++ b/assets/templates/middleware/telemetry_default
@@ -2,7 +2,7 @@ import (
"context"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
pkgId "git.perx.ru/perxis/perxis-go/id"
diff --git a/pkg/data/crypto.go b/data/crypto.go
similarity index 100%
rename from pkg/data/crypto.go
rename to data/crypto.go
diff --git a/pkg/data/data.go b/data/data.go
similarity index 100%
rename from pkg/data/data.go
rename to data/data.go
diff --git a/pkg/data/data_test.go b/data/data_test.go
similarity index 100%
rename from pkg/data/data_test.go
rename to data/data_test.go
diff --git a/pkg/data/list.go b/data/list.go
similarity index 100%
rename from pkg/data/list.go
rename to data/list.go
diff --git a/pkg/data/list_test.go b/data/list_test.go
similarity index 100%
rename from pkg/data/list_test.go
rename to data/list_test.go
diff --git a/pkg/data/strings.go b/data/strings.go
similarity index 100%
rename from pkg/data/strings.go
rename to data/strings.go
diff --git a/pkg/data/strings_test.go b/data/strings_test.go
similarity index 100%
rename from pkg/data/strings_test.go
rename to data/strings_test.go
diff --git a/pkg/data/translit.go b/data/translit.go
similarity index 100%
rename from pkg/data/translit.go
rename to data/translit.go
diff --git a/pkg/data/translit_test.go b/data/translit_test.go
similarity index 100%
rename from pkg/data/translit_test.go
rename to data/translit_test.go
diff --git a/pkg/events/events.go b/events/events.go
similarity index 100%
rename from pkg/events/events.go
rename to events/events.go
diff --git a/pkg/events/mocks/Connection.go b/events/mocks/Connection.go
similarity index 98%
rename from pkg/events/mocks/Connection.go
rename to events/mocks/Connection.go
index a295924662ba10243a788c219359d60720789759..dea04a11727be808712eb89ee461cf964290bcc9 100644
--- a/pkg/events/mocks/Connection.go
+++ b/events/mocks/Connection.go
@@ -3,7 +3,7 @@
package mocks
import (
- events "git.perx.ru/perxis/perxis-go/pkg/events"
+ "git.perx.ru/perxis/perxis-go/events"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/events/mocks/MsgFilter.go b/events/mocks/MsgFilter.go
similarity index 100%
rename from pkg/events/mocks/MsgFilter.go
rename to events/mocks/MsgFilter.go
diff --git a/pkg/events/mocks/ProtoEncoder.go b/events/mocks/ProtoEncoder.go
similarity index 100%
rename from pkg/events/mocks/ProtoEncoder.go
rename to events/mocks/ProtoEncoder.go
diff --git a/pkg/events/mocks/PublishOption.go b/events/mocks/PublishOption.go
similarity index 94%
rename from pkg/events/mocks/PublishOption.go
rename to events/mocks/PublishOption.go
index f3517b7602f5b9714cc9de98ac6413bf324f91e8..8529b2458f126f86dc16bc195866c07ecb1a0ba4 100644
--- a/pkg/events/mocks/PublishOption.go
+++ b/events/mocks/PublishOption.go
@@ -3,7 +3,7 @@
package mocks
import (
- events "git.perx.ru/perxis/perxis-go/pkg/events"
+ "git.perx.ru/perxis/perxis-go/events"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/events/mocks/SubscribeOption.go b/events/mocks/SubscribeOption.go
similarity index 94%
rename from pkg/events/mocks/SubscribeOption.go
rename to events/mocks/SubscribeOption.go
index 5b2a9449f517c4d0881a53a64194139d50203961..0890ed984455606547afb5fc364b5acd4deaba9e 100644
--- a/pkg/events/mocks/SubscribeOption.go
+++ b/events/mocks/SubscribeOption.go
@@ -3,7 +3,7 @@
package mocks
import (
- events "git.perx.ru/perxis/perxis-go/pkg/events"
+ "git.perx.ru/perxis/perxis-go/events"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/events/mocks/Subscription.go b/events/mocks/Subscription.go
similarity index 100%
rename from pkg/events/mocks/Subscription.go
rename to events/mocks/Subscription.go
diff --git a/pkg/events/nats.go b/events/nats.go
similarity index 100%
rename from pkg/events/nats.go
rename to events/nats.go
diff --git a/pkg/events/nats_integration_test.go b/events/nats_integration_test.go
similarity index 97%
rename from pkg/events/nats_integration_test.go
rename to events/nats_integration_test.go
index 22a2a52230f4d92c71eab19a6f3da4e3eafac524..dd1881d89adc46b53493a3bd39c5b2c877b13c2f 100644
--- a/pkg/events/nats_integration_test.go
+++ b/events/nats_integration_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- pb "git.perx.ru/perxis/perxis-go/pkg/events/test_proto"
+ pb "git.perx.ru/perxis/perxis-go/events/test_proto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"
diff --git a/pkg/events/proto_encoder.go b/events/proto_encoder.go
similarity index 100%
rename from pkg/events/proto_encoder.go
rename to events/proto_encoder.go
diff --git a/pkg/events/test_proto/test.pb.go b/events/test_proto/test.pb.go
similarity index 99%
rename from pkg/events/test_proto/test.pb.go
rename to events/test_proto/test.pb.go
index de333160b391355e2d56b0976e547d58f63a62e1..abf476a92dbb659ff2b5b3b1f59686388f3eb988 100644
--- a/pkg/events/test_proto/test.pb.go
+++ b/events/test_proto/test.pb.go
@@ -7,10 +7,11 @@
package test_proto
import (
- protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
+
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
)
const (
diff --git a/pkg/events/test_proto/test.proto b/events/test_proto/test.proto
similarity index 100%
rename from pkg/events/test_proto/test.proto
rename to events/test_proto/test.proto
diff --git a/images/middleware/telemetry_middleware.go b/images/middleware/telemetry_middleware.go
index 8eafa0290bfea3ec536167b6ebc64013db7aa212..2e91d6a8f520c4d97563f84ac72fe37ee8aafe99 100644
--- a/images/middleware/telemetry_middleware.go
+++ b/images/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"git.perx.ru/perxis/perxis-go/images"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/files"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/logs/middleware/telemetry_middleware.go b/logs/middleware/telemetry_middleware.go
index c71ac6f7d5047ad0164d11abe87e4e40ca0de3c7..04b24a0bf8aff93bb203412f00b71725168b839d 100644
--- a/logs/middleware/telemetry_middleware.go
+++ b/logs/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/logs"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/operation/operation.go b/operation/operation.go
similarity index 100%
rename from pkg/operation/operation.go
rename to operation/operation.go
diff --git a/pkg/operation/operation_test.go b/operation/operation_test.go
similarity index 100%
rename from pkg/operation/operation_test.go
rename to operation/operation_test.go
diff --git a/pkg/operation/server.go b/operation/server.go
similarity index 100%
rename from pkg/operation/server.go
rename to operation/server.go
diff --git a/pkg/operation/service.go b/operation/service.go
similarity index 100%
rename from pkg/operation/service.go
rename to operation/service.go
diff --git a/pkg/optional/optional.go b/optional/optional.go
similarity index 100%
rename from pkg/optional/optional.go
rename to optional/optional.go
diff --git a/pkg/account/account.go b/pkg/account/account.go
index 9eb54c317274789cb34ee30632df61c152aef93a..c3cc36a0b45fee72b56318e5a272fc6356d39cac 100644
--- a/pkg/account/account.go
+++ b/pkg/account/account.go
@@ -6,7 +6,7 @@ import (
msobserver "git.perx.ru/perxis/perxis-go/pkg/members/observer"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
"git.perx.ru/perxis/perxis-go/pkg/users"
- "git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/version"
"google.golang.org/grpc"
)
diff --git a/pkg/account/versions/transport/client.go b/pkg/account/versions/transport/client.go
index 0713d94abcaca463a18d5e129314c0b8769a3ba4..0b26c91d40698b80f1859a253a250c5700397f13 100644
--- a/pkg/account/versions/transport/client.go
+++ b/pkg/account/versions/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- version "git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/version"
)
func (set EndpointsSet) Get(arg0 context.Context) (res0 *version.Version, res1 error) {
diff --git a/pkg/account/versions/transport/exchanges.microgen.go b/pkg/account/versions/transport/exchanges.microgen.go
index 11c9bfbda2c9d21ecd76cc67961c59f8439936c1..4d602e7d8f21f1b2a825ba290d38adbcb9aa0ead 100644
--- a/pkg/account/versions/transport/exchanges.microgen.go
+++ b/pkg/account/versions/transport/exchanges.microgen.go
@@ -2,7 +2,9 @@
package transport
-import version "git.perx.ru/perxis/perxis-go/pkg/version"
+import (
+ "git.perx.ru/perxis/perxis-go/version"
+)
type (
// Formal exchange type, please do not delete.
diff --git a/pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go b/pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go
index d57d8fc986d4d98e697e7c43b4018b2cd5db3c49..3db776ee86cb5a392b91cfeb49e81522240cd524 100644
--- a/pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/account/versions/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/version"
"git.perx.ru/perxis/perxis-go/proto/common"
+ "git.perx.ru/perxis/perxis-go/version"
)
func PtrVersionsVersionToProto(version *version.Version) (*common.Version, error) {
diff --git a/pkg/account/versions/transport/grpc/server.go b/pkg/account/versions/transport/grpc/server.go
index 960a9d0fba0b36e8658b84a692170714b42e281f..8f54e03ce7bc22ebd35132a29f76994e3c8294d3 100644
--- a/pkg/account/versions/transport/grpc/server.go
+++ b/pkg/account/versions/transport/grpc/server.go
@@ -3,8 +3,8 @@ package transportgrpc
import (
"git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- versions "git.perx.ru/perxis/perxis-go/pkg/version"
pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
+ versions "git.perx.ru/perxis/perxis-go/version"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/account/versions/transport/server.microgen.go b/pkg/account/versions/transport/server.microgen.go
index c4df6a7ee993cb7267af5fff7d9d0eb7e5d5d993..f514a627a4d8005d95397a84432f40adb45cedf6 100644
--- a/pkg/account/versions/transport/server.microgen.go
+++ b/pkg/account/versions/transport/server.microgen.go
@@ -4,7 +4,8 @@ package transport
import (
"context"
- versions "git.perx.ru/perxis/perxis-go/pkg/version"
+
+ versions "git.perx.ru/perxis/perxis-go/version"
endpoint "github.com/go-kit/kit/endpoint"
)
diff --git a/pkg/auth/anonymous.go b/pkg/auth/anonymous.go
index 9fffc86351e794758a00f70218d820a3855eb95a..5bb2e3cbe70598dd12b6632047b25a8b65d011f4 100644
--- a/pkg/auth/anonymous.go
+++ b/pkg/auth/anonymous.go
@@ -9,8 +9,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis-go/pkg/service"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/service"
)
type Anonymous struct {
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a5683681137c346f6cba91ec3d40c6a331d6..09872e8dac7ded54d4a9045b808c0e26230a26e6 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -11,8 +11,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis-go/pkg/service"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/service"
)
type ClientPrincipal struct {
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 933ec98b1ce5a45916d1cf9d47bb7fcfd618514e..c23daec14454f3f2b70aa55dcf0f0304e2ce5239 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -10,9 +10,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis-go/pkg/service"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/service"
)
type UserPrincipal struct {
diff --git a/pkg/cache/memory_cache.go b/pkg/cache/memory_cache.go
index 12b9b55812bbfb11646f828a4a3e643027687c4b..d3bce373e600363e5f7d3f5934d0850131dfbc89 100644
--- a/pkg/cache/memory_cache.go
+++ b/pkg/cache/memory_cache.go
@@ -4,7 +4,7 @@ import (
"fmt"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
lru "github.com/hashicorp/golang-lru/v2"
"go.uber.org/zap"
)
diff --git a/pkg/cache/telemetry_middleware.go b/pkg/cache/telemetry_middleware.go
index 794daae38bfd940fce0c7996ce79f5caa59d0851..c2c441b0daa70fba237a28408a3cf092f6da208d 100644
--- a/pkg/cache/telemetry_middleware.go
+++ b/pkg/cache/telemetry_middleware.go
@@ -3,7 +3,7 @@ package cache
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
)
diff --git a/pkg/clients/errors.go b/pkg/clients/errors.go
index c4df292ac8e8b40bb6e6abda8ecc09090b31e758..1e62fa16dbd0005b576b11255b4784d34a0f3a23 100644
--- a/pkg/clients/errors.go
+++ b/pkg/clients/errors.go
@@ -1,6 +1,8 @@
package clients
-import "git.perx.ru/perxis/perxis-go/pkg/service"
+import (
+ "git.perx.ru/perxis/perxis-go/service"
+)
var (
ErrAccessDenied = service.ErrAccessDenied
diff --git a/pkg/clients/middleware/caching_middleware.go b/pkg/clients/middleware/caching_middleware.go
index 0dd4f15b4e24affb13562c57a1d69b0e3adce33d..2484f36ecfac8d0e5da44b11c83697137d9ac8fc 100644
--- a/pkg/clients/middleware/caching_middleware.go
+++ b/pkg/clients/middleware/caching_middleware.go
@@ -4,9 +4,9 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/cache"
service "git.perx.ru/perxis/perxis-go/pkg/clients"
- "git.perx.ru/perxis/perxis-go/pkg/data"
)
func makeKey(ss ...string) string {
diff --git a/pkg/clients/middleware/telemetry_middleware.go b/pkg/clients/middleware/telemetry_middleware.go
index 8925db9dc750869035423c528289ef5381c52470..98029f0cdf5494854e936da9f4903b6ed9b1b12b 100644
--- a/pkg/clients/middleware/telemetry_middleware.go
+++ b/pkg/clients/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/clients"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/collaborators/errors.go b/pkg/collaborators/errors.go
index cfdc91688d0683a93762a2bb69f54931875730c6..74b5d245c2e6b01a0c6dc66aaacc33922cf851d0 100644
--- a/pkg/collaborators/errors.go
+++ b/pkg/collaborators/errors.go
@@ -1,7 +1,7 @@
package collaborators
import (
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/collaborators/middleware/caching_middleware.go b/pkg/collaborators/middleware/caching_middleware.go
index 7faeb638b0ca2bb673de4852c21e75b7f1f9afc7..ffbcf96dff68d07f8320cbeb192fa0dd66d45466 100644
--- a/pkg/collaborators/middleware/caching_middleware.go
+++ b/pkg/collaborators/middleware/caching_middleware.go
@@ -4,9 +4,9 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/cache"
service "git.perx.ru/perxis/perxis-go/pkg/collaborators"
- "git.perx.ru/perxis/perxis-go/pkg/data"
)
func makeKey(ss ...string) string {
diff --git a/pkg/collaborators/middleware/telemetry_middleware.go b/pkg/collaborators/middleware/telemetry_middleware.go
index 1e53c7e1584c2d48be7642b6479bbea75bfb4615..e54806666ff268094f8230b043bd8a666534648a 100644
--- a/pkg/collaborators/middleware/telemetry_middleware.go
+++ b/pkg/collaborators/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collaborators"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/collections/collection.go b/pkg/collections/collection.go
index 4495062187385a1824657e855652bab5f478ce2c..db16ee9d9dce4b5c4d158180a6bfbbc824dbe382 100644
--- a/pkg/collections/collection.go
+++ b/pkg/collections/collection.go
@@ -5,7 +5,7 @@ import (
"reflect"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/schema"
diff --git a/pkg/collections/errors.go b/pkg/collections/errors.go
index 64b8b132bebc44ea5447b33425fe8f989823086a..bc325b90e3e87b008fd818c484ecc01c8782fdf3 100644
--- a/pkg/collections/errors.go
+++ b/pkg/collections/errors.go
@@ -3,7 +3,7 @@ package collections
import (
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/collections/marshal.go b/pkg/collections/marshal.go
index 21c7bed0c5a8edb83780a19d31045d8b8c07f9ef..10adfc8d2ca70be5afaefe9e36d1994496de8877 100644
--- a/pkg/collections/marshal.go
+++ b/pkg/collections/marshal.go
@@ -5,7 +5,7 @@ import (
"strconv"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/optional"
+ "git.perx.ru/perxis/perxis-go/optional"
"git.perx.ru/perxis/perxis-go/pkg/schema"
jsoniter "github.com/json-iterator/go"
)
diff --git a/pkg/collections/marshal_test.go b/pkg/collections/marshal_test.go
index 2cc1bf52499422160d189a1e454144de39da4c95..a769983409ef4e5077559841cc809c86f867796c 100644
--- a/pkg/collections/marshal_test.go
+++ b/pkg/collections/marshal_test.go
@@ -3,7 +3,7 @@ package collections
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/optional"
+ "git.perx.ru/perxis/perxis-go/optional"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
jsoniter "github.com/json-iterator/go"
diff --git a/pkg/collections/middleware/telemetry_middleware.go b/pkg/collections/middleware/telemetry_middleware.go
index dba2f3436ac669c19a213153b049224de62854e0..ea2539a49219a1c6777ba057e0eb8e91b511a943 100644
--- a/pkg/collections/middleware/telemetry_middleware.go
+++ b/pkg/collections/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..4a5d21c30bfdd54a9fe88e4d19c290cbaf916487 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -12,7 +12,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
- "git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/version"
)
type Runnable interface {
diff --git a/pkg/content/versions/transport/client.go b/pkg/content/versions/transport/client.go
index 0713d94abcaca463a18d5e129314c0b8769a3ba4..0b26c91d40698b80f1859a253a250c5700397f13 100644
--- a/pkg/content/versions/transport/client.go
+++ b/pkg/content/versions/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- version "git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/version"
)
func (set EndpointsSet) Get(arg0 context.Context) (res0 *version.Version, res1 error) {
diff --git a/pkg/content/versions/transport/exchanges.microgen.go b/pkg/content/versions/transport/exchanges.microgen.go
index 11c9bfbda2c9d21ecd76cc67961c59f8439936c1..4d602e7d8f21f1b2a825ba290d38adbcb9aa0ead 100644
--- a/pkg/content/versions/transport/exchanges.microgen.go
+++ b/pkg/content/versions/transport/exchanges.microgen.go
@@ -2,7 +2,9 @@
package transport
-import version "git.perx.ru/perxis/perxis-go/pkg/version"
+import (
+ "git.perx.ru/perxis/perxis-go/version"
+)
type (
// Formal exchange type, please do not delete.
diff --git a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go b/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
index 4868510051fc294697066f312467bbe244a7d62c..5976b6a3fc48dc00eb02be29467a0c10c8f473cd 100644
--- a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/version"
"git.perx.ru/perxis/perxis-go/proto/common"
+ "git.perx.ru/perxis/perxis-go/version"
)
func PtrVersionsVersionToProto(version *version.Version) (*common.Version, error) {
diff --git a/pkg/content/versions/transport/grpc/server.go b/pkg/content/versions/transport/grpc/server.go
index 26b30d26150d8e8cb7cc4544f3d59f351ec4b56a..6e0d74b33af58ae67aff9bdcf5c8715221d565cd 100644
--- a/pkg/content/versions/transport/grpc/server.go
+++ b/pkg/content/versions/transport/grpc/server.go
@@ -3,8 +3,8 @@ package transportgrpc
import (
"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- versions "git.perx.ru/perxis/perxis-go/pkg/version"
pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
+ versions "git.perx.ru/perxis/perxis-go/version"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/content/versions/transport/server.microgen.go b/pkg/content/versions/transport/server.microgen.go
index 61f36f62a7d425e6fa2ce75a0e50cebd527853a0..f514a627a4d8005d95397a84432f40adb45cedf6 100644
--- a/pkg/content/versions/transport/server.microgen.go
+++ b/pkg/content/versions/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- versions "git.perx.ru/perxis/perxis-go/pkg/version"
+ versions "git.perx.ru/perxis/perxis-go/version"
endpoint "github.com/go-kit/kit/endpoint"
)
diff --git a/pkg/delivery/middleware/telemetry_middleware.go b/pkg/delivery/middleware/telemetry_middleware.go
index 276d3f62ff5d91c78d30aa07b79b4ee37c785a04..c3fab9bda7d75756e22c82810d797618edb581ab 100644
--- a/pkg/delivery/middleware/telemetry_middleware.go
+++ b/pkg/delivery/middleware/telemetry_middleware.go
@@ -17,7 +17,7 @@ import (
"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"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/environments/errors.go b/pkg/environments/errors.go
index f62001fd585acdba64aa1ce39e8a40046b8034d5..7c73bbd7045ad5488787309f44dddec924ae62e2 100644
--- a/pkg/environments/errors.go
+++ b/pkg/environments/errors.go
@@ -2,7 +2,7 @@ package environments
import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/environments/middleware/caching_middleware.go b/pkg/environments/middleware/caching_middleware.go
index ffcd85b8486fae49851160af8d6e4b6e7795efe9..6ec52dafbccec1d700e233ecc714fb5e757d9c63 100644
--- a/pkg/environments/middleware/caching_middleware.go
+++ b/pkg/environments/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/data"
service "git.perx.ru/perxis/perxis-go/pkg/environments"
)
diff --git a/pkg/environments/middleware/telemetry_middleware.go b/pkg/environments/middleware/telemetry_middleware.go
index 94c90c2f7bf47b0519604375c3a7f8dd6dbdc144..d5bdf037c3ffcdd318ee032cf678378e51f9bd57 100644
--- a/pkg/environments/middleware/telemetry_middleware.go
+++ b/pkg/environments/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/extension/client.go b/pkg/extension/client.go
index 00aa3859a7945f43367c378500acda9ed9c14c03..f944815efa136affde768cd09c0b89470f0f9ef6 100644
--- a/pkg/extension/client.go
+++ b/pkg/extension/client.go
@@ -3,7 +3,7 @@ package extension
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/operation"
+ "git.perx.ru/perxis/perxis-go/operation"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
"google.golang.org/grpc"
)
diff --git a/pkg/extension/middleware/telemetry_middleware.go b/pkg/extension/middleware/telemetry_middleware.go
index 10349b313f96f3f4770f9ea7d58adcfcd73dd0f7..c7745b997b1f498cf6ff2f92057d9a966a8fe6f3 100644
--- a/pkg/extension/middleware/telemetry_middleware.go
+++ b/pkg/extension/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/extension"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/extension/server.go b/pkg/extension/server.go
index 90d3db41efd3224f23e34ec5bc4ae6bf5b30752c..663fcfa4c894cb6281e2428f74e85b40d59a3780 100644
--- a/pkg/extension/server.go
+++ b/pkg/extension/server.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ operation2 "git.perx.ru/perxis/perxis-go/operation"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/operation"
commonpb "git.perx.ru/perxis/perxis-go/proto/common"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
"google.golang.org/grpc"
@@ -82,13 +82,13 @@ func WithRouteFn(fn RouteFn) ServerOption {
type Server struct {
extensions RouteFn
wrapErr WrapErrFn
- operations operation.Service
+ operations operation2.Service
pb.UnimplementedExtensionServiceServer
}
func NewServer(options ...ServerOption) *Server {
srv := &Server{
- operations: operation.NewDefaultService(),
+ operations: operation2.NewDefaultService(),
wrapErr: DefaultWrapErrFn(),
}
@@ -100,11 +100,11 @@ func NewServer(options ...ServerOption) *Server {
}
func RegisterServer(grpcSrv *grpc.Server, srv *Server) {
- commonpb.RegisterOperationServiceServer(grpcSrv, operation.NewServer(srv.operations))
+ commonpb.RegisterOperationServiceServer(grpcSrv, operation2.NewServer(srv.operations))
pb.RegisterExtensionServiceServer(grpcSrv, srv)
}
-func (s *Server) Install(ctx context.Context, req *InstallRequest) (*operation.Proto, error) {
+func (s *Server) Install(ctx context.Context, req *InstallRequest) (*operation2.Proto, error) {
exts, err := s.extensions(ctx, req.Extensions...)
if err != nil {
return nil, err
@@ -124,7 +124,7 @@ func (s *Server) Install(ctx context.Context, req *InstallRequest) (*operation.P
return op.Proto(), err
}
-func (s *Server) Uninstall(ctx context.Context, req *UninstallRequest) (*operation.Proto, error) {
+func (s *Server) Uninstall(ctx context.Context, req *UninstallRequest) (*operation2.Proto, error) {
exts, err := s.extensions(ctx, req.Extensions...)
if err != nil {
return nil, err
@@ -144,7 +144,7 @@ func (s *Server) Uninstall(ctx context.Context, req *UninstallRequest) (*operati
return op.Proto(), err
}
-func (s *Server) Check(ctx context.Context, req *CheckRequest) (*operation.Proto, error) {
+func (s *Server) Check(ctx context.Context, req *CheckRequest) (*operation2.Proto, error) {
exts, err := s.extensions(ctx, req.Extensions...)
if err != nil {
return nil, err
diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go
index a9204a2085568cbc2ba16ff7192a597013eef380..b96b25ab0a426efd03463857c0fe8f68e96a7f56 100644
--- a/pkg/extension/storage.go
+++ b/pkg/extension/storage.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/setup"
diff --git a/pkg/files/middleware/telemetry_middleware.go b/pkg/files/middleware/telemetry_middleware.go
index 156f9d8b1e340d4c27891c517b749b0e707995f8..41c9f864224b2a944dd9c9aa1814dbbd6f6d42f6 100644
--- a/pkg/files/middleware/telemetry_middleware.go
+++ b/pkg/files/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/files"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/invitations/middleware/telemetry_middleware.go b/pkg/invitations/middleware/telemetry_middleware.go
index a80140c1ca52dff6c5b8e0cd55cee26bdd600fbd..6f2ddbff595028c0fcebce3ade072b9d8fbde4c0 100644
--- a/pkg/invitations/middleware/telemetry_middleware.go
+++ b/pkg/invitations/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/invitations"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/items/errors.go b/pkg/items/errors.go
index 9ade59dbbd11ce3c9fc1624f1c02a044b57e53a4..d2325ac4b1402c58f2590e3c92c378e6115c1452 100644
--- a/pkg/items/errors.go
+++ b/pkg/items/errors.go
@@ -3,7 +3,7 @@ package items
import (
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/items/item.go b/pkg/items/item.go
index 92ef2494981c12e7e28e05c474ceb0db09e3c8be..6bbf6a68d8af8dfe54558846ca889c2f5e7fa652 100644
--- a/pkg/items/item.go
+++ b/pkg/items/item.go
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/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"
diff --git a/pkg/items/middleware/telemetry_middleware.go b/pkg/items/middleware/telemetry_middleware.go
index e9f8e6a99d85e05ec3a219299a5c04f63706d4ca..ad7822b5ac2cd139ff7e8326e866a0b59772c17b 100644
--- a/pkg/items/middleware/telemetry_middleware.go
+++ b/pkg/items/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"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"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/items/pagination.go b/pkg/items/pagination.go
index 73a5ae9ac8e3431e332b2c1de9b56c66c78fc503..a20c39b0d1ca76f26c0c6e7e48b443bb286aa6d6 100644
--- a/pkg/items/pagination.go
+++ b/pkg/items/pagination.go
@@ -3,7 +3,7 @@ package items
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/options"
"google.golang.org/grpc/codes"
diff --git a/pkg/locales/errors.go b/pkg/locales/errors.go
index b5876aff89925f394b8e36c1e609dfc6b4581164..5c48f76bfb2c4db1180c76222cd1ad22d93972bb 100644
--- a/pkg/locales/errors.go
+++ b/pkg/locales/errors.go
@@ -2,7 +2,7 @@ package locales
import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/locales/locale.go b/pkg/locales/locale.go
index 80cd2d60c884951206ccb3aad5113f0a369b68bf..8d697d8809d7f223b5d3cd791785062734be905b 100644
--- a/pkg/locales/locale.go
+++ b/pkg/locales/locale.go
@@ -1,7 +1,7 @@
package locales
import (
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
pb "git.perx.ru/perxis/perxis-go/proto/locales"
"golang.org/x/text/language"
diff --git a/pkg/locales/middleware/caching_middleware.go b/pkg/locales/middleware/caching_middleware.go
index f993a80ada02e3d5102fe289507527f73bc01338..d23f3121e183dfe8beb1e5bf6581fc62948316a9 100644
--- a/pkg/locales/middleware/caching_middleware.go
+++ b/pkg/locales/middleware/caching_middleware.go
@@ -3,8 +3,8 @@ package middleware
import (
"context"
+ "git.perx.ru/perxis/perxis-go/data"
"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"
)
diff --git a/pkg/locales/middleware/telemetry_middleware.go b/pkg/locales/middleware/telemetry_middleware.go
index 8016481d9aa52df48913535ad2498757eebc6e7d..43d0cb39e66f28949bf0c445ba3ad973e97014e5 100644
--- a/pkg/locales/middleware/telemetry_middleware.go
+++ b/pkg/locales/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"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"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/members/errors.go b/pkg/members/errors.go
index 9b6e2ca3112f295b81b237c40e019cac0ee214d4..1db6cb27c4af761bcd4b22cc3873e74fe5d82175 100644
--- a/pkg/members/errors.go
+++ b/pkg/members/errors.go
@@ -1,7 +1,7 @@
package members
import (
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/members/middleware/caching_middleware.go b/pkg/members/middleware/caching_middleware.go
index 4c61bff9078028009130bc7378908a6db551bba2..11797d445e1e5abe2b4fd87d0de62b497e50ddb8 100644
--- a/pkg/members/middleware/caching_middleware.go
+++ b/pkg/members/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/data"
service "git.perx.ru/perxis/perxis-go/pkg/members"
)
diff --git a/pkg/members/middleware/telemetry_middleware.go b/pkg/members/middleware/telemetry_middleware.go
index 04dc47d3f407b91ea60bf9f1b78e70aabec4ce1d..d7a7819e01a3d8d5c699a535dfb82d0c58b070ac 100644
--- a/pkg/members/middleware/telemetry_middleware.go
+++ b/pkg/members/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/members"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/operation/mocks/Service.go b/pkg/operation/mocks/Service.go
index 578f6d056c0358fed26daf0dc67433646df1fde1..13c84e1155987632bf182a6ce57df7ef6200e58f 100644
--- a/pkg/operation/mocks/Service.go
+++ b/pkg/operation/mocks/Service.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- operation "git.perx.ru/perxis/perxis-go/pkg/operation"
+ operation "git.perx.ru/perxis/perxis-go/operation"
mock "github.com/stretchr/testify/mock"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
diff --git a/pkg/organizations/middleware/telemetry_middleware.go b/pkg/organizations/middleware/telemetry_middleware.go
index ae945b477f841e611f20b945d4ac387cd6b96a6b..a243a6e5fb0df2f5367e2c0ffe80d6c763feecb2 100644
--- a/pkg/organizations/middleware/telemetry_middleware.go
+++ b/pkg/organizations/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/permission/permission.go b/pkg/permission/permission.go
index c5c7a786ab3028e2071a8d7abc151feb8bd6c16c..b09f2a275a9d01d5c9902eb55b69e7bed112607c 100644
--- a/pkg/permission/permission.go
+++ b/pkg/permission/permission.go
@@ -2,7 +2,7 @@ package permission
import (
"git.perx.ru/perxis/perxis-go/expr"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
)
type Access uint64
diff --git a/pkg/permission/ruleset.go b/pkg/permission/ruleset.go
index 5765430245d2213d6d516f8d33bf0b6e9584ff46..22e9d4e9f0aee1b4ff5e2458d5073f52c0cefa74 100644
--- a/pkg/permission/ruleset.go
+++ b/pkg/permission/ruleset.go
@@ -2,7 +2,7 @@ package permission
import (
perxisexpr "git.perx.ru/perxis/perxis-go/expr"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
)
type Action uint64
diff --git a/pkg/references/field.go b/pkg/references/field.go
index f80e7b5a564efe81df2969fb35f14d69fd23a1c8..a527aea4de9dd59b0f4227d4f3b56d3650301217 100644
--- a/pkg/references/field.go
+++ b/pkg/references/field.go
@@ -5,7 +5,7 @@ import (
"fmt"
"reflect"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/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/middleware/telemetry_middleware.go b/pkg/references/middleware/telemetry_middleware.go
index 76eab9b32b7ab10252c7af38e3fdfa6dfa0e9058..ec4a895d519abc2c1570d47e531c167723280df7 100644
--- a/pkg/references/middleware/telemetry_middleware.go
+++ b/pkg/references/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"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"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/roles/errors.go b/pkg/roles/errors.go
index c16b4a735b5bb3cb404b3ebe7aee109aaa916638..401df03ff637d8e81d30d656e041d28f84dda2d4 100644
--- a/pkg/roles/errors.go
+++ b/pkg/roles/errors.go
@@ -1,6 +1,8 @@
package roles
-import "git.perx.ru/perxis/perxis-go/pkg/service"
+import (
+ "git.perx.ru/perxis/perxis-go/service"
+)
var (
ErrAccessDenied = service.ErrAccessDenied
diff --git a/pkg/roles/middleware/caching_middleware.go b/pkg/roles/middleware/caching_middleware.go
index 40108b39ceb7131069e489111b01fe29e7b4534d..4afe444d71ff337c82a5ccc6d7731e9728da28ef 100644
--- a/pkg/roles/middleware/caching_middleware.go
+++ b/pkg/roles/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/data"
service "git.perx.ru/perxis/perxis-go/pkg/roles"
)
diff --git a/pkg/roles/middleware/telemetry_middleware.go b/pkg/roles/middleware/telemetry_middleware.go
index cf5fe9516111e46ee07dd27c5dc1ae25b19e1829..a55f4585c87fbbac514a2df6062eb4928e9cae7a 100644
--- a/pkg/roles/middleware/telemetry_middleware.go
+++ b/pkg/roles/middleware/telemetry_middleware.go
@@ -13,7 +13,7 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/roles/role.go b/pkg/roles/role.go
index 81feb1e909f15d40a918309a25add9c420e25b35..beb629356f26c760e3a22150414d0ddff9bb75a2 100644
--- a/pkg/roles/role.go
+++ b/pkg/roles/role.go
@@ -4,7 +4,7 @@ import (
"context"
"slices"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/permission"
)
diff --git a/pkg/schema/field/field.go b/pkg/schema/field/field.go
index e1969e9b37ee392a128dd2140f02670cfe797d3d..52f67d8ab748045dcfcfc3d13ca992fa6da27e97 100644
--- a/pkg/schema/field/field.go
+++ b/pkg/schema/field/field.go
@@ -5,7 +5,7 @@ import (
"strings"
"git.perx.ru/perxis/perxis-go/expr"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
)
diff --git a/pkg/schema/test/object_test.go b/pkg/schema/test/object_test.go
index 8bf3f82022e8501932e6474a985bcfc9f195e693..e1e0f64beab1c42f7c8a885a5b989c3e0a9c9e24 100644
--- a/pkg/schema/test/object_test.go
+++ b/pkg/schema/test/object_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"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/modify"
diff --git a/pkg/setup/collection.go b/pkg/setup/collection.go
index e597acfcabefd70a9a8abb3d2fed64c11fb274d2..b9748113b88bbe829d17935b4e85ce84e912f858 100644
--- a/pkg/setup/collection.go
+++ b/pkg/setup/collection.go
@@ -4,8 +4,7 @@ import (
"context"
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/data"
-
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"go.uber.org/zap"
diff --git a/pkg/setup/role.go b/pkg/setup/role.go
index 2498e8456c474331ce648dbf48caaccf16718bb3..153e95ba8de9665ffd201a9cfec91784607cfafe 100644
--- a/pkg/setup/role.go
+++ b/pkg/setup/role.go
@@ -4,9 +4,9 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/data"
"go.uber.org/zap"
- "git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/roles"
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index fb19168099f1d16f6854b4f1e25137c635f77742..107a4c92582334ce7e90003fdb22d48e37e41be9 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,9 +5,9 @@ import (
"errors"
"testing"
+ "git.perx.ru/perxis/perxis-go/data"
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"
diff --git a/pkg/spaces/errors.go b/pkg/spaces/errors.go
index c9e66fa698198eb8b01034eb2bad83286d60297f..9837303ccc558ab56400e84a8c3c1f4e1b8bdb85 100644
--- a/pkg/spaces/errors.go
+++ b/pkg/spaces/errors.go
@@ -2,7 +2,7 @@ package spaces
import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/service"
+ "git.perx.ru/perxis/perxis-go/service"
)
var (
diff --git a/pkg/spaces/middleware/caching_middleware.go b/pkg/spaces/middleware/caching_middleware.go
index f87ba81d26a266608a4e090c57a28ebf151f8825..427f87602e7878d4fb7d4d83d70828a090e1bb1b 100644
--- a/pkg/spaces/middleware/caching_middleware.go
+++ b/pkg/spaces/middleware/caching_middleware.go
@@ -3,8 +3,8 @@ package middleware
import (
"context"
+ "git.perx.ru/perxis/perxis-go/data"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/options"
service "git.perx.ru/perxis/perxis-go/pkg/spaces"
)
diff --git a/pkg/spaces/middleware/telemetry_middleware.go b/pkg/spaces/middleware/telemetry_middleware.go
index 0901e3b3e91786565f3e8fced4e3bb4170764b9e..550b4d896d6dd1512845c63a3db9aabf6fed81c0 100644
--- a/pkg/spaces/middleware/telemetry_middleware.go
+++ b/pkg/spaces/middleware/telemetry_middleware.go
@@ -14,7 +14,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/urlsigner/urlsigner.go b/pkg/urlsigner/urlsigner.go
index c5535db0f3ae4f6a2deba7fbb0a1504af6aacf75..37532dc7ba26cb94eec5e5785b3527e85d6ebc18 100644
--- a/pkg/urlsigner/urlsigner.go
+++ b/pkg/urlsigner/urlsigner.go
@@ -9,7 +9,7 @@ import (
"strings"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
)
type URLSigner interface {
diff --git a/pkg/users/errors.go b/pkg/users/errors.go
index 977b5e47a5b34f23e392f132c42ab77a37cdeaed..7352462ab72d6ba6004296751797b1825cc9fa9b 100644
--- a/pkg/users/errors.go
+++ b/pkg/users/errors.go
@@ -1,6 +1,8 @@
package users
-import "git.perx.ru/perxis/perxis-go/pkg/service"
+import (
+ "git.perx.ru/perxis/perxis-go/service"
+)
var (
ErrAccessDenied = service.ErrAccessDenied
diff --git a/pkg/users/middleware/telemetry_middleware.go b/pkg/users/middleware/telemetry_middleware.go
index 25088bfd631d5b2dd23c58d861c6051098d01907..627c10e01870769862dbdae2b42d67da5c75ac43 100644
--- a/pkg/users/middleware/telemetry_middleware.go
+++ b/pkg/users/middleware/telemetry_middleware.go
@@ -13,8 +13,8 @@ import (
pkgId "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/queue/queue.go b/queue/queue.go
similarity index 100%
rename from pkg/queue/queue.go
rename to queue/queue.go
diff --git a/pkg/queue/queue_test.go b/queue/queue_test.go
similarity index 100%
rename from pkg/queue/queue_test.go
rename to queue/queue_test.go
diff --git a/pkg/service/errors.go b/service/errors.go
similarity index 100%
rename from pkg/service/errors.go
rename to service/errors.go
diff --git a/pkg/telemetry/metrics/cache.go b/telemetry/metrics/cache.go
similarity index 100%
rename from pkg/telemetry/metrics/cache.go
rename to telemetry/metrics/cache.go
diff --git a/pkg/telemetry/metrics/request.go b/telemetry/metrics/request.go
similarity index 100%
rename from pkg/telemetry/metrics/request.go
rename to telemetry/metrics/request.go
diff --git a/pkg/version/mocks/Versions.go b/version/mocks/Versions.go
similarity index 95%
rename from pkg/version/mocks/Versions.go
rename to version/mocks/Versions.go
index a030dfb92c6b3055e2d6b564d1b2277e4eabfc11..7eca838043635231d1959e3c6a85702e39baf720 100644
--- a/pkg/version/mocks/Versions.go
+++ b/version/mocks/Versions.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- version "git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/version"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/version/version.go b/version/version.go
similarity index 100%
rename from pkg/version/version.go
rename to version/version.go
diff --git a/zap/channels.go b/zap/channels.go
index 8726cc54ce4f8ab55ad27b469dff3809c68804fa..40061b23fdc65c71e65adce89073cd9ecbdeb7ee 100644
--- a/zap/channels.go
+++ b/zap/channels.go
@@ -1,7 +1,7 @@
package zap
import (
- "git.perx.ru/perxis/perxis-go/pkg/data"
+ "git.perx.ru/perxis/perxis-go/data"
"go.uber.org/zap/zapcore"
)