From 27ba052de1b8ceaa13bf7204e7ece8f177510284 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 09:21:20 +0300
Subject: [PATCH] pkg roles moved from pkg
---
id/system/system.go | 2 +-
id/test/object_id_test.go | 2 +-
pkg/auth/anonymous.go | 2 +-
pkg/auth/client.go | 2 +-
pkg/auth/factory.go | 2 +-
pkg/auth/principal.go | 2 +-
pkg/auth/system.go | 2 +-
pkg/auth/user.go | 2 +-
pkg/content/client.go | 4 ++--
pkg/content/content.go | 2 +-
pkg/extension/service/extension.go | 2 +-
pkg/setup/role.go | 2 +-
pkg/setup/role_test.go | 4 ++--
pkg/setup/setup_test.go | 4 ++--
{pkg/roles => roles}/errors.go | 0
{pkg/roles => roles}/events.go | 0
{pkg/roles => roles}/middleware/access_logging_middleware.go | 4 ++--
{pkg/roles => roles}/middleware/caching_middleware.go | 2 +-
{pkg/roles => roles}/middleware/caching_middleware_test.go | 4 ++--
{pkg/roles => roles}/middleware/error_logging_middleware.go | 4 ++--
{pkg/roles => roles}/middleware/logging_middleware.go | 2 +-
{pkg/roles => roles}/middleware/middleware.go | 4 ++--
{pkg/roles => roles}/middleware/recovering_middleware.go | 4 ++--
{pkg/roles => roles}/middleware/telemetry_middleware.go | 4 ++--
{pkg/roles => roles}/mocks/Middleware.go | 2 +-
{pkg/roles => roles}/mocks/Roles.go | 2 +-
{pkg/roles => roles}/mocks/Storage.go | 2 +-
{pkg/roles => roles}/role.go | 0
{pkg/roles => roles}/role_test.go | 0
{pkg/roles => roles}/service.go | 0
{pkg/roles => roles}/storage.go | 0
{pkg/roles => roles}/transport/client.go | 2 +-
{pkg/roles => roles}/transport/endpoints.microgen.go | 0
{pkg/roles => roles}/transport/exchanges.microgen.go | 2 +-
{pkg/roles => roles}/transport/grpc/client.go | 2 +-
{pkg/roles => roles}/transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/roles => roles}/transport/grpc/server.go | 4 ++--
{pkg/roles => roles}/transport/grpc/server.microgen.go | 2 +-
{pkg/roles => roles}/transport/server.microgen.go | 2 +-
41 files changed, 44 insertions(+), 44 deletions(-)
rename {pkg/roles => roles}/errors.go (100%)
rename {pkg/roles => roles}/events.go (100%)
rename {pkg/roles => roles}/middleware/access_logging_middleware.go (93%)
rename {pkg/roles => roles}/middleware/caching_middleware.go (97%)
rename {pkg/roles => roles}/middleware/caching_middleware_test.go (98%)
rename {pkg/roles => roles}/middleware/error_logging_middleware.go (90%)
rename {pkg/roles => roles}/middleware/logging_middleware.go (98%)
rename {pkg/roles => roles}/middleware/middleware.go (74%)
rename {pkg/roles => roles}/middleware/recovering_middleware.go (91%)
rename {pkg/roles => roles}/middleware/telemetry_middleware.go (97%)
rename {pkg/roles => roles}/mocks/Middleware.go (95%)
rename {pkg/roles => roles}/mocks/Roles.go (98%)
rename {pkg/roles => roles}/mocks/Storage.go (98%)
rename {pkg/roles => roles}/role.go (100%)
rename {pkg/roles => roles}/role_test.go (100%)
rename {pkg/roles => roles}/service.go (100%)
rename {pkg/roles => roles}/storage.go (100%)
rename {pkg/roles => roles}/transport/client.go (96%)
rename {pkg/roles => roles}/transport/endpoints.microgen.go (100%)
rename {pkg/roles => roles}/transport/exchanges.microgen.go (93%)
rename {pkg/roles => roles}/transport/grpc/client.go (91%)
rename {pkg/roles => roles}/transport/grpc/client.microgen.go (95%)
rename {pkg/roles => roles}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%)
rename {pkg/roles => roles}/transport/grpc/protobuf_type_converters.microgen.go (98%)
rename {pkg/roles => roles}/transport/grpc/server.go (87%)
rename {pkg/roles => roles}/transport/grpc/server.microgen.go (97%)
rename {pkg/roles => roles}/transport/server.microgen.go (97%)
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..3aba88bc 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 2f01fa12..b55ae204 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 9fffc863..aee3a2a0 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 9db7a568..5b81fc7e 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 2394c62a..3ff23460 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 004db35f..419fe631 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 dd4d0398..7cb0b389 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 29e87945..87b7cc40 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 adc5f784..a2d4d27b 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 1d351e93..556b2a15 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 5d57e56c..7be23d27 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 2498e845..48140129 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 1c218270..98ba8ddb 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 ff73b745..e671a549 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 310cdeda..80327bc8 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 2bcb04d3..7846ff89 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 b9ac8ec8..bec4bbb5 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 bb6073d1..d1101d68 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 9221265d..e091acab 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 aaeb2da8..2cbd6a39 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 cb30a49b..d2c07bba 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 74035752..65286816 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 507b3715..ade96118 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 08c523e0..c0d4e297 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 dc01f165..5bf8e926 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 1b36431f..ed8b5594 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 bb7d8e50..32b721e2 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 06a23a7b..3ae45397 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 165df31c..26b7effd 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 76455aaf..f9b23070 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 4dca1e28..493ba39b 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 764efc8a..6e56f601 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 8a102252..8c44e1ac 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 119aae99..a85c2143 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"
)
--
GitLab