diff --git a/id/system/system.go b/id/system/system.go index c33995d905a615b6c24422e27239da34141d4752..d9838efe751aa1e24328a374d58d29e8104a3da3 100644 --- a/id/system/system.go +++ b/id/system/system.go @@ -5,11 +5,11 @@ import ( "reflect" "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" "git.perx.ru/perxis/perxis-go/pkg/organizations" "git.perx.ru/perxis/perxis-go/pkg/roles" diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go index 2f01fa125e376623ceb710bbe594235b8434d853..092c6669c24a950e24065089f5b9446e093c5005 100644 --- a/id/test/object_id_test.go +++ b/id/test/object_id_test.go @@ -5,10 +5,10 @@ import ( "git.perx.ru/perxis/perxis-go/id" _ "git.perx.ru/perxis/perxis-go/id/system" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" "git.perx.ru/perxis/perxis-go/pkg/organizations" "git.perx.ru/perxis/perxis-go/pkg/roles" diff --git a/pkg/items/codec.go b/items/codec.go similarity index 100% rename from pkg/items/codec.go rename to items/codec.go diff --git a/pkg/items/context.go b/items/context.go similarity index 100% rename from pkg/items/context.go rename to items/context.go diff --git a/pkg/items/errors.go b/items/errors.go similarity index 100% rename from pkg/items/errors.go rename to items/errors.go diff --git a/pkg/items/events.go b/items/events.go similarity index 100% rename from pkg/items/events.go rename to items/events.go diff --git a/pkg/items/item.go b/items/item.go similarity index 100% rename from pkg/items/item.go rename to items/item.go diff --git a/pkg/items/item_test.go b/items/item_test.go similarity index 100% rename from pkg/items/item_test.go rename to items/item_test.go diff --git a/pkg/items/middleware/access_logging_middleware.go b/items/middleware/access_logging_middleware.go similarity index 98% rename from pkg/items/middleware/access_logging_middleware.go rename to items/middleware/access_logging_middleware.go index 2342a6d99249f427aa0f4ad6b4220a43ba872a4f..7f211187557fd13167ae3d91021e34d29c9ecd6b 100644 --- a/pkg/items/middleware/access_logging_middleware.go +++ b/items/middleware/access_logging_middleware.go @@ -4,14 +4,14 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" import ( "context" "time" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/schema" "go.uber.org/zap" ) diff --git a/pkg/items/middleware/caching_middleware.go b/items/middleware/caching_middleware.go similarity index 99% rename from pkg/items/middleware/caching_middleware.go rename to items/middleware/caching_middleware.go index 60d3bf80250843f2ddc963fe5d242e58f590a3f7..759d123225302480448e1ee55910ee2b90f94e49 100644 --- a/pkg/items/middleware/caching_middleware.go +++ b/items/middleware/caching_middleware.go @@ -4,10 +4,10 @@ import ( "context" "strings" + service "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/cache" envService "git.perx.ru/perxis/perxis-go/pkg/environments" "git.perx.ru/perxis/perxis-go/pkg/errors" - service "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" ) diff --git a/pkg/items/middleware/caching_middleware_test.go b/items/middleware/caching_middleware_test.go similarity index 99% rename from pkg/items/middleware/caching_middleware_test.go rename to items/middleware/caching_middleware_test.go index 4d777647788f290acf4e55550c435fa7ba27153a..3cc9c789f522bd8366443077aec0b57c28764172 100644 --- a/pkg/items/middleware/caching_middleware_test.go +++ b/items/middleware/caching_middleware_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "git.perx.ru/perxis/perxis-go/items" + itmsmocks "git.perx.ru/perxis/perxis-go/items/mocks" "git.perx.ru/perxis/perxis-go/pkg/cache" "git.perx.ru/perxis/perxis-go/pkg/environments" envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/items" - itmsmocks "git.perx.ru/perxis/perxis-go/pkg/items/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/items/middleware/client_encode_middleware.go b/items/middleware/client_encode_middleware.go similarity index 99% rename from pkg/items/middleware/client_encode_middleware.go rename to items/middleware/client_encode_middleware.go index 873a0e97c7690bcf51a042528787c57860d6163f..dff656b481376bd4e40f80f25bfd18485fe679f0 100644 --- a/pkg/items/middleware/client_encode_middleware.go +++ b/items/middleware/client_encode_middleware.go @@ -3,9 +3,9 @@ package middleware import ( "context" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/schema" ) diff --git a/pkg/items/middleware/logging_middleware.go b/items/middleware/logging_middleware.go similarity index 99% rename from pkg/items/middleware/logging_middleware.go rename to items/middleware/logging_middleware.go index 1178719ee2ad0190e12316165b2536de67f1324e..ca71db91a8c6a40b70eab5ad673e8a0a9b15a7a0 100644 --- a/pkg/items/middleware/logging_middleware.go +++ b/items/middleware/logging_middleware.go @@ -4,7 +4,7 @@ import ( "context" "git.perx.ru/perxis/perxis-go/id" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/schema" logzap "git.perx.ru/perxis/perxis-go/zap" "go.uber.org/zap" diff --git a/pkg/items/middleware/middleware.go b/items/middleware/middleware.go similarity index 73% rename from pkg/items/middleware/middleware.go rename to items/middleware/middleware.go index 4ef6a1fd2a0e2aec25d759d75d2e40d699ad7e06..e089483160d20a78353045e8829f9ded530572b9 100644 --- a/pkg/items/middleware/middleware.go +++ b/items/middleware/middleware.go @@ -4,10 +4,10 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" import ( - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "go.uber.org/zap" ) diff --git a/pkg/items/middleware/recovering_middleware.go b/items/middleware/recovering_middleware.go similarity index 97% rename from pkg/items/middleware/recovering_middleware.go rename to items/middleware/recovering_middleware.go index d719dd114010f4a28658a0508030042fe80c7d5e..9d6397f1e693f6ee2a8e752158a4c75b11d8a8a3 100644 --- a/pkg/items/middleware/recovering_middleware.go +++ b/items/middleware/recovering_middleware.go @@ -4,13 +4,13 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" import ( "context" "fmt" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/schema" "go.uber.org/zap" ) diff --git a/pkg/items/middleware/telemetry_middleware.go b/items/middleware/telemetry_middleware.go similarity index 99% rename from pkg/items/middleware/telemetry_middleware.go rename to items/middleware/telemetry_middleware.go index da626aa53ea846ce5747bd0deded09d300d48d95..f66b9f1f19698d6a9bdc950f3ca92b7bcd9fc3d5 100644 --- a/pkg/items/middleware/telemetry_middleware.go +++ b/items/middleware/telemetry_middleware.go @@ -4,15 +4,15 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/items -i Items -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l "" import ( "context" "time" oid "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/schema" "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" diff --git a/pkg/items/mocks/Decoder.go b/items/mocks/Decoder.go similarity index 95% rename from pkg/items/mocks/Decoder.go rename to items/mocks/Decoder.go index fcc4d502ee3d57504560a69c35ebdea06460b595..799dd6b32e16d743c3cba03416ffe348166f421a 100644 --- a/pkg/items/mocks/Decoder.go +++ b/items/mocks/Decoder.go @@ -3,7 +3,7 @@ package mocks import ( - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/items/mocks/Encoder.go b/items/mocks/Encoder.go similarity index 96% rename from pkg/items/mocks/Encoder.go rename to items/mocks/Encoder.go index cd2dd5c9762c84131974b6e612086ad61d3699f3..d36912bda24a26f0def62c74163e94ed636e567a 100644 --- a/pkg/items/mocks/Encoder.go +++ b/items/mocks/Encoder.go @@ -3,7 +3,7 @@ package mocks import ( - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/items/mocks/ItemObserver.go b/items/mocks/ItemObserver.go similarity index 100% rename from pkg/items/mocks/ItemObserver.go rename to items/mocks/ItemObserver.go diff --git a/pkg/items/mocks/ItemReadObserver.go b/items/mocks/ItemReadObserver.go similarity index 98% rename from pkg/items/mocks/ItemReadObserver.go rename to items/mocks/ItemReadObserver.go index c6876a5a3aada6942bf07fdfdfcee35f626353c9..f71e94a9108f1f92c0070990a7668f2d346a3754 100644 --- a/pkg/items/mocks/ItemReadObserver.go +++ b/items/mocks/ItemReadObserver.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/items/mocks/Items.go b/items/mocks/Items.go similarity index 99% rename from pkg/items/mocks/Items.go rename to items/mocks/Items.go index e134822e2869693fa3801affac8660eb357cd70c..590d55a64dc2f81bd472942f1eb5ac8900f8377f 100644 --- a/pkg/items/mocks/Items.go +++ b/items/mocks/Items.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" mock "github.com/stretchr/testify/mock" schema "git.perx.ru/perxis/perxis-go/pkg/schema" diff --git a/pkg/items/mocks/Middleware.go b/items/mocks/Middleware.go similarity index 95% rename from pkg/items/mocks/Middleware.go rename to items/mocks/Middleware.go index 0bebef848868bd06d6539b5159f5973f6a39315e..8edb1f1c550529a9ef32cd5b80506bb257818aea 100644 --- a/pkg/items/mocks/Middleware.go +++ b/items/mocks/Middleware.go @@ -3,7 +3,7 @@ package mocks import ( - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/items/mocks/PreSaver.go b/items/mocks/PreSaver.go similarity index 97% rename from pkg/items/mocks/PreSaver.go rename to items/mocks/PreSaver.go index 3acc32732fcea3df459a5234fb5c952e823edfaa..3ae3862835d67e05f46047cc43d24639980745d0 100644 --- a/pkg/items/mocks/PreSaver.go +++ b/items/mocks/PreSaver.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" field "git.perx.ru/perxis/perxis-go/pkg/schema/field" mock "github.com/stretchr/testify/mock" diff --git a/pkg/items/mocks/ProcessDataFunc.go b/items/mocks/ProcessDataFunc.go similarity index 100% rename from pkg/items/mocks/ProcessDataFunc.go rename to items/mocks/ProcessDataFunc.go diff --git a/pkg/items/mocks/Storage.go b/items/mocks/Storage.go similarity index 99% rename from pkg/items/mocks/Storage.go rename to items/mocks/Storage.go index 4ce04d02d6985f5e4da86137d74763999da02136..7864718748fe968ca6efdd6669a02b4d143a02fc 100644 --- a/pkg/items/mocks/Storage.go +++ b/items/mocks/Storage.go @@ -7,7 +7,7 @@ import ( collections "git.perx.ru/perxis/perxis-go/pkg/collections" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" locales "git.perx.ru/perxis/perxis-go/pkg/locales" diff --git a/pkg/items/observer.go b/items/observer.go similarity index 100% rename from pkg/items/observer.go rename to items/observer.go diff --git a/pkg/items/options.go b/items/options.go similarity index 100% rename from pkg/items/options.go rename to items/options.go diff --git a/pkg/items/pagination.go b/items/pagination.go similarity index 100% rename from pkg/items/pagination.go rename to items/pagination.go diff --git a/pkg/items/pagination_test.go b/items/pagination_test.go similarity index 100% rename from pkg/items/pagination_test.go rename to items/pagination_test.go diff --git a/pkg/items/service.go b/items/service.go similarity index 100% rename from pkg/items/service.go rename to items/service.go diff --git a/pkg/items/storage.go b/items/storage.go similarity index 100% rename from pkg/items/storage.go rename to items/storage.go diff --git a/pkg/items/storage_options.go b/items/storage_options.go similarity index 100% rename from pkg/items/storage_options.go rename to items/storage_options.go diff --git a/pkg/items/stub.go b/items/stub.go similarity index 100% rename from pkg/items/stub.go rename to items/stub.go diff --git a/pkg/items/transport/client.go b/items/transport/client.go similarity index 99% rename from pkg/items/transport/client.go rename to items/transport/client.go index fd5de3f21b7ad9ec0bb1eed5f0a908216c9531d7..5a566bb9d0a784d9aa27ddd4a021d9f786a20225 100644 --- a/pkg/items/transport/client.go +++ b/items/transport/client.go @@ -5,8 +5,8 @@ package transport import ( "context" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/schema" "github.com/hashicorp/go-multierror" "google.golang.org/grpc/status" diff --git a/pkg/items/transport/endpoints.microgen.go b/items/transport/endpoints.microgen.go similarity index 100% rename from pkg/items/transport/endpoints.microgen.go rename to items/transport/endpoints.microgen.go diff --git a/pkg/items/transport/exchanges.microgen.go b/items/transport/exchanges.microgen.go similarity index 99% rename from pkg/items/transport/exchanges.microgen.go rename to items/transport/exchanges.microgen.go index be18dc59805565756e6736f60895e81bc186e1d6..5a10ce6c88d89fa63c406f25b8e3011c4d2ec41e 100644 --- a/pkg/items/transport/exchanges.microgen.go +++ b/items/transport/exchanges.microgen.go @@ -3,7 +3,7 @@ package transport import ( - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" schema "git.perx.ru/perxis/perxis-go/pkg/schema" ) diff --git a/pkg/items/transport/grpc/client.go b/items/transport/grpc/client.go similarity index 96% rename from pkg/items/transport/grpc/client.go rename to items/transport/grpc/client.go index faea7cc6703746ba91b0af0e831431ffd76044fc..21e2ea38548dce93bee9db0522fdc51c288305e3 100644 --- a/pkg/items/transport/grpc/client.go +++ b/items/transport/grpc/client.go @@ -3,8 +3,8 @@ package transportgrpc import ( + transport "git.perx.ru/perxis/perxis-go/items/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - transport "git.perx.ru/perxis/perxis-go/pkg/items/transport" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" ) diff --git a/pkg/items/transport/grpc/client.microgen.go b/items/transport/grpc/client.microgen.go similarity index 98% rename from pkg/items/transport/grpc/client.microgen.go rename to items/transport/grpc/client.microgen.go index 228f43fae9adc57694147029edb239bce6282774..225618f20beaa995c4c5ead2caef42493cc9732e 100644 --- a/pkg/items/transport/grpc/client.microgen.go +++ b/items/transport/grpc/client.microgen.go @@ -3,7 +3,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/items/transport" + transport "git.perx.ru/perxis/perxis-go/items/transport" pb "git.perx.ru/perxis/perxis-go/proto/items" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" diff --git a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go b/items/transport/grpc/protobuf_endpoint_converters.microgen.go similarity index 99% rename from pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go rename to items/transport/grpc/protobuf_endpoint_converters.microgen.go index 47208ce50e9e869b21c5db611ad89fa66eef8289..c4b73fb7278a6fd465b0a4f8183ebe979e73b791 100644 --- a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/items/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "git.perx.ru/perxis/perxis-go/pkg/items" - transport "git.perx.ru/perxis/perxis-go/pkg/items/transport" + "git.perx.ru/perxis/perxis-go/items" + transport "git.perx.ru/perxis/perxis-go/items/transport" pb "git.perx.ru/perxis/perxis-go/proto/items" empty "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go b/items/transport/grpc/protobuf_type_converters.microgen.go similarity index 99% rename from pkg/items/transport/grpc/protobuf_type_converters.microgen.go rename to items/transport/grpc/protobuf_type_converters.microgen.go index 1aba486580e9f94882b29d254b1fffab39c8270c..42259cf6acf0601586bd98913f1e4fbb843e0371 100644 --- a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go +++ b/items/transport/grpc/protobuf_type_converters.microgen.go @@ -7,9 +7,9 @@ package transportgrpc import ( "fmt" + service "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/errors" "git.perx.ru/perxis/perxis-go/pkg/filter" - service "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/options" "git.perx.ru/perxis/perxis-go/pkg/schema" pbcommon "git.perx.ru/perxis/perxis-go/proto/common" diff --git a/pkg/items/transport/grpc/server.go b/items/transport/grpc/server.go similarity index 95% rename from pkg/items/transport/grpc/server.go rename to items/transport/grpc/server.go index 4ac8a3b02dd4991518d8b132707bb2dd0ce3c362..c626ec4cf23e5fe65a631ad75933992ec7491830 100644 --- a/pkg/items/transport/grpc/server.go +++ b/items/transport/grpc/server.go @@ -1,9 +1,9 @@ package transportgrpc import ( + "git.perx.ru/perxis/perxis-go/items" + "git.perx.ru/perxis/perxis-go/items/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - "git.perx.ru/perxis/perxis-go/pkg/items" - "git.perx.ru/perxis/perxis-go/pkg/items/transport" pb "git.perx.ru/perxis/perxis-go/proto/items" grpckit "github.com/go-kit/kit/transport/grpc" ) diff --git a/pkg/items/transport/grpc/server.microgen.go b/items/transport/grpc/server.microgen.go similarity index 99% rename from pkg/items/transport/grpc/server.microgen.go rename to items/transport/grpc/server.microgen.go index 2bc7826216698f31f56a5636cf9fb8d8106c7d87..5538382732fa728714ebee25f276d1990138a800 100644 --- a/pkg/items/transport/grpc/server.microgen.go +++ b/items/transport/grpc/server.microgen.go @@ -4,7 +4,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/items/transport" + transport "git.perx.ru/perxis/perxis-go/items/transport" pb "git.perx.ru/perxis/perxis-go/proto/items" grpc "github.com/go-kit/kit/transport/grpc" context "golang.org/x/net/context" diff --git a/pkg/items/transport/server.microgen.go b/items/transport/server.microgen.go similarity index 99% rename from pkg/items/transport/server.microgen.go rename to items/transport/server.microgen.go index 10d831bb534fcb695ca7305c3f9d696e31d9403d..77e0bed287ed5761896e91db002608dceedd96c5 100644 --- a/pkg/items/transport/server.microgen.go +++ b/items/transport/server.microgen.go @@ -6,8 +6,8 @@ import ( "context" "strings" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/items" endpoint "github.com/go-kit/kit/endpoint" "github.com/hashicorp/go-multierror" ) diff --git a/logs/service.go b/logs/service.go index 34b3b4e61bd4b24c43dea910dcc54874deab13c5..a2df1a4c761b2a70ab9319b965c9016a42c7592b 100644 --- a/logs/service.go +++ b/logs/service.go @@ -3,7 +3,7 @@ package logs import ( "context" - itemstransportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc" + itemstransportgrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc" "git.perx.ru/perxis/perxis-go/pkg/options" pb "git.perx.ru/perxis/perxis-go/proto/logs" ) diff --git a/logs/zap/entry_encoder_test.go b/logs/zap/entry_encoder_test.go index 13788bda5cea5718de6b33db1c7c251b5f6d1429..fd94de7a1cac4e2fe282e7fbb6c2810c82b1b442 100644 --- a/logs/zap/entry_encoder_test.go +++ b/logs/zap/entry_encoder_test.go @@ -6,8 +6,8 @@ import ( "testing" "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/logs" - "git.perx.ru/perxis/perxis-go/pkg/items" logzap "git.perx.ru/perxis/perxis-go/zap" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go index dc182fb0fb764b9b7ca3a232678564c8878a72b0..04688dff8dbbb8403a425fcd38dd1c5e7d611522 100644 --- a/logs/zap/example_test.go +++ b/logs/zap/example_test.go @@ -7,10 +7,10 @@ import ( "testing" "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/logs" logmocks "git.perx.ru/perxis/perxis-go/logs/mocks" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/users" usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks" logzap "git.perx.ru/perxis/perxis-go/zap" diff --git a/pkg/content/client.go b/pkg/content/client.go index adc5f784dff8fccd5b505867bf65efb373a9149d..f9314d4d3fd9076d2c48d49d4d411c20abd5d428 100644 --- a/pkg/content/client.go +++ b/pkg/content/client.go @@ -3,6 +3,8 @@ package content import ( "time" + itemsSvc "git.perx.ru/perxis/perxis-go/items/middleware" + itemsTransportGrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc" "git.perx.ru/perxis/perxis-go/pkg/cache" clientsSvc "git.perx.ru/perxis/perxis-go/pkg/clients/middleware" clientsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/clients/transport/grpc" @@ -14,8 +16,6 @@ import ( environmentsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/environments/transport/grpc" invitationsSvc "git.perx.ru/perxis/perxis-go/pkg/invitations/middleware" invitationsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/invitations/transport/grpc" - itemsSvc "git.perx.ru/perxis/perxis-go/pkg/items/middleware" - itemsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc" localesSvc "git.perx.ru/perxis/perxis-go/pkg/locales/middleware" localsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/locales/transport/grpc" referencesSvc "git.perx.ru/perxis/perxis-go/pkg/references/middleware" diff --git a/pkg/content/content.go b/pkg/content/content.go index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..d049c4c6393f1e319e0ff46c6c82a4fcc241cae6 100644 --- a/pkg/content/content.go +++ b/pkg/content/content.go @@ -1,13 +1,13 @@ package content import ( + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collaborators" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/environments" "git.perx.ru/perxis/perxis-go/pkg/invitations" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" "git.perx.ru/perxis/perxis-go/pkg/references" "git.perx.ru/perxis/perxis-go/pkg/roles" diff --git a/pkg/delivery/client/adapter.go b/pkg/delivery/client/adapter.go index df4c1722cae2ee0abb3be12e58e9f5232bac2bb7..bf6aeb9b36babc4580d57df9c4b023154fdf8165 100644 --- a/pkg/delivery/client/adapter.go +++ b/pkg/delivery/client/adapter.go @@ -3,10 +3,10 @@ package client import ( "context" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/delivery" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" ) diff --git a/pkg/delivery/client/client.go b/pkg/delivery/client/client.go index e3fb962c22cd76d4adc2cbd5ca9d6195eb9e41d6..46513c31628e869a11d7c09ddb738cd48098da80 100644 --- a/pkg/delivery/client/client.go +++ b/pkg/delivery/client/client.go @@ -3,13 +3,13 @@ package client import ( "time" + items "git.perx.ru/perxis/perxis-go/items/middleware" "git.perx.ru/perxis/perxis-go/pkg/cache" collections "git.perx.ru/perxis/perxis-go/pkg/collections/middleware" "git.perx.ru/perxis/perxis-go/pkg/delivery" deliveryservice "git.perx.ru/perxis/perxis-go/pkg/delivery/service" deliverytransportgrpc "git.perx.ru/perxis/perxis-go/pkg/delivery/transport/grpc" environments "git.perx.ru/perxis/perxis-go/pkg/environments/middleware" - items "git.perx.ru/perxis/perxis-go/pkg/items/middleware" locales "git.perx.ru/perxis/perxis-go/pkg/locales/middleware" "google.golang.org/grpc" ) diff --git a/pkg/delivery/middleware/telemetry_middleware.go b/pkg/delivery/middleware/telemetry_middleware.go index 600b6a61caec8391507735e01d12d82ee822c8e3..e73c962621f8b06383561136f93d832dd5c80881 100644 --- a/pkg/delivery/middleware/telemetry_middleware.go +++ b/pkg/delivery/middleware/telemetry_middleware.go @@ -11,11 +11,11 @@ import ( "time" oid "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/delivery" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" diff --git a/pkg/delivery/mocks/Delivery.go b/pkg/delivery/mocks/Delivery.go index 6a10b46a01d7d3972338b26d2c82de0f46458b51..60e858cf7c3c7aea9ea457bb94da9db67a379275 100644 --- a/pkg/delivery/mocks/Delivery.go +++ b/pkg/delivery/mocks/Delivery.go @@ -9,7 +9,7 @@ import ( environments "git.perx.ru/perxis/perxis-go/pkg/environments" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" locales "git.perx.ru/perxis/perxis-go/pkg/locales" diff --git a/pkg/delivery/service.go b/pkg/delivery/service.go index 9f084740499a5d620d158c4ef97555d4ed5acca6..5f17a823ceb4ffeb88a1545bbc26de919722d643 100644 --- a/pkg/delivery/service.go +++ b/pkg/delivery/service.go @@ -3,9 +3,9 @@ package delivery import ( "context" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" ) diff --git a/pkg/delivery/service/service.go b/pkg/delivery/service/service.go index be71148108f3296ce5a66d6a6f1f347a81671999..95d124610f7cd346e72cf6783d3f88e0c71b8f22 100644 --- a/pkg/delivery/service/service.go +++ b/pkg/delivery/service/service.go @@ -3,10 +3,10 @@ package service import ( "context" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/delivery" "git.perx.ru/perxis/perxis-go/pkg/environments" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/locales" ) diff --git a/pkg/delivery/transport/client.go b/pkg/delivery/transport/client.go index 39c110029c1c78df3ccf4c01ef1073612fbba2c7..b01fb27f24a878844734b57b03d0ff100a8e042f 100644 --- a/pkg/delivery/transport/client.go +++ b/pkg/delivery/transport/client.go @@ -5,9 +5,9 @@ package transport import ( "context" + items "git.perx.ru/perxis/perxis-go/items" collections "git.perx.ru/perxis/perxis-go/pkg/collections" environments "git.perx.ru/perxis/perxis-go/pkg/environments" - items "git.perx.ru/perxis/perxis-go/pkg/items" locales "git.perx.ru/perxis/perxis-go/pkg/locales" ) diff --git a/pkg/delivery/transport/exchanges.microgen.go b/pkg/delivery/transport/exchanges.microgen.go index 3e0f4c8958cc3cb58608e4e6676c8c4163a83cd0..686d13f7ae80c1c128d428e141550f1664b70805 100644 --- a/pkg/delivery/transport/exchanges.microgen.go +++ b/pkg/delivery/transport/exchanges.microgen.go @@ -3,9 +3,9 @@ package transport import ( + items "git.perx.ru/perxis/perxis-go/items" collections "git.perx.ru/perxis/perxis-go/pkg/collections" environments "git.perx.ru/perxis/perxis-go/pkg/environments" - items "git.perx.ru/perxis/perxis-go/pkg/items" locales "git.perx.ru/perxis/perxis-go/pkg/locales" ) diff --git a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go index 7067dc51722117ddc00dd6208de6da9bd8a8e9bd..3a64c7b3d96967a451f1846c444f271d2d9e1a07 100644 --- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go +++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go @@ -7,10 +7,10 @@ package transportgrpc import ( "fmt" + items "git.perx.ru/perxis/perxis-go/items" collections "git.perx.ru/perxis/perxis-go/pkg/collections" environments "git.perx.ru/perxis/perxis-go/pkg/environments" "git.perx.ru/perxis/perxis-go/pkg/filter" - items "git.perx.ru/perxis/perxis-go/pkg/items" locales "git.perx.ru/perxis/perxis-go/pkg/locales" services "git.perx.ru/perxis/perxis-go/pkg/options" "git.perx.ru/perxis/perxis-go/pkg/schema" diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go index c7dd628566b54c9ce2f43e03ff4129a544046a1c..258ad09f7440ca18e62322dbfd93e0909fdd5f12 100644 --- a/pkg/extension/storage.go +++ b/pkg/extension/storage.go @@ -11,8 +11,8 @@ import ( pb "git.perx.ru/perxis/perxis-go/proto/extensions" "go.uber.org/zap" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/content" - "git.perx.ru/perxis/perxis-go/pkg/items" ) type ( diff --git a/pkg/files/field.go b/pkg/files/field.go index 7386831322a0c67852cd18e570bc3a0c5781da9f..530cf1254c5eae4e107e98e5be26049903977dae 100644 --- a/pkg/files/field.go +++ b/pkg/files/field.go @@ -8,7 +8,7 @@ import ( "net/url" "reflect" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/schema/field" signer "git.perx.ru/perxis/perxis-go/pkg/urlsigner" "github.com/mitchellh/mapstructure" diff --git a/pkg/references/field.go b/pkg/references/field.go index f80e7b5a564efe81df2969fb35f14d69fd23a1c8..17fdcf9d3ce4d5921861524aba4d41a09c0e3e12 100644 --- a/pkg/references/field.go +++ b/pkg/references/field.go @@ -5,9 +5,9 @@ import ( "fmt" "reflect" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/data" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/schema/field" ) diff --git a/pkg/references/field_test.go b/pkg/references/field_test.go index ac9d5c03db107ed8f284cab3c9205afe95f1502b..adcbb8d98ab13eee5d0c3092cba881e637fb3887 100644 --- a/pkg/references/field_test.go +++ b/pkg/references/field_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "git.perx.ru/perxis/perxis-go/pkg/items" - "git.perx.ru/perxis/perxis-go/pkg/items/mocks" + "git.perx.ru/perxis/perxis-go/items" + "git.perx.ru/perxis/perxis-go/items/mocks" "git.perx.ru/perxis/perxis-go/pkg/schema" "git.perx.ru/perxis/perxis-go/pkg/schema/field" "git.perx.ru/perxis/perxis-go/pkg/schema/validate" diff --git a/pkg/references/middleware/access_logging_middleware.go b/pkg/references/middleware/access_logging_middleware.go index b5fe116505c7a5f7d12c5f043c5d1c6b4c5d8fda..2ef5080993abaff2b2ff6e7d5fc7a9a0c1c735cd 100644 --- a/pkg/references/middleware/access_logging_middleware.go +++ b/pkg/references/middleware/access_logging_middleware.go @@ -10,8 +10,8 @@ import ( "context" "time" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/references" "go.uber.org/zap" ) diff --git a/pkg/references/middleware/client_encode_middleware.go b/pkg/references/middleware/client_encode_middleware.go index b6ea043b70da4ea5a9bcd3f3740ebb6e3774d107..7401ed8ce5232bc4ab084ab1e62ee46c2b94467a 100644 --- a/pkg/references/middleware/client_encode_middleware.go +++ b/pkg/references/middleware/client_encode_middleware.go @@ -3,8 +3,8 @@ package middleware import ( "context" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/collections" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/references" ) diff --git a/pkg/references/middleware/error_logging_middleware.go b/pkg/references/middleware/error_logging_middleware.go index a68dc8f80685b704162c5399053a3bb3831846c9..dd8315451847e3dc6548bcb370ed256fe7d03730 100644 --- a/pkg/references/middleware/error_logging_middleware.go +++ b/pkg/references/middleware/error_logging_middleware.go @@ -9,7 +9,7 @@ package middleware import ( "context" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/references" "go.uber.org/zap" ) diff --git a/pkg/references/middleware/recovering_middleware.go b/pkg/references/middleware/recovering_middleware.go index cc8a87ff40cd9f70da25444d53762cbce67e8fd7..4861cb56db359f33c98b017056bd3044f3acd98f 100644 --- a/pkg/references/middleware/recovering_middleware.go +++ b/pkg/references/middleware/recovering_middleware.go @@ -10,7 +10,7 @@ import ( "context" "fmt" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/references" "go.uber.org/zap" ) diff --git a/pkg/references/middleware/telemetry_middleware.go b/pkg/references/middleware/telemetry_middleware.go index 3e8fbb773fd9bc548eed3f34f78a4f5adcbe1128..1225945bf2b29eaceae7755b1de1e5490c404e8d 100644 --- a/pkg/references/middleware/telemetry_middleware.go +++ b/pkg/references/middleware/telemetry_middleware.go @@ -11,8 +11,8 @@ import ( "time" oid "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/references" "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" diff --git a/pkg/references/mocks/References.go b/pkg/references/mocks/References.go index 92c8e29036b2960abd16b5f6df6caab04a783c0d..c20bbdd1507230d36d6e9d378fe541e1c23ee4a1 100644 --- a/pkg/references/mocks/References.go +++ b/pkg/references/mocks/References.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" mock "github.com/stretchr/testify/mock" references "git.perx.ru/perxis/perxis-go/pkg/references" diff --git a/pkg/references/reference.go b/pkg/references/reference.go index 676f208c3304eb4840f43161a52a7a63779c6c8e..30bcef5d77d65e9b89c5ab40c521807d5fde6eff 100644 --- a/pkg/references/reference.go +++ b/pkg/references/reference.go @@ -3,7 +3,7 @@ package references import ( "strings" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" pb "git.perx.ru/perxis/perxis-go/proto/references" "go.mongodb.org/mongo-driver/bson" ) diff --git a/pkg/references/service.go b/pkg/references/service.go index 2380a7879e0d15924ac83c226059932daf540bcf..4567d2c69b0ca58f4d06a03b48210993c5fb0d08 100644 --- a/pkg/references/service.go +++ b/pkg/references/service.go @@ -3,7 +3,7 @@ package references import ( "context" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" ) // @microgen grpc diff --git a/pkg/references/transport/client.go b/pkg/references/transport/client.go index 45f10f4f68c292729d7e461219219d09aa3f1341..b73d38530cb63991f3c4bee4ccdd8f0bda16c7de 100644 --- a/pkg/references/transport/client.go +++ b/pkg/references/transport/client.go @@ -5,7 +5,7 @@ package transport import ( "context" - items "git.perx.ru/perxis/perxis-go/pkg/items" + items "git.perx.ru/perxis/perxis-go/items" references "git.perx.ru/perxis/perxis-go/pkg/references" ) diff --git a/pkg/references/transport/exchanges.microgen.go b/pkg/references/transport/exchanges.microgen.go index 4d0b51bf3f61286e8d4ed6968d3a831e2c57bbf0..b9d420706b4b085a39288e72b25da5dda4ccf761 100644 --- a/pkg/references/transport/exchanges.microgen.go +++ b/pkg/references/transport/exchanges.microgen.go @@ -3,7 +3,7 @@ package transport import ( - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/references" ) diff --git a/pkg/references/transport/grpc/protobuf_type_converters.microgen.go b/pkg/references/transport/grpc/protobuf_type_converters.microgen.go index 965122b7da2c7e05db175f6f3a15ac373dd075b5..3b82270f23b1644e68672a694b7e744408fc0e23 100644 --- a/pkg/references/transport/grpc/protobuf_type_converters.microgen.go +++ b/pkg/references/transport/grpc/protobuf_type_converters.microgen.go @@ -5,8 +5,8 @@ package transportgrpc import ( - "git.perx.ru/perxis/perxis-go/pkg/items" - itemstransportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc" + "git.perx.ru/perxis/perxis-go/items" + itemstransportgrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc" service "git.perx.ru/perxis/perxis-go/pkg/references" itemspb "git.perx.ru/perxis/perxis-go/proto/items" pb "git.perx.ru/perxis/perxis-go/proto/references" diff --git a/pkg/setup/item.go b/pkg/setup/item.go index adf79935a7e55c212687907f0118112adfcc97ff..b84a6b7d95efdc827d6dfc356767e16b0e89489c 100644 --- a/pkg/setup/item.go +++ b/pkg/setup/item.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/errors" - "git.perx.ru/perxis/perxis-go/pkg/items" ) var ( diff --git a/pkg/setup/item_test.go b/pkg/setup/item_test.go index 0a128625e7871d20aad0bceff7561197e97c01ea..6fa7e541db002cca08e442c43e5fe58bd118ff8a 100644 --- a/pkg/setup/item_test.go +++ b/pkg/setup/item_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" + itemsMock "git.perx.ru/perxis/perxis-go/items/mocks" "git.perx.ru/perxis/perxis-go/pkg/content" "git.perx.ru/perxis/perxis-go/pkg/errors" - itemsMock "git.perx.ru/perxis/perxis-go/pkg/items/mocks" "github.com/stretchr/testify/mock" - "git.perx.ru/perxis/perxis-go/pkg/items" + "git.perx.ru/perxis/perxis-go/items" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go index ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..a7663b67cc993a78491d07d0b039e2c2060731e5 100644 --- a/pkg/setup/setup_test.go +++ b/pkg/setup/setup_test.go @@ -5,11 +5,11 @@ import ( "errors" "testing" + itemsMock "git.perx.ru/perxis/perxis-go/items/mocks" clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks" collectionMock "git.perx.ru/perxis/perxis-go/pkg/collections/mocks" "git.perx.ru/perxis/perxis-go/pkg/data" environmentMock "git.perx.ru/perxis/perxis-go/pkg/environments/mocks" - itemsMock "git.perx.ru/perxis/perxis-go/pkg/items/mocks" rolesMock "git.perx.ru/perxis/perxis-go/pkg/roles/mocks" "git.perx.ru/perxis/perxis-go/pkg/spaces" "git.perx.ru/perxis/perxis-go/pkg/spaces/mocks" @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/clients" "git.perx.ru/perxis/perxis-go/pkg/collections" "git.perx.ru/perxis/perxis-go/pkg/content" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/roles" "git.perx.ru/perxis/perxis-go/pkg/schema" "go.uber.org/zap/zaptest" diff --git a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go index 6797cc200801de828c8cefe14c085280188a6a75..20bac49913019702db71ad11c9a1a3e45369684d 100644 --- a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -7,7 +7,7 @@ import ( "context" "errors" - transportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc" + transportgrpc "git.perx.ru/perxis/perxis-go/items/transport/grpc" transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport" pb "git.perx.ru/perxis/perxis-go/proto/spaces" empty "google.golang.org/protobuf/types/known/emptypb" diff --git a/pkg/template/builder_test.go b/pkg/template/builder_test.go index 128f706423f3ecc67097a76b8926fbed619eb1ce..856227903ea8d26450e18ee4212659e3563e2a1e 100644 --- a/pkg/template/builder_test.go +++ b/pkg/template/builder_test.go @@ -5,13 +5,13 @@ import ( "errors" "testing" + "git.perx.ru/perxis/perxis-go/items" + mocksitems "git.perx.ru/perxis/perxis-go/items/mocks" "git.perx.ru/perxis/perxis-go/pkg/collections" colsmocks "git.perx.ru/perxis/perxis-go/pkg/collections/mocks" "git.perx.ru/perxis/perxis-go/pkg/content" "git.perx.ru/perxis/perxis-go/pkg/environments" envsmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks" - "git.perx.ru/perxis/perxis-go/pkg/items" - mocksitems "git.perx.ru/perxis/perxis-go/pkg/items/mocks" "git.perx.ru/perxis/perxis-go/pkg/spaces" spsmocks "git.perx.ru/perxis/perxis-go/pkg/spaces/mocks" "github.com/stretchr/testify/assert" diff --git a/zap/field_test.go b/zap/field_test.go index 46c4ee50722934e7d9ddd5ea759d01f3836706f8..9b277f04977f42e6ec70945e568896df66ac7476 100644 --- a/zap/field_test.go +++ b/zap/field_test.go @@ -5,8 +5,8 @@ import ( "testing" "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/items" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/items" "git.perx.ru/perxis/perxis-go/pkg/users" "github.com/stretchr/testify/assert" "go.uber.org/zap"