From 3d4bb0b5f54835c9bafd37bf0789a16f8316988e Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 09:35:48 +0300
Subject: [PATCH] pkg users moved from pkg
---
id/system/system.go | 2 +-
id/test/object_id_test.go | 2 +-
logs/zap/example_test.go | 4 ++--
pkg/account/account.go | 2 +-
pkg/account/client.go | 4 ++--
pkg/auth/factory.go | 2 +-
pkg/auth/user.go | 2 +-
{pkg/users => users}/errors.go | 0
{pkg/users => users}/events.go | 0
{pkg/users => users}/middleware/access_logging_middleware.go | 4 ++--
{pkg/users => users}/middleware/caching_middleware.go | 2 +-
{pkg/users => users}/middleware/caching_middleware_test.go | 4 ++--
{pkg/users => users}/middleware/error_logging_middleware.go | 4 ++--
{pkg/users => users}/middleware/logging_middleware.go | 2 +-
{pkg/users => users}/middleware/middleware.go | 4 ++--
{pkg/users => users}/middleware/recovering_middleware.go | 4 ++--
{pkg/users => users}/middleware/telemetry_middleware.go | 4 ++--
{pkg/users => users}/mocks/Middleware.go | 2 +-
{pkg/users => users}/mocks/Storage.go | 2 +-
{pkg/users => users}/mocks/Users.go | 2 +-
{pkg/users => users}/service.go | 0
{pkg/users => users}/storage.go | 0
{pkg/users => users}/transport/client.go | 2 +-
{pkg/users => users}/transport/endpoints.microgen.go | 0
{pkg/users => users}/transport/exchanges.microgen.go | 2 +-
{pkg/users => users}/transport/grpc/client.go | 2 +-
{pkg/users => users}/transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/users => users}/transport/grpc/server.go | 4 ++--
{pkg/users => users}/transport/grpc/server.microgen.go | 2 +-
{pkg/users => users}/transport/server.microgen.go | 2 +-
{pkg/users => users}/user.go | 0
zap/field_test.go | 2 +-
34 files changed, 37 insertions(+), 37 deletions(-)
rename {pkg/users => users}/errors.go (100%)
rename {pkg/users => users}/events.go (100%)
rename {pkg/users => users}/middleware/access_logging_middleware.go (94%)
rename {pkg/users => users}/middleware/caching_middleware.go (97%)
rename {pkg/users => users}/middleware/caching_middleware_test.go (98%)
rename {pkg/users => users}/middleware/error_logging_middleware.go (91%)
rename {pkg/users => users}/middleware/logging_middleware.go (98%)
rename {pkg/users => users}/middleware/middleware.go (73%)
rename {pkg/users => users}/middleware/recovering_middleware.go (92%)
rename {pkg/users => users}/middleware/telemetry_middleware.go (97%)
rename {pkg/users => users}/mocks/Middleware.go (95%)
rename {pkg/users => users}/mocks/Storage.go (98%)
rename {pkg/users => users}/mocks/Users.go (98%)
rename {pkg/users => users}/service.go (100%)
rename {pkg/users => users}/storage.go (100%)
rename {pkg/users => users}/transport/client.go (97%)
rename {pkg/users => users}/transport/endpoints.microgen.go (100%)
rename {pkg/users => users}/transport/exchanges.microgen.go (95%)
rename {pkg/users => users}/transport/grpc/client.go (92%)
rename {pkg/users => users}/transport/grpc/client.microgen.go (95%)
rename {pkg/users => users}/transport/grpc/protobuf_endpoint_converters.microgen.go (99%)
rename {pkg/users => users}/transport/grpc/protobuf_type_converters.microgen.go (98%)
rename {pkg/users => users}/transport/grpc/server.go (89%)
rename {pkg/users => users}/transport/grpc/server.microgen.go (97%)
rename {pkg/users => users}/transport/server.microgen.go (97%)
rename {pkg/users => users}/user.go (100%)
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..21ca8c10 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -14,7 +14,7 @@ import (
"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/users"
)
func Handler(obj any) *id.ObjectId {
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa12..36c37508 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -13,7 +13,7 @@ import (
"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/users"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index dc182fb0..eae560d6 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -11,8 +11,8 @@ import (
logmocks "git.perx.ru/perxis/perxis-go/logs/mocks"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/users"
- usersmocks "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
+ "git.perx.ru/perxis/perxis-go/users"
+ usersmocks "git.perx.ru/perxis/perxis-go/users/mocks"
logzap "git.perx.ru/perxis/perxis-go/zap"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/account/account.go b/pkg/account/account.go
index 9eb54c31..c1786375 100644
--- a/pkg/account/account.go
+++ b/pkg/account/account.go
@@ -5,8 +5,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/members"
msobserver "git.perx.ru/perxis/perxis-go/pkg/members/observer"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
- "git.perx.ru/perxis/perxis-go/pkg/users"
"git.perx.ru/perxis/perxis-go/pkg/version"
+ "git.perx.ru/perxis/perxis-go/users"
"google.golang.org/grpc"
)
diff --git a/pkg/account/client.go b/pkg/account/client.go
index 5349ed29..0bd54d1c 100644
--- a/pkg/account/client.go
+++ b/pkg/account/client.go
@@ -9,8 +9,8 @@ import (
membersTransport "git.perx.ru/perxis/perxis-go/pkg/members/transport/grpc"
serviceOrganizations "git.perx.ru/perxis/perxis-go/pkg/organizations/middleware"
organizationsTransport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport/grpc"
- serviceUsers "git.perx.ru/perxis/perxis-go/pkg/users/middleware"
- usersTransport "git.perx.ru/perxis/perxis-go/pkg/users/transport/grpc"
+ serviceUsers "git.perx.ru/perxis/perxis-go/users/middleware"
+ usersTransport "git.perx.ru/perxis/perxis-go/users/transport/grpc"
"go.uber.org/zap"
"google.golang.org/grpc"
)
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a..c69b25cb 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -9,7 +9,7 @@ import (
"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/users"
)
type PrincipalFactory struct {
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 29e87945..421c465f 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -12,7 +12,7 @@ import (
"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/users"
)
type UserPrincipal struct {
diff --git a/pkg/users/errors.go b/users/errors.go
similarity index 100%
rename from pkg/users/errors.go
rename to users/errors.go
diff --git a/pkg/users/events.go b/users/events.go
similarity index 100%
rename from pkg/users/events.go
rename to users/events.go
diff --git a/pkg/users/middleware/access_logging_middleware.go b/users/middleware/access_logging_middleware.go
similarity index 94%
rename from pkg/users/middleware/access_logging_middleware.go
rename to users/middleware/access_logging_middleware.go
index dd8d4a14..414eee67 100644
--- a/pkg/users/middleware/access_logging_middleware.go
+++ b/users/middleware/access_logging_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
@@ -12,7 +12,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
"go.uber.org/zap"
)
diff --git a/pkg/users/middleware/caching_middleware.go b/users/middleware/caching_middleware.go
similarity index 97%
rename from pkg/users/middleware/caching_middleware.go
rename to users/middleware/caching_middleware.go
index 825da6a2..8f006bf2 100644
--- a/pkg/users/middleware/caching_middleware.go
+++ b/users/middleware/caching_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/cache"
services "git.perx.ru/perxis/perxis-go/pkg/options"
- service "git.perx.ru/perxis/perxis-go/pkg/users"
+ service "git.perx.ru/perxis/perxis-go/users"
)
func CachingMiddleware(cache cache.Cache) Middleware {
diff --git a/pkg/users/middleware/caching_middleware_test.go b/users/middleware/caching_middleware_test.go
similarity index 98%
rename from pkg/users/middleware/caching_middleware_test.go
rename to users/middleware/caching_middleware_test.go
index c5755407..dd70d0cd 100644
--- a/pkg/users/middleware/caching_middleware_test.go
+++ b/users/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/users"
- "git.perx.ru/perxis/perxis-go/pkg/users/mocks"
+ "git.perx.ru/perxis/perxis-go/users"
+ "git.perx.ru/perxis/perxis-go/users/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/users/middleware/error_logging_middleware.go b/users/middleware/error_logging_middleware.go
similarity index 91%
rename from pkg/users/middleware/error_logging_middleware.go
rename to users/middleware/error_logging_middleware.go
index c499b9f3..5eeb6cbc 100644
--- a/pkg/users/middleware/error_logging_middleware.go
+++ b/users/middleware/error_logging_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
"go.uber.org/zap"
)
diff --git a/pkg/users/middleware/logging_middleware.go b/users/middleware/logging_middleware.go
similarity index 98%
rename from pkg/users/middleware/logging_middleware.go
rename to users/middleware/logging_middleware.go
index 3350d36d..ef078e60 100644
--- a/pkg/users/middleware/logging_middleware.go
+++ b/users/middleware/logging_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/users/middleware/middleware.go b/users/middleware/middleware.go
similarity index 73%
rename from pkg/users/middleware/middleware.go
rename to users/middleware/middleware.go
index ed64ceed..0bd14523 100644
--- a/pkg/users/middleware/middleware.go
+++ b/users/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
"go.uber.org/zap"
)
diff --git a/pkg/users/middleware/recovering_middleware.go b/users/middleware/recovering_middleware.go
similarity index 92%
rename from pkg/users/middleware/recovering_middleware.go
rename to users/middleware/recovering_middleware.go
index 7dac51f0..97e2fc22 100644
--- a/pkg/users/middleware/recovering_middleware.go
+++ b/users/middleware/recovering_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
"go.uber.org/zap"
)
diff --git a/pkg/users/middleware/telemetry_middleware.go b/users/middleware/telemetry_middleware.go
similarity index 97%
rename from pkg/users/middleware/telemetry_middleware.go
rename to users/middleware/telemetry_middleware.go
index 8ad677e7..eecdfd36 100644
--- a/pkg/users/middleware/telemetry_middleware.go
+++ b/users/middleware/telemetry_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/users -i Users -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
import (
"context"
@@ -14,7 +14,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/options"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/users/mocks/Middleware.go b/users/mocks/Middleware.go
similarity index 95%
rename from pkg/users/mocks/Middleware.go
rename to users/mocks/Middleware.go
index 63d457eb..4c49362e 100644
--- a/pkg/users/mocks/Middleware.go
+++ b/users/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- users "git.perx.ru/perxis/perxis-go/pkg/users"
+ users "git.perx.ru/perxis/perxis-go/users"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/users/mocks/Storage.go b/users/mocks/Storage.go
similarity index 98%
rename from pkg/users/mocks/Storage.go
rename to users/mocks/Storage.go
index a1001d78..61b50728 100644
--- a/pkg/users/mocks/Storage.go
+++ b/users/mocks/Storage.go
@@ -8,7 +8,7 @@ import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
mock "github.com/stretchr/testify/mock"
- users "git.perx.ru/perxis/perxis-go/pkg/users"
+ users "git.perx.ru/perxis/perxis-go/users"
)
// Storage is an autogenerated mock type for the Storage type
diff --git a/pkg/users/mocks/Users.go b/users/mocks/Users.go
similarity index 98%
rename from pkg/users/mocks/Users.go
rename to users/mocks/Users.go
index 4db80b6d..99767b3e 100644
--- a/pkg/users/mocks/Users.go
+++ b/users/mocks/Users.go
@@ -8,7 +8,7 @@ import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
mock "github.com/stretchr/testify/mock"
- users "git.perx.ru/perxis/perxis-go/pkg/users"
+ users "git.perx.ru/perxis/perxis-go/users"
)
// Users is an autogenerated mock type for the Users type
diff --git a/pkg/users/service.go b/users/service.go
similarity index 100%
rename from pkg/users/service.go
rename to users/service.go
diff --git a/pkg/users/storage.go b/users/storage.go
similarity index 100%
rename from pkg/users/storage.go
rename to users/storage.go
diff --git a/pkg/users/transport/client.go b/users/transport/client.go
similarity index 97%
rename from pkg/users/transport/client.go
rename to users/transport/client.go
index 01537b11..7a6973dc 100644
--- a/pkg/users/transport/client.go
+++ b/users/transport/client.go
@@ -6,7 +6,7 @@ import (
"context"
options "git.perx.ru/perxis/perxis-go/pkg/options"
- users "git.perx.ru/perxis/perxis-go/pkg/users"
+ users "git.perx.ru/perxis/perxis-go/users"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *users.User) (res0 *users.User, res1 error) {
diff --git a/pkg/users/transport/endpoints.microgen.go b/users/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/users/transport/endpoints.microgen.go
rename to users/transport/endpoints.microgen.go
diff --git a/pkg/users/transport/exchanges.microgen.go b/users/transport/exchanges.microgen.go
similarity index 95%
rename from pkg/users/transport/exchanges.microgen.go
rename to users/transport/exchanges.microgen.go
index f70b8cdf..8cd6e6b7 100644
--- a/pkg/users/transport/exchanges.microgen.go
+++ b/users/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
- users "git.perx.ru/perxis/perxis-go/pkg/users"
+ users "git.perx.ru/perxis/perxis-go/users"
)
type (
diff --git a/pkg/users/transport/grpc/client.go b/users/transport/grpc/client.go
similarity index 92%
rename from pkg/users/transport/grpc/client.go
rename to users/transport/grpc/client.go
index 7364d5fc..e24f9dc4 100644
--- a/pkg/users/transport/grpc/client.go
+++ b/users/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/users/transport"
+ transport "git.perx.ru/perxis/perxis-go/users/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/users/transport/grpc/client.microgen.go b/users/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/users/transport/grpc/client.microgen.go
rename to users/transport/grpc/client.microgen.go
index 4fcd2868..008e4938 100644
--- a/pkg/users/transport/grpc/client.microgen.go
+++ b/users/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
pb "git.perx.ru/perxis/perxis-go/proto/users"
+ transport "git.perx.ru/perxis/perxis-go/users/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/users/transport/grpc/protobuf_endpoint_converters.microgen.go b/users/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to users/transport/grpc/protobuf_endpoint_converters.microgen.go
index 2b45912b..d0787cd4 100644
--- a/pkg/users/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/users/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
"context"
"errors"
- transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
pb "git.perx.ru/perxis/perxis-go/proto/users"
+ transport "git.perx.ru/perxis/perxis-go/users/transport"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/users/transport/grpc/protobuf_type_converters.microgen.go b/users/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/users/transport/grpc/protobuf_type_converters.microgen.go
rename to users/transport/grpc/protobuf_type_converters.microgen.go
index 5f98e248..d59a293a 100644
--- a/pkg/users/transport/grpc/protobuf_type_converters.microgen.go
+++ b/users/transport/grpc/protobuf_type_converters.microgen.go
@@ -6,9 +6,9 @@ package transportgrpc
import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
- service "git.perx.ru/perxis/perxis-go/pkg/users"
common "git.perx.ru/perxis/perxis-go/proto/common"
pb "git.perx.ru/perxis/perxis-go/proto/users"
+ service "git.perx.ru/perxis/perxis-go/users"
wrappers "google.golang.org/protobuf/types/known/wrapperspb"
)
diff --git a/pkg/users/transport/grpc/server.go b/users/transport/grpc/server.go
similarity index 89%
rename from pkg/users/transport/grpc/server.go
rename to users/transport/grpc/server.go
index 07211008..e7eb3050 100644
--- a/pkg/users/transport/grpc/server.go
+++ b/users/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/users"
- "git.perx.ru/perxis/perxis-go/pkg/users/transport"
pb "git.perx.ru/perxis/perxis-go/proto/users"
+ "git.perx.ru/perxis/perxis-go/users"
+ "git.perx.ru/perxis/perxis-go/users/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/users/transport/grpc/server.microgen.go b/users/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/users/transport/grpc/server.microgen.go
rename to users/transport/grpc/server.microgen.go
index 8817f6d8..ef1d6f45 100644
--- a/pkg/users/transport/grpc/server.microgen.go
+++ b/users/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
pb "git.perx.ru/perxis/perxis-go/proto/users"
+ transport "git.perx.ru/perxis/perxis-go/users/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/users/transport/server.microgen.go b/users/transport/server.microgen.go
similarity index 97%
rename from pkg/users/transport/server.microgen.go
rename to users/transport/server.microgen.go
index e12645ef..95667744 100644
--- a/pkg/users/transport/server.microgen.go
+++ b/users/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- users "git.perx.ru/perxis/perxis-go/pkg/users"
+ users "git.perx.ru/perxis/perxis-go/users"
endpoint "github.com/go-kit/kit/endpoint"
)
diff --git a/pkg/users/user.go b/users/user.go
similarity index 100%
rename from pkg/users/user.go
rename to users/user.go
diff --git a/zap/field_test.go b/zap/field_test.go
index 46c4ee50..77678126 100644
--- a/zap/field_test.go
+++ b/zap/field_test.go
@@ -7,7 +7,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/users"
+ "git.perx.ru/perxis/perxis-go/users"
"github.com/stretchr/testify/assert"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
--
GitLab