diff --git a/id/system/system.go b/id/system/system.go
index c33995d905a615b6c24422e27239da34141d4752..3aba88bc9356cbeee89b34c2c6676f9335b505ae 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -12,9 +12,9 @@ import (
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/roles"
)
func Handler(obj any) *id.ObjectId {
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa125e376623ceb710bbe594235b8434d853..b55ae204c2ae496383e0f8119c41d2183e66ffa6 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -11,9 +11,9 @@ import (
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/roles"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/auth/anonymous.go b/pkg/auth/anonymous.go
index 9fffc86351e794758a00f70218d820a3855eb95a..aee3a2a0876eb987487e01914746b75f0df4dc75 100644
--- a/pkg/auth/anonymous.go
+++ b/pkg/auth/anonymous.go
@@ -8,9 +8,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/service"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type Anonymous struct {
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a5683681137c346f6cba91ec3d40c6a331d6..5b81fc7e14c2957c9efefaa4a93002d2a275bc45 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -10,9 +10,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/service"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type ClientPrincipal struct {
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a2f15ca7605959b3f5b31996a5c79a164..3ff23460b428e96db26ebe020bbfa254d3afcc63 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -7,9 +7,9 @@ import (
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type PrincipalFactory struct {
diff --git a/pkg/auth/principal.go b/pkg/auth/principal.go
index 004db35f2eab6433b1889861e964666ab4a71a21..419fe6319a5f9d21633ac3690e2bb904f1d397bb 100644
--- a/pkg/auth/principal.go
+++ b/pkg/auth/principal.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type Principal interface {
diff --git a/pkg/auth/system.go b/pkg/auth/system.go
index dd4d03984da3bcc2623f9b9d4e9a2b11695946a4..7cb0b38913c3a5e81dbd8591800be762badc9d4a 100644
--- a/pkg/auth/system.go
+++ b/pkg/auth/system.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type SystemPrincipal struct{}
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 29e879457bebc4da201ce126c6c140e02989f2c0..87b7cc40efc59efa4f495cdb55431544e0cb6151 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -9,10 +9,10 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/service"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type UserPrincipal struct {
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784dff8fccd5b505867bf65efb373a9149d..a2d4d27b22580251e6f96d8b143c21a20b2ef6a9 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -20,10 +20,10 @@ import (
localsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/locales/transport/grpc"
referencesSvc "git.perx.ru/perxis/perxis-go/pkg/references/middleware"
referencesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/references/transport/grpc"
- rolesSvc "git.perx.ru/perxis/perxis-go/pkg/roles/middleware"
- rolesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/roles/transport/grpc"
spacesSvc "git.perx.ru/perxis/perxis-go/pkg/spaces/middleware"
spacesTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/spaces/transport/grpc"
+ rolesSvc "git.perx.ru/perxis/perxis-go/roles/middleware"
+ rolesTransportGrpc "git.perx.ru/perxis/perxis-go/roles/transport/grpc"
"go.uber.org/zap"
"google.golang.org/grpc"
)
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e9308da0ea2c81f8afa80fb2be219c633ea..556b2a153cf2a331fedf1200e5a608d12029aafe 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -10,9 +10,9 @@ import (
"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"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/roles"
)
type Runnable interface {
diff --git a/pkg/extension/service/extension.go b/pkg/extension/service/extension.go
index 5d57e56c86190403cfe18a8084c902497280c993..7be23d27f68f8b590590f4bf24e01a5c1c92315c 100644
--- a/pkg/extension/service/extension.go
+++ b/pkg/extension/service/extension.go
@@ -8,8 +8,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/extension"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/setup"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.uber.org/zap"
)
diff --git a/pkg/setup/role.go b/pkg/setup/role.go
index 2498e8456c474331ce648dbf48caaccf16718bb3..48140129c26dfb40ec1f1ea82d8c8cf63a269f2c 100644
--- a/pkg/setup/role.go
+++ b/pkg/setup/role.go
@@ -9,7 +9,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
)
var (
diff --git a/pkg/setup/role_test.go b/pkg/setup/role_test.go
index 1c218270b5b50bf2bc8c6cd27364a65cd2d9b60b..98ba8ddb6ab9e86dd2b478c1991094fa1fd55821 100644
--- a/pkg/setup/role_test.go
+++ b/pkg/setup/role_test.go
@@ -6,8 +6,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
- rolesMock "git.perx.ru/perxis/perxis-go/pkg/roles/mocks"
+ "git.perx.ru/perxis/perxis-go/roles"
+ rolesMock "git.perx.ru/perxis/perxis-go/roles/mocks"
"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 ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..e671a549292faab18f1b5cedee3879544ad5f2e0 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -10,9 +10,9 @@ import (
"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"
+ rolesMock "git.perx.ru/perxis/perxis-go/roles/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
@@ -21,8 +21,8 @@ import (
"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"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.uber.org/zap/zaptest"
)
diff --git a/pkg/roles/errors.go b/roles/errors.go
similarity index 100%
rename from pkg/roles/errors.go
rename to roles/errors.go
diff --git a/pkg/roles/events.go b/roles/events.go
similarity index 100%
rename from pkg/roles/events.go
rename to roles/events.go
diff --git a/pkg/roles/middleware/access_logging_middleware.go b/roles/middleware/access_logging_middleware.go
similarity index 93%
rename from pkg/roles/middleware/access_logging_middleware.go
rename to roles/middleware/access_logging_middleware.go
index 310cdeda7c585c571263bebb6c42739a8d3074de..80327bc8965d494234a7001d2cbe00bab66173f2 100644
--- a/pkg/roles/middleware/access_logging_middleware.go
+++ b/roles/middleware/access_logging_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/roles -i Roles -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
"time"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.uber.org/zap"
)
diff --git a/pkg/roles/middleware/caching_middleware.go b/roles/middleware/caching_middleware.go
similarity index 97%
rename from pkg/roles/middleware/caching_middleware.go
rename to roles/middleware/caching_middleware.go
index 2bcb04d3df7278d619fe80b2a6b02c48ea58f1fb..7846ff899147fc0310f558400fef1a53a7a8dccb 100644
--- a/pkg/roles/middleware/caching_middleware.go
+++ b/roles/middleware/caching_middleware.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/cache"
"git.perx.ru/perxis/perxis-go/pkg/data"
- service "git.perx.ru/perxis/perxis-go/pkg/roles"
+ service "git.perx.ru/perxis/perxis-go/roles"
)
func makeKey(ss ...string) string {
diff --git a/pkg/roles/middleware/caching_middleware_test.go b/roles/middleware/caching_middleware_test.go
similarity index 98%
rename from pkg/roles/middleware/caching_middleware_test.go
rename to roles/middleware/caching_middleware_test.go
index b9ac8ec826439319348bac2b13fc743c3753d024..bec4bbb51d5ede381779fe620f48dd6fd1d72cd0 100644
--- a/pkg/roles/middleware/caching_middleware_test.go
+++ b/roles/middleware/caching_middleware_test.go
@@ -7,8 +7,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/cache"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
- rsmocks "git.perx.ru/perxis/perxis-go/pkg/roles/mocks"
+ "git.perx.ru/perxis/perxis-go/roles"
+ rsmocks "git.perx.ru/perxis/perxis-go/roles/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/roles/middleware/error_logging_middleware.go b/roles/middleware/error_logging_middleware.go
similarity index 90%
rename from pkg/roles/middleware/error_logging_middleware.go
rename to roles/middleware/error_logging_middleware.go
index bb6073d11fef1d2763ca85855274edf4a8c71839..d1101d6809d8b82f339e0cc2274a66aa3b0ed470 100644
--- a/pkg/roles/middleware/error_logging_middleware.go
+++ b/roles/middleware/error_logging_middleware.go
@@ -4,12 +4,12 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/roles -i Roles -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.uber.org/zap"
)
diff --git a/pkg/roles/middleware/logging_middleware.go b/roles/middleware/logging_middleware.go
similarity index 98%
rename from pkg/roles/middleware/logging_middleware.go
rename to roles/middleware/logging_middleware.go
index 9221265df1603f93be2c344c8c559eb8811e60de..e091acabb58fad2d06f39c806f705584db680f37 100644
--- a/pkg/roles/middleware/logging_middleware.go
+++ b/roles/middleware/logging_middleware.go
@@ -4,7 +4,7 @@ import (
"context"
"git.perx.ru/perxis/perxis-go/id"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/roles/middleware/middleware.go b/roles/middleware/middleware.go
similarity index 74%
rename from pkg/roles/middleware/middleware.go
rename to roles/middleware/middleware.go
index aaeb2da895d5aa71768e577315e549daa6a247c4..2cbd6a39ec5a457356f0a79afec5c4c38e9af25b 100644
--- a/pkg/roles/middleware/middleware.go
+++ b/roles/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/roles -i Roles -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.uber.org/zap"
)
diff --git a/pkg/roles/middleware/recovering_middleware.go b/roles/middleware/recovering_middleware.go
similarity index 91%
rename from pkg/roles/middleware/recovering_middleware.go
rename to roles/middleware/recovering_middleware.go
index cb30a49b624712d6f37de4cd8c74ee65f9f71358..d2c07bba495f3733c39bbe66d25be95cda86c641 100644
--- a/pkg/roles/middleware/recovering_middleware.go
+++ b/roles/middleware/recovering_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/roles -i Roles -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.uber.org/zap"
)
diff --git a/pkg/roles/middleware/telemetry_middleware.go b/roles/middleware/telemetry_middleware.go
similarity index 97%
rename from pkg/roles/middleware/telemetry_middleware.go
rename to roles/middleware/telemetry_middleware.go
index 7403575220d93fe24a00b0a8de749371e57904b0..652868163527f16df35d739cf6668d996e484fd5 100644
--- a/pkg/roles/middleware/telemetry_middleware.go
+++ b/roles/middleware/telemetry_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/roles -i Roles -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
import (
"context"
@@ -12,8 +12,8 @@ import (
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/roles"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/roles/mocks/Middleware.go b/roles/mocks/Middleware.go
similarity index 95%
rename from pkg/roles/mocks/Middleware.go
rename to roles/mocks/Middleware.go
index 507b37154a40a1176a940bd29b6a6d23556a6bba..ade9611863ca71071e29e3aa1a48fdbae7268200 100644
--- a/pkg/roles/mocks/Middleware.go
+++ b/roles/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- roles "git.perx.ru/perxis/perxis-go/pkg/roles"
+ roles "git.perx.ru/perxis/perxis-go/roles"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/roles/mocks/Roles.go b/roles/mocks/Roles.go
similarity index 98%
rename from pkg/roles/mocks/Roles.go
rename to roles/mocks/Roles.go
index 08c523e06bc5082685ea1f7669a4b15849712222..c0d4e2975d9b409e80ed0dcc699f4e339be72380 100644
--- a/pkg/roles/mocks/Roles.go
+++ b/roles/mocks/Roles.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- roles "git.perx.ru/perxis/perxis-go/pkg/roles"
+ roles "git.perx.ru/perxis/perxis-go/roles"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/roles/mocks/Storage.go b/roles/mocks/Storage.go
similarity index 98%
rename from pkg/roles/mocks/Storage.go
rename to roles/mocks/Storage.go
index dc01f165aa37163cf23f28302e9f90f72420171e..5bf8e926cf62e8c720e9134d0f0950980c365096 100644
--- a/pkg/roles/mocks/Storage.go
+++ b/roles/mocks/Storage.go
@@ -8,7 +8,7 @@ import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
mock "github.com/stretchr/testify/mock"
- roles "git.perx.ru/perxis/perxis-go/pkg/roles"
+ roles "git.perx.ru/perxis/perxis-go/roles"
)
// Storage is an autogenerated mock type for the Storage type
diff --git a/pkg/roles/role.go b/roles/role.go
similarity index 100%
rename from pkg/roles/role.go
rename to roles/role.go
diff --git a/pkg/roles/role_test.go b/roles/role_test.go
similarity index 100%
rename from pkg/roles/role_test.go
rename to roles/role_test.go
diff --git a/pkg/roles/service.go b/roles/service.go
similarity index 100%
rename from pkg/roles/service.go
rename to roles/service.go
diff --git a/pkg/roles/storage.go b/roles/storage.go
similarity index 100%
rename from pkg/roles/storage.go
rename to roles/storage.go
diff --git a/pkg/roles/transport/client.go b/roles/transport/client.go
similarity index 96%
rename from pkg/roles/transport/client.go
rename to roles/transport/client.go
index 1b36431f5371bb93579f6bf985aa184337ac086b..ed8b5594d28cb10bf821d82ee261741045151212 100644
--- a/pkg/roles/transport/client.go
+++ b/roles/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- roles "git.perx.ru/perxis/perxis-go/pkg/roles"
+ roles "git.perx.ru/perxis/perxis-go/roles"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *roles.Role) (res0 *roles.Role, res1 error) {
diff --git a/pkg/roles/transport/endpoints.microgen.go b/roles/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/roles/transport/endpoints.microgen.go
rename to roles/transport/endpoints.microgen.go
diff --git a/pkg/roles/transport/exchanges.microgen.go b/roles/transport/exchanges.microgen.go
similarity index 93%
rename from pkg/roles/transport/exchanges.microgen.go
rename to roles/transport/exchanges.microgen.go
index bb7d8e5010877efb628ce34b4f89ae66857476eb..32b721e2e18242131d3dffbf4ef92723ab9f47cd 100644
--- a/pkg/roles/transport/exchanges.microgen.go
+++ b/roles/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import roles "git.perx.ru/perxis/perxis-go/pkg/roles"
+import roles "git.perx.ru/perxis/perxis-go/roles"
type (
CreateRequest struct {
diff --git a/pkg/roles/transport/grpc/client.go b/roles/transport/grpc/client.go
similarity index 91%
rename from pkg/roles/transport/grpc/client.go
rename to roles/transport/grpc/client.go
index 06a23a7bceb96992c5114a46c1995eb5b4d8518c..3ae45397264cecaac12fa67739f51d1c42175ebb 100644
--- a/pkg/roles/transport/grpc/client.go
+++ b/roles/transport/grpc/client.go
@@ -4,7 +4,7 @@ package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
+ transport "git.perx.ru/perxis/perxis-go/roles/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/roles/transport/grpc/client.microgen.go b/roles/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/roles/transport/grpc/client.microgen.go
rename to roles/transport/grpc/client.microgen.go
index 165df31c97454de1d493c293112c320bda47e044..26b7effd38d95009eb7cce279ec750f541999005 100644
--- a/pkg/roles/transport/grpc/client.microgen.go
+++ b/roles/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
+ transport "git.perx.ru/perxis/perxis-go/roles/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
empty "google.golang.org/protobuf/types/known/emptypb"
diff --git a/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go b/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 98%
rename from pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to roles/transport/grpc/protobuf_endpoint_converters.microgen.go
index 76455aafe2c9d667c9cff0a7ca75ae8916300940..f9b23070c1e8b3050a4ea1fb10309c0f3813cce8 100644
--- a/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
"context"
"errors"
- transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
+ transport "git.perx.ru/perxis/perxis-go/roles/transport"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go b/roles/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
rename to roles/transport/grpc/protobuf_type_converters.microgen.go
index 4dca1e282e3bfd93fa287cc8df3495fb0931444e..493ba39bfbf53f0d884898c5a29f1c0414f09169 100644
--- a/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
+++ b/roles/transport/grpc/protobuf_type_converters.microgen.go
@@ -6,9 +6,9 @@ package transportgrpc
import (
permission "git.perx.ru/perxis/perxis-go/pkg/permission"
- service "git.perx.ru/perxis/perxis-go/pkg/roles"
commonpb "git.perx.ru/perxis/perxis-go/proto/common"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
+ service "git.perx.ru/perxis/perxis-go/roles"
)
func PtrRoleToProto(role *service.Role) (*pb.Role, error) {
diff --git a/pkg/roles/transport/grpc/server.go b/roles/transport/grpc/server.go
similarity index 87%
rename from pkg/roles/transport/grpc/server.go
rename to roles/transport/grpc/server.go
index 764efc8a4185e2078cac995a2a40a8010c94dd93..6e56f6017c74b9aa5acac54bd18541a64b8f6fe4 100644
--- a/pkg/roles/transport/grpc/server.go
+++ b/roles/transport/grpc/server.go
@@ -2,9 +2,9 @@ package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- "git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
+ "git.perx.ru/perxis/perxis-go/roles"
+ "git.perx.ru/perxis/perxis-go/roles/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/roles/transport/grpc/server.microgen.go b/roles/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/roles/transport/grpc/server.microgen.go
rename to roles/transport/grpc/server.microgen.go
index 8a102252340da30189bf7f65124be1f010d225f8..8c44e1acec28f241afcb796dd64e11f2480820f8 100644
--- a/pkg/roles/transport/grpc/server.microgen.go
+++ b/roles/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
+ transport "git.perx.ru/perxis/perxis-go/roles/transport"
grpc "github.com/go-kit/kit/transport/grpc"
context "golang.org/x/net/context"
empty "google.golang.org/protobuf/types/known/emptypb"
diff --git a/pkg/roles/transport/server.microgen.go b/roles/transport/server.microgen.go
similarity index 97%
rename from pkg/roles/transport/server.microgen.go
rename to roles/transport/server.microgen.go
index 119aae999a13bab884d4f98d09346b1ef2d13071..a85c2143099ad88f72dad10925acc4b76d2f2433 100644
--- a/pkg/roles/transport/server.microgen.go
+++ b/roles/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- roles "git.perx.ru/perxis/perxis-go/pkg/roles"
+ roles "git.perx.ru/perxis/perxis-go/roles"
endpoint "github.com/go-kit/kit/endpoint"
)