diff --git a/pkg/collaborators/collaborator.go b/collaborators/collaborator.go
similarity index 100%
rename from pkg/collaborators/collaborator.go
rename to collaborators/collaborator.go
diff --git a/pkg/collaborators/errors.go b/collaborators/errors.go
similarity index 100%
rename from pkg/collaborators/errors.go
rename to collaborators/errors.go
diff --git a/pkg/collaborators/events.go b/collaborators/events.go
similarity index 100%
rename from pkg/collaborators/events.go
rename to collaborators/events.go
diff --git a/pkg/collaborators/middleware/access_logging_middleware.go b/collaborators/middleware/access_logging_middleware.go
similarity index 98%
rename from pkg/collaborators/middleware/access_logging_middleware.go
rename to collaborators/middleware/access_logging_middleware.go
index 505624ba33f2f91280d3b1dce338262f4a7405d3..cdc31927d596b0e69b7a8832632435124dceedda 100644
--- a/pkg/collaborators/middleware/access_logging_middleware.go
+++ b/collaborators/middleware/access_logging_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
"go.uber.org/zap"
)
diff --git a/pkg/collaborators/middleware/caching_middleware.go b/collaborators/middleware/caching_middleware.go
similarity index 97%
rename from pkg/collaborators/middleware/caching_middleware.go
rename to collaborators/middleware/caching_middleware.go
index 7faeb638b0ca2bb673de4852c21e75b7f1f9afc7..82f1890db7914b51189a13c3ee2821458bddf156 100644
--- a/pkg/collaborators/middleware/caching_middleware.go
+++ b/collaborators/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"strings"
+ service "git.perx.ru/perxis/perxis-go/collaborators"
"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"
)
diff --git a/pkg/collaborators/middleware/caching_middleware_test.go b/collaborators/middleware/caching_middleware_test.go
similarity index 98%
rename from pkg/collaborators/middleware/caching_middleware_test.go
rename to collaborators/middleware/caching_middleware_test.go
index 6b96d0a8ff65dcc56d3139e2b99eac28720bb364..10487cc91e38a2db2b4dfb6f36668655e2df7857 100644
--- a/pkg/collaborators/middleware/caching_middleware_test.go
+++ b/collaborators/middleware/caching_middleware_test.go
@@ -5,9 +5,9 @@ import (
"testing"
"time"
+ "git.perx.ru/perxis/perxis-go/collaborators"
+ csmocks "git.perx.ru/perxis/perxis-go/collaborators/mocks"
"git.perx.ru/perxis/perxis-go/pkg/cache"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
- csmocks "git.perx.ru/perxis/perxis-go/pkg/collaborators/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
diff --git a/pkg/collaborators/middleware/error_logging_middleware.go b/collaborators/middleware/error_logging_middleware.go
similarity index 97%
rename from pkg/collaborators/middleware/error_logging_middleware.go
rename to collaborators/middleware/error_logging_middleware.go
index 6f67ce3ff960815793c8c59d588b012980559334..82ee373261e1dcc62161541528a7c02dffcf5dcd 100644
--- a/pkg/collaborators/middleware/error_logging_middleware.go
+++ b/collaborators/middleware/error_logging_middleware.go
@@ -9,7 +9,7 @@ package middleware
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"go.uber.org/zap"
)
diff --git a/pkg/collaborators/middleware/logging_middleware.go b/collaborators/middleware/logging_middleware.go
similarity index 98%
rename from pkg/collaborators/middleware/logging_middleware.go
rename to collaborators/middleware/logging_middleware.go
index 645750f0ff7244275a70eaac24e98977d9702e0d..3f2c29766c989b6cf1a4b4001f52c0a0da77c480 100644
--- a/pkg/collaborators/middleware/logging_middleware.go
+++ b/collaborators/middleware/logging_middleware.go
@@ -4,8 +4,8 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/collaborators/middleware/middleware.go b/collaborators/middleware/middleware.go
similarity index 94%
rename from pkg/collaborators/middleware/middleware.go
rename to collaborators/middleware/middleware.go
index a336e089fc00e9984ba4ddb1c9d656a46d98c493..7994dc5bb204e9070b4405317f628d676213a3d8 100644
--- a/pkg/collaborators/middleware/middleware.go
+++ b/collaborators/middleware/middleware.go
@@ -7,7 +7,7 @@ package middleware
//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/collaborators -i Collaborators -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"go.uber.org/zap"
)
diff --git a/pkg/collaborators/middleware/recovering_middleware.go b/collaborators/middleware/recovering_middleware.go
similarity index 98%
rename from pkg/collaborators/middleware/recovering_middleware.go
rename to collaborators/middleware/recovering_middleware.go
index 2217ca1f5827cf228c537223c3181701948b50a5..c492b7d2e740351caf6c8fa9e558c7d9a29bf221 100644
--- a/pkg/collaborators/middleware/recovering_middleware.go
+++ b/collaborators/middleware/recovering_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"go.uber.org/zap"
)
diff --git a/pkg/collaborators/middleware/telemetry_middleware.go b/collaborators/middleware/telemetry_middleware.go
similarity index 99%
rename from pkg/collaborators/middleware/telemetry_middleware.go
rename to collaborators/middleware/telemetry_middleware.go
index d4a6f56ccbc0d2b5334d596c8ca88932d677017b..b11792e5a124816773bfa5d114c8e48ece2b3350 100644
--- a/pkg/collaborators/middleware/telemetry_middleware.go
+++ b/collaborators/middleware/telemetry_middleware.go
@@ -10,9 +10,9 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/collaborators"
oid "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"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/collaborators/mocks/CollaboratorObserver.go b/collaborators/mocks/CollaboratorObserver.go
similarity index 100%
rename from pkg/collaborators/mocks/CollaboratorObserver.go
rename to collaborators/mocks/CollaboratorObserver.go
diff --git a/pkg/collaborators/mocks/CollaboratorRemoveObserver.go b/collaborators/mocks/CollaboratorRemoveObserver.go
similarity index 96%
rename from pkg/collaborators/mocks/CollaboratorRemoveObserver.go
rename to collaborators/mocks/CollaboratorRemoveObserver.go
index e2f1b0fc83c34186a3eb06bf82715d1bc44d1aa7..60afec7ff4b542b688688e9fc50bba0c4671b8d5 100644
--- a/pkg/collaborators/mocks/CollaboratorRemoveObserver.go
+++ b/collaborators/mocks/CollaboratorRemoveObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/collaborators/mocks/CollaboratorSetObserver.go b/collaborators/mocks/CollaboratorSetObserver.go
similarity index 95%
rename from pkg/collaborators/mocks/CollaboratorSetObserver.go
rename to collaborators/mocks/CollaboratorSetObserver.go
index 160c16b4e95c8ec7b7842b761a73ed89c1a7bc30..7ef4abde9af041ff1656362edbe9379183bf4e04 100644
--- a/pkg/collaborators/mocks/CollaboratorSetObserver.go
+++ b/collaborators/mocks/CollaboratorSetObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/collaborators/mocks/Collaborators.go b/collaborators/mocks/Collaborators.go
similarity index 98%
rename from pkg/collaborators/mocks/Collaborators.go
rename to collaborators/mocks/Collaborators.go
index 079b9020adda3a36c9d877f7f662b4c9b844ac4f..5805adc944bde8941fc15b1cd51465c8317aad00 100644
--- a/pkg/collaborators/mocks/Collaborators.go
+++ b/collaborators/mocks/Collaborators.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/collaborators/mocks/Middleware.go b/collaborators/mocks/Middleware.go
similarity index 94%
rename from pkg/collaborators/mocks/Middleware.go
rename to collaborators/mocks/Middleware.go
index 10a10f31d239813b95778bb287595fd1cbc96051..549d3cafbd203976b40a4207837a08a27eea3fc8 100644
--- a/pkg/collaborators/mocks/Middleware.go
+++ b/collaborators/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/collaborators/mocks/Storage.go b/collaborators/mocks/Storage.go
similarity index 98%
rename from pkg/collaborators/mocks/Storage.go
rename to collaborators/mocks/Storage.go
index a7ded86e00cbab6a810bc82a5f05224b150a3c79..25a8eed374088d6a3668941ff96a43a1c58ac49a 100644
--- a/pkg/collaborators/mocks/Storage.go
+++ b/collaborators/mocks/Storage.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
diff --git a/pkg/collaborators/observer.go b/collaborators/observer.go
similarity index 100%
rename from pkg/collaborators/observer.go
rename to collaborators/observer.go
diff --git a/pkg/collaborators/service.go b/collaborators/service.go
similarity index 100%
rename from pkg/collaborators/service.go
rename to collaborators/service.go
diff --git a/pkg/collaborators/storage.go b/collaborators/storage.go
similarity index 100%
rename from pkg/collaborators/storage.go
rename to collaborators/storage.go
diff --git a/pkg/collaborators/transport/client.go b/collaborators/transport/client.go
similarity index 96%
rename from pkg/collaborators/transport/client.go
rename to collaborators/transport/client.go
index 1e6477a11347742e6cf250ff336d3ca7f89b5ac0..09ce0165cea99e9675973b9a0127209eb61b2f68 100644
--- a/pkg/collaborators/transport/client.go
+++ b/collaborators/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
)
func (set EndpointsSet) Set(arg0 context.Context, arg1 string, arg2 string, arg3 string) (res0 error) {
diff --git a/pkg/collaborators/transport/endpoints.microgen.go b/collaborators/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/collaborators/transport/endpoints.microgen.go
rename to collaborators/transport/endpoints.microgen.go
diff --git a/pkg/collaborators/transport/exchanges.microgen.go b/collaborators/transport/exchanges.microgen.go
similarity index 92%
rename from pkg/collaborators/transport/exchanges.microgen.go
rename to collaborators/transport/exchanges.microgen.go
index a51674f40f696f15d1f625fbf7923bdd4879e6b5..a00987adf6e6161643ea2b0cbc5a6b4d820ba854 100644
--- a/pkg/collaborators/transport/exchanges.microgen.go
+++ b/collaborators/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+import collaborators "git.perx.ru/perxis/perxis-go/collaborators"
type (
SetRequest struct {
diff --git a/pkg/collaborators/transport/grpc/client.go b/collaborators/transport/grpc/client.go
similarity index 91%
rename from pkg/collaborators/transport/grpc/client.go
rename to collaborators/transport/grpc/client.go
index ed7c951fe02289ce5d20e4ffec6d473024344591..8f01ac78c3e1bc74da329b3c39ebc305b893ba85 100644
--- a/pkg/collaborators/transport/grpc/client.go
+++ b/collaborators/transport/grpc/client.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
+ transport "git.perx.ru/perxis/perxis-go/collaborators/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/collaborators/transport/grpc/client.microgen.go b/collaborators/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/collaborators/transport/grpc/client.microgen.go
rename to collaborators/transport/grpc/client.microgen.go
index 535db8faff2504f93ff27c2f4127348b8aa24166..14bd8a9bb56263c156965e47bd0cc01cd7895797 100644
--- a/pkg/collaborators/transport/grpc/client.microgen.go
+++ b/collaborators/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
+ transport "git.perx.ru/perxis/perxis-go/collaborators/transport"
pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go b/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 98%
rename from pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
index 19c57b787a8c89ee2369a687790dae2f565fffd8..72076284a7f353891cc144b0714b1a52b0dd597f 100644
--- a/pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
"context"
"errors"
- transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
+ transport "git.perx.ru/perxis/perxis-go/collaborators/transport"
pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/collaborators/transport/grpc/protobuf_type_converters.microgen.go b/collaborators/transport/grpc/protobuf_type_converters.microgen.go
similarity index 94%
rename from pkg/collaborators/transport/grpc/protobuf_type_converters.microgen.go
rename to collaborators/transport/grpc/protobuf_type_converters.microgen.go
index 5752acdf6235ab7b1bd09a46fc9ff3c8467ca7df..8d94734c9c16ad812298ddeedfc85c6a02ba5b88 100644
--- a/pkg/collaborators/transport/grpc/protobuf_type_converters.microgen.go
+++ b/collaborators/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
package transportgrpc
import (
- service "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ service "git.perx.ru/perxis/perxis-go/collaborators"
pbcommon "git.perx.ru/perxis/perxis-go/proto/common"
)
diff --git a/pkg/collaborators/transport/grpc/server.go b/collaborators/transport/grpc/server.go
similarity index 87%
rename from pkg/collaborators/transport/grpc/server.go
rename to collaborators/transport/grpc/server.go
index fa96dd487e740a10eadc1efbf8c10509c06940cb..53803dfb1475fefb237f787b35b5c033aab8bded 100644
--- a/pkg/collaborators/transport/grpc/server.go
+++ b/collaborators/transport/grpc/server.go
@@ -1,8 +1,8 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
+ "git.perx.ru/perxis/perxis-go/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
grpckit "github.com/go-kit/kit/transport/grpc"
diff --git a/pkg/collaborators/transport/grpc/server.microgen.go b/collaborators/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/collaborators/transport/grpc/server.microgen.go
rename to collaborators/transport/grpc/server.microgen.go
index aa9dd17f5c752934141722a026ce6f20d76f7046..fcef6976ea99f6b6ed58d8ab90deb16200204d36 100644
--- a/pkg/collaborators/transport/grpc/server.microgen.go
+++ b/collaborators/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
+ transport "git.perx.ru/perxis/perxis-go/collaborators/transport"
pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
grpc "github.com/go-kit/kit/transport/grpc"
context "golang.org/x/net/context"
diff --git a/pkg/collaborators/transport/server.microgen.go b/collaborators/transport/server.microgen.go
similarity index 96%
rename from pkg/collaborators/transport/server.microgen.go
rename to collaborators/transport/server.microgen.go
index 7d0a571d32ebe2ec2a49190a5d79136ff96ba8c1..438cb28490b74cb9429f48f785761a9dbce3d8f8 100644
--- a/pkg/collaborators/transport/server.microgen.go
+++ b/collaborators/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
endpoint "github.com/go-kit/kit/endpoint"
)
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a5683681137c346f6cba91ec3d40c6a331d6..58dc55e637110d877090e62585494ace931525ce 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -4,8 +4,8 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/clients"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a2f15ca7605959b3f5b31996a5c79a164..b8e1a7f13b7bf644ed5c2cc8cb3a70776c59899f 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -3,8 +3,8 @@ package auth
import (
"strings"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/clients"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/roles"
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 29e879457bebc4da201ce126c6c140e02989f2c0..83d6d642497b69eee9a9e90780cd73fd22e09fef 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784dff8fccd5b505867bf65efb373a9149d..b77184734d7fa795ca4b066a860cdfd8a361fdd5 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,11 +3,11 @@ package content
import (
"time"
+ collaboratorsSvc "git.perx.ru/perxis/perxis-go/collaborators/middleware"
+ collaboratorsTransportGrpc "git.perx.ru/perxis/perxis-go/collaborators/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"
- collaboratorsSvc "git.perx.ru/perxis/perxis-go/pkg/collaborators/middleware"
- collaboratorsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport/grpc"
collectionsSvc "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
collectionsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/collections/transport/grpc"
environmentsSvc "git.perx.ru/perxis/perxis-go/pkg/environments/middleware"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..6a4eec30fdaf8d85c89fdb8fb54ee97294ae2b48 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,9 +1,9 @@
package content
import (
+ "git.perx.ru/perxis/perxis-go/collaborators"
"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"
diff --git a/pkg/members/mocks/Observer.go b/pkg/members/mocks/Observer.go
index 8914e2119836d48d78069c4315d03ceafc083170..8ebd17a4947debfa455a93c0e9e41c994abb3a54 100644
--- a/pkg/members/mocks/Observer.go
+++ b/pkg/members/mocks/Observer.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/members/observer/middleware/access_logging_middleware.go b/pkg/members/observer/middleware/access_logging_middleware.go
index 48e9da969978baf7abdad1ae3c9a92582f56d299..0cee5c057a68c0f60fe8b7f72fddada96cbd9ac7 100644
--- a/pkg/members/observer/middleware/access_logging_middleware.go
+++ b/pkg/members/observer/middleware/access_logging_middleware.go
@@ -10,8 +10,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/members/observer"
"go.uber.org/zap"
)
diff --git a/pkg/members/observer/middleware/error_logging_middleware.go b/pkg/members/observer/middleware/error_logging_middleware.go
index 462eff251d5aec0648d4ef7e8d60e200896cbe6e..a07d983f5ef34573b09e550145256e517e415d41 100644
--- a/pkg/members/observer/middleware/error_logging_middleware.go
+++ b/pkg/members/observer/middleware/error_logging_middleware.go
@@ -9,7 +9,7 @@ package middleware
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/members/observer"
"go.uber.org/zap"
)
diff --git a/pkg/members/observer/middleware/recovering_middleware.go b/pkg/members/observer/middleware/recovering_middleware.go
index f4d96995ded61101fde4a8faabf21da84000f1fb..2dffb24c22554081302f04a45e5248e29c483d8a 100644
--- a/pkg/members/observer/middleware/recovering_middleware.go
+++ b/pkg/members/observer/middleware/recovering_middleware.go
@@ -10,7 +10,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
"git.perx.ru/perxis/perxis-go/pkg/members/observer"
"go.uber.org/zap"
)
diff --git a/pkg/members/observer/mocks/Observer.go b/pkg/members/observer/mocks/Observer.go
index d0e34ba31f431fe891a1bebf230aee9f72447283..9b1de75b1c435907d2366e0350fa72f67143b47b 100644
--- a/pkg/members/observer/mocks/Observer.go
+++ b/pkg/members/observer/mocks/Observer.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/members/observer/service.go b/pkg/members/observer/service.go
index 2a4ecb7828ff828baa36d5eb09589f9727dfe1ac..d78dbbae12c2526d4352c21025b4bb2a749bf47b 100644
--- a/pkg/members/observer/service.go
+++ b/pkg/members/observer/service.go
@@ -3,7 +3,7 @@ package observer
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ "git.perx.ru/perxis/perxis-go/collaborators"
)
// @microgen grpc
diff --git a/pkg/members/observer/transport/client.go b/pkg/members/observer/transport/client.go
index 957fd556fe9e43bac595faed40a5da3b6bd06045..93d5e7523a33a133faacd1e2638efbb76c7eefdd 100644
--- a/pkg/members/observer/transport/client.go
+++ b/pkg/members/observer/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
)
func (set EndpointsSet) OnCollaboratorSet(arg0 context.Context, arg1 *collaborators.Collaborator) (res0 string, res1 error) {
diff --git a/pkg/members/observer/transport/exchanges.microgen.go b/pkg/members/observer/transport/exchanges.microgen.go
index 56b68bd77675c788e11605b58a6e2ef9c1cffd7e..51c3d1d11eb367fafc8d460e173faa597d1913ce 100644
--- a/pkg/members/observer/transport/exchanges.microgen.go
+++ b/pkg/members/observer/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+import collaborators "git.perx.ru/perxis/perxis-go/collaborators"
type (
OnCollaboratorSetRequest struct {
diff --git a/pkg/members/observer/transport/grpc/protobuf_type_converters.microgen.go b/pkg/members/observer/transport/grpc/protobuf_type_converters.microgen.go
index 9016b6319c0747adcb032e119623a19aa3696ca6..cdc174ddacbf14a306025a421fea8d4fe4ea3184 100644
--- a/pkg/members/observer/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/members/observer/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
package transportgrpc
import (
- collaborators "git.perx.ru/perxis/perxis-go/pkg/collaborators"
+ collaborators "git.perx.ru/perxis/perxis-go/collaborators"
pbcommon "git.perx.ru/perxis/perxis-go/proto/common"
)