From b8071f903e8fc9876baeb36d2ffedab3c303bd4d Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Tue, 15 Oct 2024 15:07:48 +0300
Subject: [PATCH] pkg clients moved from pkg

---
 {pkg/clients => clients}/client.go                            | 0
 {pkg/clients => clients}/errors.go                            | 0
 {pkg/clients => clients}/events.go                            | 0
 .../middleware/access_logging_middleware.go                   | 2 +-
 {pkg/clients => clients}/middleware/caching_middleware.go     | 2 +-
 .../clients => clients}/middleware/caching_middleware_test.go | 4 ++--
 .../middleware/error_logging_middleware.go                    | 2 +-
 {pkg/clients => clients}/middleware/logging_middleware.go     | 2 +-
 {pkg/clients => clients}/middleware/middleware.go             | 2 +-
 {pkg/clients => clients}/middleware/recovering_middleware.go  | 2 +-
 {pkg/clients => clients}/middleware/telemetry_middleware.go   | 2 +-
 {pkg/clients => clients}/mocks/Clients.go                     | 2 +-
 {pkg/clients => clients}/mocks/Middleware.go                  | 2 +-
 {pkg/clients => clients}/mocks/Storage.go                     | 2 +-
 {pkg/clients => clients}/service.go                           | 0
 {pkg/clients => clients}/storage.go                           | 0
 {pkg/clients => clients}/transport/client.go                  | 2 +-
 {pkg/clients => clients}/transport/endpoints.microgen.go      | 0
 {pkg/clients => clients}/transport/exchanges.microgen.go      | 2 +-
 {pkg/clients => clients}/transport/grpc/client.go             | 2 +-
 {pkg/clients => clients}/transport/grpc/client.microgen.go    | 2 +-
 .../transport/grpc/protobuf_endpoint_converters.microgen.go   | 4 ++--
 .../transport/grpc/protobuf_type_converters.microgen.go       | 2 +-
 {pkg/clients => clients}/transport/grpc/server.go             | 4 ++--
 {pkg/clients => clients}/transport/grpc/server.microgen.go    | 2 +-
 {pkg/clients => clients}/transport/server.microgen.go         | 2 +-
 id/system/system.go                                           | 2 +-
 id/test/object_id_test.go                                     | 2 +-
 pkg/auth/client.go                                            | 2 +-
 pkg/auth/factory.go                                           | 2 +-
 pkg/content/client.go                                         | 4 ++--
 pkg/content/content.go                                        | 2 +-
 pkg/extension/service/extension.go                            | 2 +-
 pkg/items/context.go                                          | 2 +-
 pkg/setup/client.go                                           | 2 +-
 pkg/setup/client_test.go                                      | 4 ++--
 pkg/setup/setup_test.go                                       | 4 ++--
 37 files changed, 37 insertions(+), 37 deletions(-)
 rename {pkg/clients => clients}/client.go (100%)
 rename {pkg/clients => clients}/errors.go (100%)
 rename {pkg/clients => clients}/events.go (100%)
 rename {pkg/clients => clients}/middleware/access_logging_middleware.go (98%)
 rename {pkg/clients => clients}/middleware/caching_middleware.go (98%)
 rename {pkg/clients => clients}/middleware/caching_middleware_test.go (99%)
 rename {pkg/clients => clients}/middleware/error_logging_middleware.go (98%)
 rename {pkg/clients => clients}/middleware/logging_middleware.go (98%)
 rename {pkg/clients => clients}/middleware/middleware.go (94%)
 rename {pkg/clients => clients}/middleware/recovering_middleware.go (98%)
 rename {pkg/clients => clients}/middleware/telemetry_middleware.go (99%)
 rename {pkg/clients => clients}/mocks/Clients.go (98%)
 rename {pkg/clients => clients}/mocks/Middleware.go (95%)
 rename {pkg/clients => clients}/mocks/Storage.go (98%)
 rename {pkg/clients => clients}/service.go (100%)
 rename {pkg/clients => clients}/storage.go (100%)
 rename {pkg/clients => clients}/transport/client.go (97%)
 rename {pkg/clients => clients}/transport/endpoints.microgen.go (100%)
 rename {pkg/clients => clients}/transport/exchanges.microgen.go (95%)
 rename {pkg/clients => clients}/transport/grpc/client.go (92%)
 rename {pkg/clients => clients}/transport/grpc/client.microgen.go (96%)
 rename {pkg/clients => clients}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%)
 rename {pkg/clients => clients}/transport/grpc/protobuf_type_converters.microgen.go (98%)
 rename {pkg/clients => clients}/transport/grpc/server.go (89%)
 rename {pkg/clients => clients}/transport/grpc/server.microgen.go (97%)
 rename {pkg/clients => clients}/transport/server.microgen.go (97%)

diff --git a/pkg/clients/client.go b/clients/client.go
similarity index 100%
rename from pkg/clients/client.go
rename to clients/client.go
diff --git a/pkg/clients/errors.go b/clients/errors.go
similarity index 100%
rename from pkg/clients/errors.go
rename to clients/errors.go
diff --git a/pkg/clients/events.go b/clients/events.go
similarity index 100%
rename from pkg/clients/events.go
rename to clients/events.go
diff --git a/pkg/clients/middleware/access_logging_middleware.go b/clients/middleware/access_logging_middleware.go
similarity index 98%
rename from pkg/clients/middleware/access_logging_middleware.go
rename to clients/middleware/access_logging_middleware.go
index 66379ef0..3fb88df8 100644
--- a/pkg/clients/middleware/access_logging_middleware.go
+++ b/clients/middleware/access_logging_middleware.go
@@ -10,8 +10,8 @@ import (
 	"context"
 	"time"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/caching_middleware.go b/clients/middleware/caching_middleware.go
similarity index 98%
rename from pkg/clients/middleware/caching_middleware.go
rename to clients/middleware/caching_middleware.go
index 0dd4f15b..2ec13cdb 100644
--- a/pkg/clients/middleware/caching_middleware.go
+++ b/clients/middleware/caching_middleware.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"strings"
 
+	service "git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
-	service "git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 )
 
diff --git a/pkg/clients/middleware/caching_middleware_test.go b/clients/middleware/caching_middleware_test.go
similarity index 99%
rename from pkg/clients/middleware/caching_middleware_test.go
rename to clients/middleware/caching_middleware_test.go
index 821d2cb2..4b7659eb 100644
--- a/pkg/clients/middleware/caching_middleware_test.go
+++ b/clients/middleware/caching_middleware_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
+	"git.perx.ru/perxis/perxis-go/clients"
+	csmocks "git.perx.ru/perxis/perxis-go/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/cache"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	csmocks "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/pkg/clients/middleware/error_logging_middleware.go b/clients/middleware/error_logging_middleware.go
similarity index 98%
rename from pkg/clients/middleware/error_logging_middleware.go
rename to clients/middleware/error_logging_middleware.go
index 3e60cc1d..6b6b178e 100644
--- a/pkg/clients/middleware/error_logging_middleware.go
+++ b/clients/middleware/error_logging_middleware.go
@@ -9,7 +9,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/logging_middleware.go b/clients/middleware/logging_middleware.go
similarity index 98%
rename from pkg/clients/middleware/logging_middleware.go
rename to clients/middleware/logging_middleware.go
index 8cc5e384..78763be7 100644
--- a/pkg/clients/middleware/logging_middleware.go
+++ b/clients/middleware/logging_middleware.go
@@ -3,8 +3,8 @@ package middleware
 import (
 	"context"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/id"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	logzap "git.perx.ru/perxis/perxis-go/zap"
 	"go.uber.org/zap"
 )
diff --git a/pkg/clients/middleware/middleware.go b/clients/middleware/middleware.go
similarity index 94%
rename from pkg/clients/middleware/middleware.go
rename to clients/middleware/middleware.go
index 945ae1f2..4565f619 100644
--- a/pkg/clients/middleware/middleware.go
+++ b/clients/middleware/middleware.go
@@ -7,7 +7,7 @@ package middleware
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/clients -i Clients -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/recovering_middleware.go b/clients/middleware/recovering_middleware.go
similarity index 98%
rename from pkg/clients/middleware/recovering_middleware.go
rename to clients/middleware/recovering_middleware.go
index 2406ca99..9aa1e78a 100644
--- a/pkg/clients/middleware/recovering_middleware.go
+++ b/clients/middleware/recovering_middleware.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"fmt"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/clients/middleware/telemetry_middleware.go b/clients/middleware/telemetry_middleware.go
similarity index 99%
rename from pkg/clients/middleware/telemetry_middleware.go
rename to clients/middleware/telemetry_middleware.go
index cbb21715..d1aff776 100644
--- a/pkg/clients/middleware/telemetry_middleware.go
+++ b/clients/middleware/telemetry_middleware.go
@@ -10,9 +10,9 @@ import (
 	"context"
 	"time"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	oid "git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/clients/mocks/Clients.go b/clients/mocks/Clients.go
similarity index 98%
rename from pkg/clients/mocks/Clients.go
rename to clients/mocks/Clients.go
index 289555ad..2ef13b1b 100644
--- a/pkg/clients/mocks/Clients.go
+++ b/clients/mocks/Clients.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	context "context"
 
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 
 	mock "github.com/stretchr/testify/mock"
 )
diff --git a/pkg/clients/mocks/Middleware.go b/clients/mocks/Middleware.go
similarity index 95%
rename from pkg/clients/mocks/Middleware.go
rename to clients/mocks/Middleware.go
index 7a409ad3..d42be357 100644
--- a/pkg/clients/mocks/Middleware.go
+++ b/clients/mocks/Middleware.go
@@ -3,7 +3,7 @@
 package mocks
 
 import (
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 
 	mock "github.com/stretchr/testify/mock"
 )
diff --git a/pkg/clients/mocks/Storage.go b/clients/mocks/Storage.go
similarity index 98%
rename from pkg/clients/mocks/Storage.go
rename to clients/mocks/Storage.go
index d5cb616c..c5406ece 100644
--- a/pkg/clients/mocks/Storage.go
+++ b/clients/mocks/Storage.go
@@ -5,7 +5,7 @@ package mocks
 import (
 	context "context"
 
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 
 	mock "github.com/stretchr/testify/mock"
 
diff --git a/pkg/clients/service.go b/clients/service.go
similarity index 100%
rename from pkg/clients/service.go
rename to clients/service.go
diff --git a/pkg/clients/storage.go b/clients/storage.go
similarity index 100%
rename from pkg/clients/storage.go
rename to clients/storage.go
diff --git a/pkg/clients/transport/client.go b/clients/transport/client.go
similarity index 97%
rename from pkg/clients/transport/client.go
rename to clients/transport/client.go
index 008f60b0..daa5545e 100644
--- a/pkg/clients/transport/client.go
+++ b/clients/transport/client.go
@@ -4,7 +4,7 @@ package transport
 
 import (
 	"context"
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 )
 
 func (set EndpointsSet) Create(arg0 context.Context, arg1 *clients.Client) (res0 *clients.Client, res1 error) {
diff --git a/pkg/clients/transport/endpoints.microgen.go b/clients/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/clients/transport/endpoints.microgen.go
rename to clients/transport/endpoints.microgen.go
diff --git a/pkg/clients/transport/exchanges.microgen.go b/clients/transport/exchanges.microgen.go
similarity index 95%
rename from pkg/clients/transport/exchanges.microgen.go
rename to clients/transport/exchanges.microgen.go
index 2a1a8e65..bdfd0cbc 100644
--- a/pkg/clients/transport/exchanges.microgen.go
+++ b/clients/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
 
 package transport
 
-import clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+import clients "git.perx.ru/perxis/perxis-go/clients"
 
 type (
 	CreateRequest struct {
diff --git a/pkg/clients/transport/grpc/client.go b/clients/transport/grpc/client.go
similarity index 92%
rename from pkg/clients/transport/grpc/client.go
rename to clients/transport/grpc/client.go
index fe6ba6fc..b1d2aefd 100644
--- a/pkg/clients/transport/grpc/client.go
+++ b/clients/transport/grpc/client.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	transport "git.perx.ru/perxis/perxis-go/clients/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/clients/transport/grpc/client.microgen.go b/clients/transport/grpc/client.microgen.go
similarity index 96%
rename from pkg/clients/transport/grpc/client.microgen.go
rename to clients/transport/grpc/client.microgen.go
index c2fa38b4..e2005269 100644
--- a/pkg/clients/transport/grpc/client.microgen.go
+++ b/clients/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go b/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 98%
rename from pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to clients/transport/grpc/protobuf_endpoint_converters.microgen.go
index 3e9e5219..1450f2f2 100644
--- a/pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/clients/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"errors"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	"git.perx.ru/perxis/perxis-go/clients"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	empty "google.golang.org/protobuf/types/known/emptypb"
 )
diff --git a/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go b/clients/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
rename to clients/transport/grpc/protobuf_type_converters.microgen.go
index bad21c1b..08c381dd 100644
--- a/pkg/clients/transport/grpc/protobuf_type_converters.microgen.go
+++ b/clients/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
 package transportgrpc
 
 import (
-	service "git.perx.ru/perxis/perxis-go/pkg/clients"
+	service "git.perx.ru/perxis/perxis-go/clients"
 	permission "git.perx.ru/perxis/perxis-go/pkg/permission"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	commonpb "git.perx.ru/perxis/perxis-go/proto/common"
diff --git a/pkg/clients/transport/grpc/server.go b/clients/transport/grpc/server.go
similarity index 89%
rename from pkg/clients/transport/grpc/server.go
rename to clients/transport/grpc/server.go
index ee019551..a30930a4 100644
--- a/pkg/clients/transport/grpc/server.go
+++ b/clients/transport/grpc/server.go
@@ -1,8 +1,8 @@
 package transportgrpc
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	"git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	"git.perx.ru/perxis/perxis-go/clients"
+	"git.perx.ru/perxis/perxis-go/clients/transport"
 	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpckit "github.com/go-kit/kit/transport/grpc"
diff --git a/pkg/clients/transport/grpc/server.microgen.go b/clients/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/clients/transport/grpc/server.microgen.go
rename to clients/transport/grpc/server.microgen.go
index 17bb2b0b..4248ea74 100644
--- a/pkg/clients/transport/grpc/server.microgen.go
+++ b/clients/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
+	transport "git.perx.ru/perxis/perxis-go/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	context "golang.org/x/net/context"
diff --git a/pkg/clients/transport/server.microgen.go b/clients/transport/server.microgen.go
similarity index 97%
rename from pkg/clients/transport/server.microgen.go
rename to clients/transport/server.microgen.go
index 4c8b6a3e..647b8525 100644
--- a/pkg/clients/transport/server.microgen.go
+++ b/clients/transport/server.microgen.go
@@ -4,7 +4,7 @@ package transport
 
 import (
 	"context"
-	clients "git.perx.ru/perxis/perxis-go/pkg/clients"
+	clients "git.perx.ru/perxis/perxis-go/clients"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..3c375228 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"reflect"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/items"
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa12..2e454d58 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -3,9 +3,9 @@ package test
 import (
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/id"
 	_ "git.perx.ru/perxis/perxis-go/id/system"
-	"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"
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a568..076b1c73 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/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"
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a..2226cb56 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -3,7 +3,7 @@ package auth
 import (
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/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"
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784..64d88c6d 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,9 +3,9 @@ package content
 import (
 	"time"
 
+	clientsSvc "git.perx.ru/perxis/perxis-go/clients/middleware"
+	clientsTransportGrpc "git.perx.ru/perxis/perxis-go/clients/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"
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e93..8736d35d 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -1,8 +1,8 @@
 package content
 
 import (
+	"git.perx.ru/perxis/perxis-go/clients"
 	"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"
diff --git a/pkg/extension/service/extension.go b/pkg/extension/service/extension.go
index 5d57e56c..e3716376 100644
--- a/pkg/extension/service/extension.go
+++ b/pkg/extension/service/extension.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	"git.perx.ru/perxis/perxis-go/pkg/content"
 	"git.perx.ru/perxis/perxis-go/pkg/extension"
diff --git a/pkg/items/context.go b/pkg/items/context.go
index 87e600e5..09a0300b 100644
--- a/pkg/items/context.go
+++ b/pkg/items/context.go
@@ -3,7 +3,7 @@ package items
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
 )
diff --git a/pkg/setup/client.go b/pkg/setup/client.go
index c40ad506..afea8185 100644
--- a/pkg/setup/client.go
+++ b/pkg/setup/client.go
@@ -6,7 +6,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/clients"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/setup/client_test.go b/pkg/setup/client_test.go
index 6626ec18..461c4846 100644
--- a/pkg/setup/client_test.go
+++ b/pkg/setup/client_test.go
@@ -3,8 +3,8 @@ package setup
 import (
 	"testing"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
-	clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
+	"git.perx.ru/perxis/perxis-go/clients"
+	clientsMock "git.perx.ru/perxis/perxis-go/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745..92c251ea 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
+	clientsMock "git.perx.ru/perxis/perxis-go/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"
@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"git.perx.ru/perxis/perxis-go/pkg/clients"
+	"git.perx.ru/perxis/perxis-go/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"
-- 
GitLab