diff --git a/pkg/collections/collection.go b/pkg/collections/collection.go index 63e2e93f315a49fd7b2ae462189545d147e84de7..5b3c5dd310ac8af32ee11e9e18c4aa1a3d4c72f3 100644 --- a/pkg/collections/collection.go +++ b/pkg/collections/collection.go @@ -3,9 +3,8 @@ package collections import ( "time" - // todo fix after pkg and schema will be added - "git.perx.ru/perxis/perxis/pkg/permission" - "git.perx.ru/perxis/perxis/schema" + "git.perx.ru/perxis/perxis-go/pkg/permission" + "git.perx.ru/perxis/perxis-go/pkg/schema" ) // Config diff --git a/pkg/collections/mocks/Collections.go b/pkg/collections/mocks/Collections.go index 5bdccfd0ae1d901b789bd4e847057f8c093de914..692b5a810b479285a0a63a9c9d581872a7c0f454 100644 --- a/pkg/collections/mocks/Collections.go +++ b/pkg/collections/mocks/Collections.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - collections "git.perx.ru/perxis/perxis/services/collections" + collections "git.perx.ru/perxis/perxis-go/pkg/collections" mock "github.com/stretchr/testify/mock" - schema "git.perx.ru/perxis/perxis/schema" + schema "git.perx.ru/perxis/perxis-go/pkg/schema" ) // Collections is an autogenerated mock type for the Collections type diff --git a/pkg/collections/mocks/Middleware.go b/pkg/collections/mocks/Middleware.go index fd318f599c5dabd76f4164e20848b22387783191..6ba09040d10b0401bf1283371bf2b4fbf7401af6 100644 --- a/pkg/collections/mocks/Middleware.go +++ b/pkg/collections/mocks/Middleware.go @@ -3,7 +3,7 @@ package mocks import ( - collections "git.perx.ru/perxis/perxis/services/collections" + collections "git.perx.ru/perxis/perxis-go/pkg/collections" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/collections/mocks/Storage.go b/pkg/collections/mocks/Storage.go index 0a17c5bcdecc05f9346da61a646df464192cb63d..e219e50c4e5122158c1f7dfb5bb88ff1f93d0641 100644 --- a/pkg/collections/mocks/Storage.go +++ b/pkg/collections/mocks/Storage.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - collections "git.perx.ru/perxis/perxis/services/collections" + collections "git.perx.ru/perxis/perxis-go/pkg/collections" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/collections/service.go b/pkg/collections/service.go index e5c7649c782a1d8dccfd0b55ac2070f6ad36afbb..e73133e7c5ecbf6f58d29b2f07343f05bb13d5b0 100644 --- a/pkg/collections/service.go +++ b/pkg/collections/service.go @@ -1,19 +1,13 @@ package collections -//go:generate gowrap gen -i Collections -t ../../templates/middleware/middleware -o service/middleware.go -//go:generate gowrap gen -i Collections -t ../../templates/middleware/error_log -o service/error_logging_middleware.go -//go:generate gowrap gen -i Collections -t ../../templates/middleware/access_log -o service/logging_middleware.go -//go:generate gowrap gen -i Collections -t ../../templates/middleware/recovery -o service/recovering_middleware.go -//go:generate gowrap gen -i Collections -t ../../templates/middleware/telemetry -o service/telemetry_middleware.go - import ( "context" - "git.perx.ru/perxis/perxis/schema" + "git.perx.ru/perxis/perxis-go/pkg/schema" ) // @microgen grpc -// @protobuf git.perx.ru/perxis/perxis/proto/collections +// @protobuf git.perx.ru/perxis/perxis-go/proto/collections // @grpc-addr content.collections.Collections type Collections interface { Create(ctx context.Context, collection *Collection) (created *Collection, err error) diff --git a/pkg/collections/transport/client.microgen.go b/pkg/collections/transport/client.microgen.go index 144e84eafa5ae90ba6f5ef98e04cdbccc1ceb439..33cb0079a4287462596b9b25f58f134a4a61ad0c 100644 --- a/pkg/collections/transport/client.microgen.go +++ b/pkg/collections/transport/client.microgen.go @@ -5,8 +5,8 @@ package transport import ( "context" "errors" - schema "git.perx.ru/perxis/perxis/schema" - collections "git.perx.ru/perxis/perxis/services/collections" + collections "git.perx.ru/perxis/perxis-go/pkg/collections" + schema "git.perx.ru/perxis/perxis-go/pkg/schema" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" ) diff --git a/pkg/collections/transport/exchanges.microgen.go b/pkg/collections/transport/exchanges.microgen.go index 421e4f5f642e9bd11812f1f5f7e4d09a28ff8e77..3aabcbc890d2e5691fe6167024254bba71f5fe2d 100644 --- a/pkg/collections/transport/exchanges.microgen.go +++ b/pkg/collections/transport/exchanges.microgen.go @@ -3,8 +3,8 @@ package transport import ( - schema "git.perx.ru/perxis/perxis/schema" - collections "git.perx.ru/perxis/perxis/services/collections" + collections "git.perx.ru/perxis/perxis-go/pkg/collections" + schema "git.perx.ru/perxis/perxis-go/pkg/schema" ) type ( diff --git a/pkg/collections/transport/server.microgen.go b/pkg/collections/transport/server.microgen.go index dfe7a58f430dcb4bbf72212bb4224557c9b5ed93..548d611d7fe235f85c98563f19b2240bdd7e6c12 100644 --- a/pkg/collections/transport/server.microgen.go +++ b/pkg/collections/transport/server.microgen.go @@ -4,7 +4,7 @@ package transport import ( "context" - collections "git.perx.ru/perxis/perxis/services/collections" + collections "git.perx.ru/perxis/perxis-go/pkg/collections" endpoint "github.com/go-kit/kit/endpoint" )