From c9250bc4a76a4b4630dd28e287b7aa7053a3dcca Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Tue, 15 Oct 2024 15:58:33 +0300
Subject: [PATCH] pkg collaborators moved from pkg
---
{pkg/collaborators => collaborators}/collaborator.go | 0
{pkg/collaborators => collaborators}/errors.go | 0
{pkg/collaborators => collaborators}/events.go | 0
.../middleware/access_logging_middleware.go | 2 +-
.../middleware/caching_middleware.go | 2 +-
.../middleware/caching_middleware_test.go | 4 ++--
.../middleware/error_logging_middleware.go | 2 +-
.../middleware/logging_middleware.go | 2 +-
{pkg/collaborators => collaborators}/middleware/middleware.go | 2 +-
.../middleware/recovering_middleware.go | 2 +-
.../middleware/telemetry_middleware.go | 2 +-
.../mocks/CollaboratorObserver.go | 0
.../mocks/CollaboratorRemoveObserver.go | 2 +-
.../mocks/CollaboratorSetObserver.go | 2 +-
{pkg/collaborators => collaborators}/mocks/Collaborators.go | 2 +-
{pkg/collaborators => collaborators}/mocks/Middleware.go | 2 +-
{pkg/collaborators => collaborators}/mocks/Storage.go | 2 +-
{pkg/collaborators => collaborators}/observer.go | 0
{pkg/collaborators => collaborators}/service.go | 0
{pkg/collaborators => collaborators}/storage.go | 0
{pkg/collaborators => collaborators}/transport/client.go | 2 +-
.../transport/endpoints.microgen.go | 0
.../transport/exchanges.microgen.go | 2 +-
{pkg/collaborators => collaborators}/transport/grpc/client.go | 2 +-
.../transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/collaborators => collaborators}/transport/grpc/server.go | 4 ++--
.../transport/grpc/server.microgen.go | 2 +-
.../transport/server.microgen.go | 2 +-
pkg/auth/client.go | 2 +-
pkg/auth/factory.go | 2 +-
pkg/auth/user.go | 2 +-
pkg/content/client.go | 4 ++--
pkg/content/content.go | 2 +-
pkg/members/mocks/Observer.go | 2 +-
pkg/members/observer/middleware/access_logging_middleware.go | 2 +-
pkg/members/observer/middleware/error_logging_middleware.go | 2 +-
pkg/members/observer/middleware/recovering_middleware.go | 2 +-
pkg/members/observer/mocks/Observer.go | 2 +-
pkg/members/observer/service.go | 2 +-
pkg/members/observer/transport/client.go | 2 +-
pkg/members/observer/transport/exchanges.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
44 files changed, 39 insertions(+), 39 deletions(-)
rename {pkg/collaborators => collaborators}/collaborator.go (100%)
rename {pkg/collaborators => collaborators}/errors.go (100%)
rename {pkg/collaborators => collaborators}/events.go (100%)
rename {pkg/collaborators => collaborators}/middleware/access_logging_middleware.go (98%)
rename {pkg/collaborators => collaborators}/middleware/caching_middleware.go (97%)
rename {pkg/collaborators => collaborators}/middleware/caching_middleware_test.go (98%)
rename {pkg/collaborators => collaborators}/middleware/error_logging_middleware.go (97%)
rename {pkg/collaborators => collaborators}/middleware/logging_middleware.go (98%)
rename {pkg/collaborators => collaborators}/middleware/middleware.go (94%)
rename {pkg/collaborators => collaborators}/middleware/recovering_middleware.go (98%)
rename {pkg/collaborators => collaborators}/middleware/telemetry_middleware.go (99%)
rename {pkg/collaborators => collaborators}/mocks/CollaboratorObserver.go (100%)
rename {pkg/collaborators => collaborators}/mocks/CollaboratorRemoveObserver.go (96%)
rename {pkg/collaborators => collaborators}/mocks/CollaboratorSetObserver.go (95%)
rename {pkg/collaborators => collaborators}/mocks/Collaborators.go (98%)
rename {pkg/collaborators => collaborators}/mocks/Middleware.go (94%)
rename {pkg/collaborators => collaborators}/mocks/Storage.go (98%)
rename {pkg/collaborators => collaborators}/observer.go (100%)
rename {pkg/collaborators => collaborators}/service.go (100%)
rename {pkg/collaborators => collaborators}/storage.go (100%)
rename {pkg/collaborators => collaborators}/transport/client.go (96%)
rename {pkg/collaborators => collaborators}/transport/endpoints.microgen.go (100%)
rename {pkg/collaborators => collaborators}/transport/exchanges.microgen.go (92%)
rename {pkg/collaborators => collaborators}/transport/grpc/client.go (91%)
rename {pkg/collaborators => collaborators}/transport/grpc/client.microgen.go (95%)
rename {pkg/collaborators => collaborators}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%)
rename {pkg/collaborators => collaborators}/transport/grpc/protobuf_type_converters.microgen.go (94%)
rename {pkg/collaborators => collaborators}/transport/grpc/server.go (87%)
rename {pkg/collaborators => collaborators}/transport/grpc/server.microgen.go (97%)
rename {pkg/collaborators => collaborators}/transport/server.microgen.go (96%)
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 505624ba..cdc31927 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 7faeb638..82f1890d 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 6b96d0a8..10487cc9 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 6f67ce3f..82ee3732 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 645750f0..3f2c2976 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 a336e089..7994dc5b 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 2217ca1f..c492b7d2 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 d4a6f56c..b11792e5 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 e2f1b0fc..60afec7f 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 160c16b4..7ef4abde 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 079b9020..5805adc9 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 10a10f31..549d3caf 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 a7ded86e..25a8eed3 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 1e6477a1..09ce0165 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 a51674f4..a00987ad 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 ed7c951f..8f01ac78 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 535db8fa..14bd8a9b 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 19c57b78..72076284 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 5752acdf..8d94734c 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 fa96dd48..53803dfb 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 aa9dd17f..fcef6976 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 7d0a571d..438cb284 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 9db7a568..58dc55e6 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 2394c62a..b8e1a7f1 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 29e87945..83d6d642 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 adc5f784..b7718473 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 1d351e93..6a4eec30 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 8914e211..8ebd17a4 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 48e9da96..0cee5c05 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 462eff25..a07d983f 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 f4d96995..2dffb24c 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 d0e34ba3..9b1de75b 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 2a4ecb78..d78dbbae 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 957fd556..93d5e752 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 56b68bd7..51c3d1d1 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 9016b631..cdc174dd 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"
)
--
GitLab