From c4e7bef27f1a61d9d2a21fc689402eb8d7b3882d Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 09:29:51 +0300
Subject: [PATCH] pkg spaces 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/user.go | 2 +-
pkg/content/client.go | 4 ++--
pkg/content/content.go | 2 +-
pkg/items/context.go | 2 +-
pkg/setup/setup.go | 2 +-
pkg/setup/setup_test.go | 4 ++--
pkg/template/builder.go | 2 +-
pkg/template/builder_test.go | 4 ++--
pkg/template/system.go | 2 +-
{pkg/spaces => spaces}/errors.go | 0
{pkg/spaces => spaces}/events.go | 0
.../spaces => spaces}/middleware/access_logging_middleware.go | 4 ++--
{pkg/spaces => spaces}/middleware/caching_middleware.go | 2 +-
{pkg/spaces => spaces}/middleware/caching_middleware_test.go | 4 ++--
{pkg/spaces => spaces}/middleware/error_logging_middleware.go | 4 ++--
{pkg/spaces => spaces}/middleware/logging_middleware.go | 2 +-
{pkg/spaces => spaces}/middleware/middleware.go | 4 ++--
{pkg/spaces => spaces}/middleware/recovering_middleware.go | 4 ++--
{pkg/spaces => spaces}/middleware/telemetry_middleware.go | 4 ++--
{pkg/spaces => spaces}/mocks/Middleware.go | 2 +-
{pkg/spaces => spaces}/mocks/SpaceCreatedObserver.go | 2 +-
{pkg/spaces => spaces}/mocks/SpaceDeletedObserver.go | 2 +-
{pkg/spaces => spaces}/mocks/SpaceObserver.go | 0
{pkg/spaces => spaces}/mocks/SpaceUpdatedObserver.go | 2 +-
{pkg/spaces => spaces}/mocks/Spaces.go | 2 +-
{pkg/spaces => spaces}/mocks/Storage.go | 2 +-
{pkg/spaces => spaces}/observer.go | 0
{pkg/spaces => spaces}/service.go | 0
{pkg/spaces => spaces}/service_test.go | 0
{pkg/spaces => spaces}/space.go | 0
{pkg/spaces => spaces}/storage.go | 0
{pkg/spaces => spaces}/transport/client.go | 2 +-
{pkg/spaces => spaces}/transport/endpoints.microgen.go | 0
{pkg/spaces => spaces}/transport/exchanges.microgen.go | 2 +-
{pkg/spaces => spaces}/transport/grpc/client.go | 2 +-
{pkg/spaces => spaces}/transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
{pkg/spaces => spaces}/transport/grpc/server.go | 4 ++--
{pkg/spaces => spaces}/transport/grpc/server.microgen.go | 2 +-
{pkg/spaces => spaces}/transport/server.microgen.go | 2 +-
46 files changed, 47 insertions(+), 47 deletions(-)
rename {pkg/spaces => spaces}/errors.go (100%)
rename {pkg/spaces => spaces}/events.go (100%)
rename {pkg/spaces => spaces}/middleware/access_logging_middleware.go (96%)
rename {pkg/spaces => spaces}/middleware/caching_middleware.go (98%)
rename {pkg/spaces => spaces}/middleware/caching_middleware_test.go (98%)
rename {pkg/spaces => spaces}/middleware/error_logging_middleware.go (94%)
rename {pkg/spaces => spaces}/middleware/logging_middleware.go (99%)
rename {pkg/spaces => spaces}/middleware/middleware.go (73%)
rename {pkg/spaces => spaces}/middleware/recovering_middleware.go (95%)
rename {pkg/spaces => spaces}/middleware/telemetry_middleware.go (98%)
rename {pkg/spaces => spaces}/mocks/Middleware.go (95%)
rename {pkg/spaces => spaces}/mocks/SpaceCreatedObserver.go (95%)
rename {pkg/spaces => spaces}/mocks/SpaceDeletedObserver.go (95%)
rename {pkg/spaces => spaces}/mocks/SpaceObserver.go (100%)
rename {pkg/spaces => spaces}/mocks/SpaceUpdatedObserver.go (96%)
rename {pkg/spaces => spaces}/mocks/Spaces.go (99%)
rename {pkg/spaces => spaces}/mocks/Storage.go (98%)
rename {pkg/spaces => spaces}/observer.go (100%)
rename {pkg/spaces => spaces}/service.go (100%)
rename {pkg/spaces => spaces}/service_test.go (100%)
rename {pkg/spaces => spaces}/space.go (100%)
rename {pkg/spaces => spaces}/storage.go (100%)
rename {pkg/spaces => spaces}/transport/client.go (98%)
rename {pkg/spaces => spaces}/transport/endpoints.microgen.go (100%)
rename {pkg/spaces => spaces}/transport/exchanges.microgen.go (97%)
rename {pkg/spaces => spaces}/transport/grpc/client.go (94%)
rename {pkg/spaces => spaces}/transport/grpc/client.microgen.go (97%)
rename {pkg/spaces => spaces}/transport/grpc/protobuf_endpoint_converters.microgen.go (99%)
rename {pkg/spaces => spaces}/transport/grpc/protobuf_type_converters.microgen.go (98%)
rename {pkg/spaces => spaces}/transport/grpc/server.go (92%)
rename {pkg/spaces => spaces}/transport/grpc/server.microgen.go (98%)
rename {pkg/spaces => spaces}/transport/server.microgen.go (98%)
diff --git a/id/system/system.go b/id/system/system.go
index c33995d9..85d17c53 100644
--- a/id/system/system.go
+++ b/id/system/system.go
@@ -13,8 +13,8 @@ import (
"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/spaces"
)
func Handler(obj any) *id.ObjectId {
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index 2f01fa12..fbc5b71f 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -12,8 +12,8 @@ import (
"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/spaces"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/auth/anonymous.go b/pkg/auth/anonymous.go
index 9fffc863..7759b73e 100644
--- a/pkg/auth/anonymous.go
+++ b/pkg/auth/anonymous.go
@@ -10,7 +10,7 @@ import (
"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/spaces"
)
type Anonymous struct {
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 9db7a568..53d4e46b 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -12,7 +12,7 @@ import (
"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/spaces"
)
type ClientPrincipal struct {
diff --git a/pkg/auth/factory.go b/pkg/auth/factory.go
index 2394c62a..bf5d801d 100644
--- a/pkg/auth/factory.go
+++ b/pkg/auth/factory.go
@@ -8,8 +8,8 @@ import (
"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/spaces"
)
type PrincipalFactory struct {
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 29e87945..c81b9176 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -11,8 +11,8 @@ import (
"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/spaces"
)
type UserPrincipal struct {
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784..c5c8f293 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -22,8 +22,8 @@ import (
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"
+ spacesSvc "git.perx.ru/perxis/perxis-go/spaces/middleware"
+ spacesTransportGrpc "git.perx.ru/perxis/perxis-go/spaces/transport/grpc"
"go.uber.org/zap"
"google.golang.org/grpc"
)
diff --git a/pkg/content/content.go b/pkg/content/content.go
index 1d351e93..e38edd4a 100644
--- a/pkg/content/content.go
+++ b/pkg/content/content.go
@@ -11,8 +11,8 @@ import (
"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/spaces"
)
type Runnable interface {
diff --git a/pkg/items/context.go b/pkg/items/context.go
index 87e600e5..2bb71a5a 100644
--- a/pkg/items/context.go
+++ b/pkg/items/context.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
)
type Context struct {
diff --git a/pkg/setup/setup.go b/pkg/setup/setup.go
index 88552696..74e26caa 100644
--- a/pkg/setup/setup.go
+++ b/pkg/setup/setup.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
"go.uber.org/zap"
)
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745..03a9ca64 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -11,8 +11,8 @@ import (
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"
+ "git.perx.ru/perxis/perxis-go/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/template/builder.go b/pkg/template/builder.go
index 64530be6..ea6d720f 100644
--- a/pkg/template/builder.go
+++ b/pkg/template/builder.go
@@ -8,7 +8,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
)
type Builder struct {
diff --git a/pkg/template/builder_test.go b/pkg/template/builder_test.go
index 128f7064..7745b6ab 100644
--- a/pkg/template/builder_test.go
+++ b/pkg/template/builder_test.go
@@ -12,8 +12,8 @@ import (
envsmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/items"
mocksitems "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
- spsmocks "git.perx.ru/perxis/perxis-go/pkg/spaces/mocks"
+ "git.perx.ru/perxis/perxis-go/spaces"
+ spsmocks "git.perx.ru/perxis/perxis-go/spaces/mocks"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/template/system.go b/pkg/template/system.go
index c7dda43f..194b70fa 100644
--- a/pkg/template/system.go
+++ b/pkg/template/system.go
@@ -3,7 +3,7 @@ package template
import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
)
type System struct {
diff --git a/pkg/spaces/errors.go b/spaces/errors.go
similarity index 100%
rename from pkg/spaces/errors.go
rename to spaces/errors.go
diff --git a/pkg/spaces/events.go b/spaces/events.go
similarity index 100%
rename from pkg/spaces/events.go
rename to spaces/events.go
diff --git a/pkg/spaces/middleware/access_logging_middleware.go b/spaces/middleware/access_logging_middleware.go
similarity index 96%
rename from pkg/spaces/middleware/access_logging_middleware.go
rename to spaces/middleware/access_logging_middleware.go
index d155ee1f..76b6270c 100644
--- a/pkg/spaces/middleware/access_logging_middleware.go
+++ b/spaces/middleware/access_logging_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/spaces -i Spaces -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/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
"go.uber.org/zap"
)
diff --git a/pkg/spaces/middleware/caching_middleware.go b/spaces/middleware/caching_middleware.go
similarity index 98%
rename from pkg/spaces/middleware/caching_middleware.go
rename to spaces/middleware/caching_middleware.go
index c7f35de1..9975e173 100644
--- a/pkg/spaces/middleware/caching_middleware.go
+++ b/spaces/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"
"git.perx.ru/perxis/perxis-go/pkg/options"
- service "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ service "git.perx.ru/perxis/perxis-go/spaces"
)
func orgKey(orgID string) string { return "org-" + orgID }
diff --git a/pkg/spaces/middleware/caching_middleware_test.go b/spaces/middleware/caching_middleware_test.go
similarity index 98%
rename from pkg/spaces/middleware/caching_middleware_test.go
rename to spaces/middleware/caching_middleware_test.go
index 0674c932..48992961 100644
--- a/pkg/spaces/middleware/caching_middleware_test.go
+++ b/spaces/middleware/caching_middleware_test.go
@@ -8,8 +8,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/spaces"
- spmocks "git.perx.ru/perxis/perxis-go/pkg/spaces/mocks"
+ "git.perx.ru/perxis/perxis-go/spaces"
+ spmocks "git.perx.ru/perxis/perxis-go/spaces/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/spaces/middleware/error_logging_middleware.go b/spaces/middleware/error_logging_middleware.go
similarity index 94%
rename from pkg/spaces/middleware/error_logging_middleware.go
rename to spaces/middleware/error_logging_middleware.go
index 677b4836..bb9a026e 100644
--- a/pkg/spaces/middleware/error_logging_middleware.go
+++ b/spaces/middleware/error_logging_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/spaces -i Spaces -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/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
"go.uber.org/zap"
)
diff --git a/pkg/spaces/middleware/logging_middleware.go b/spaces/middleware/logging_middleware.go
similarity index 99%
rename from pkg/spaces/middleware/logging_middleware.go
rename to spaces/middleware/logging_middleware.go
index a45ec2df..cf66959f 100644
--- a/pkg/spaces/middleware/logging_middleware.go
+++ b/spaces/middleware/logging_middleware.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
diff --git a/pkg/spaces/middleware/middleware.go b/spaces/middleware/middleware.go
similarity index 73%
rename from pkg/spaces/middleware/middleware.go
rename to spaces/middleware/middleware.go
index 15f2bc25..63a68a18 100644
--- a/pkg/spaces/middleware/middleware.go
+++ b/spaces/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/spaces -i Spaces -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
"go.uber.org/zap"
)
diff --git a/pkg/spaces/middleware/recovering_middleware.go b/spaces/middleware/recovering_middleware.go
similarity index 95%
rename from pkg/spaces/middleware/recovering_middleware.go
rename to spaces/middleware/recovering_middleware.go
index cca581b6..527e21e6 100644
--- a/pkg/spaces/middleware/recovering_middleware.go
+++ b/spaces/middleware/recovering_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/spaces -i Spaces -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/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
"go.uber.org/zap"
)
diff --git a/pkg/spaces/middleware/telemetry_middleware.go b/spaces/middleware/telemetry_middleware.go
similarity index 98%
rename from pkg/spaces/middleware/telemetry_middleware.go
rename to spaces/middleware/telemetry_middleware.go
index 84c90bd6..1da97fb5 100644
--- a/pkg/spaces/middleware/telemetry_middleware.go
+++ b/spaces/middleware/telemetry_middleware.go
@@ -4,7 +4,7 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/spaces -i Spaces -t ../../../assets/templates/middleware/telemetry_content -o telemetry_middleware.go -l ""
import (
"context"
@@ -13,8 +13,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/options"
- "git.perx.ru/perxis/perxis-go/pkg/spaces"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/spaces"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/spaces/mocks/Middleware.go b/spaces/mocks/Middleware.go
similarity index 95%
rename from pkg/spaces/mocks/Middleware.go
rename to spaces/mocks/Middleware.go
index 0979e72e..ed5113b1 100644
--- a/pkg/spaces/mocks/Middleware.go
+++ b/spaces/mocks/Middleware.go
@@ -3,7 +3,7 @@
package mocks
import (
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/spaces/mocks/SpaceCreatedObserver.go b/spaces/mocks/SpaceCreatedObserver.go
similarity index 95%
rename from pkg/spaces/mocks/SpaceCreatedObserver.go
rename to spaces/mocks/SpaceCreatedObserver.go
index 049a741a..9a9e29fa 100644
--- a/pkg/spaces/mocks/SpaceCreatedObserver.go
+++ b/spaces/mocks/SpaceCreatedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/spaces/mocks/SpaceDeletedObserver.go b/spaces/mocks/SpaceDeletedObserver.go
similarity index 95%
rename from pkg/spaces/mocks/SpaceDeletedObserver.go
rename to spaces/mocks/SpaceDeletedObserver.go
index d4e65da6..b1093ba4 100644
--- a/pkg/spaces/mocks/SpaceDeletedObserver.go
+++ b/spaces/mocks/SpaceDeletedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/spaces/mocks/SpaceObserver.go b/spaces/mocks/SpaceObserver.go
similarity index 100%
rename from pkg/spaces/mocks/SpaceObserver.go
rename to spaces/mocks/SpaceObserver.go
diff --git a/pkg/spaces/mocks/SpaceUpdatedObserver.go b/spaces/mocks/SpaceUpdatedObserver.go
similarity index 96%
rename from pkg/spaces/mocks/SpaceUpdatedObserver.go
rename to spaces/mocks/SpaceUpdatedObserver.go
index adfa9ea5..9fbccebb 100644
--- a/pkg/spaces/mocks/SpaceUpdatedObserver.go
+++ b/spaces/mocks/SpaceUpdatedObserver.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/spaces/mocks/Spaces.go b/spaces/mocks/Spaces.go
similarity index 99%
rename from pkg/spaces/mocks/Spaces.go
rename to spaces/mocks/Spaces.go
index 76121895..5a254708 100644
--- a/pkg/spaces/mocks/Spaces.go
+++ b/spaces/mocks/Spaces.go
@@ -8,7 +8,7 @@ import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
mock "github.com/stretchr/testify/mock"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
)
// Spaces is an autogenerated mock type for the Spaces type
diff --git a/pkg/spaces/mocks/Storage.go b/spaces/mocks/Storage.go
similarity index 98%
rename from pkg/spaces/mocks/Storage.go
rename to spaces/mocks/Storage.go
index 078993ce..e9dcc620 100644
--- a/pkg/spaces/mocks/Storage.go
+++ b/spaces/mocks/Storage.go
@@ -8,7 +8,7 @@ import (
options "git.perx.ru/perxis/perxis-go/pkg/options"
mock "github.com/stretchr/testify/mock"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
)
// Storage is an autogenerated mock type for the Storage type
diff --git a/pkg/spaces/observer.go b/spaces/observer.go
similarity index 100%
rename from pkg/spaces/observer.go
rename to spaces/observer.go
diff --git a/pkg/spaces/service.go b/spaces/service.go
similarity index 100%
rename from pkg/spaces/service.go
rename to spaces/service.go
diff --git a/pkg/spaces/service_test.go b/spaces/service_test.go
similarity index 100%
rename from pkg/spaces/service_test.go
rename to spaces/service_test.go
diff --git a/pkg/spaces/space.go b/spaces/space.go
similarity index 100%
rename from pkg/spaces/space.go
rename to spaces/space.go
diff --git a/pkg/spaces/storage.go b/spaces/storage.go
similarity index 100%
rename from pkg/spaces/storage.go
rename to spaces/storage.go
diff --git a/pkg/spaces/transport/client.go b/spaces/transport/client.go
similarity index 98%
rename from pkg/spaces/transport/client.go
rename to spaces/transport/client.go
index 52a30a56..f21065bc 100644
--- a/pkg/spaces/transport/client.go
+++ b/spaces/transport/client.go
@@ -6,7 +6,7 @@ import (
"context"
"git.perx.ru/perxis/perxis-go/pkg/options"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *spaces.Space) (res0 *spaces.Space, res1 error) {
diff --git a/pkg/spaces/transport/endpoints.microgen.go b/spaces/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/spaces/transport/endpoints.microgen.go
rename to spaces/transport/endpoints.microgen.go
diff --git a/pkg/spaces/transport/exchanges.microgen.go b/spaces/transport/exchanges.microgen.go
similarity index 97%
rename from pkg/spaces/transport/exchanges.microgen.go
rename to spaces/transport/exchanges.microgen.go
index 5fe6cfba..dc324193 100644
--- a/pkg/spaces/transport/exchanges.microgen.go
+++ b/spaces/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
"git.perx.ru/perxis/perxis-go/pkg/options"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
)
type (
diff --git a/pkg/spaces/transport/grpc/client.go b/spaces/transport/grpc/client.go
similarity index 94%
rename from pkg/spaces/transport/grpc/client.go
rename to spaces/transport/grpc/client.go
index a4c431a7..ff34d92e 100644
--- a/pkg/spaces/transport/grpc/client.go
+++ b/spaces/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/spaces/transport"
+ transport "git.perx.ru/perxis/perxis-go/spaces/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/spaces/transport/grpc/client.microgen.go b/spaces/transport/grpc/client.microgen.go
similarity index 97%
rename from pkg/spaces/transport/grpc/client.microgen.go
rename to spaces/transport/grpc/client.microgen.go
index 1e7095cd..721a82b7 100644
--- a/pkg/spaces/transport/grpc/client.microgen.go
+++ b/spaces/transport/grpc/client.microgen.go
@@ -3,8 +3,8 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
+ transport "git.perx.ru/perxis/perxis-go/spaces/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/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go b/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
index 6797cc20..b097f8ff 100644
--- a/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -8,8 +8,8 @@ import (
"errors"
transportgrpc "git.perx.ru/perxis/perxis-go/pkg/items/transport/grpc"
- transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
+ transport "git.perx.ru/perxis/perxis-go/spaces/transport"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go b/spaces/transport/grpc/protobuf_type_converters.microgen.go
similarity index 98%
rename from pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
rename to spaces/transport/grpc/protobuf_type_converters.microgen.go
index d7231bdb..f08c7d19 100644
--- a/pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
+++ b/spaces/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
package transportgrpc
import (
- service "git.perx.ru/perxis/perxis-go/pkg/spaces"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
+ service "git.perx.ru/perxis/perxis-go/spaces"
"google.golang.org/protobuf/types/known/timestamppb"
)
diff --git a/pkg/spaces/transport/grpc/server.go b/spaces/transport/grpc/server.go
similarity index 92%
rename from pkg/spaces/transport/grpc/server.go
rename to spaces/transport/grpc/server.go
index 01574994..c3a24457 100644
--- a/pkg/spaces/transport/grpc/server.go
+++ b/spaces/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/spaces"
- "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces"
+ "git.perx.ru/perxis/perxis-go/spaces/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/spaces/transport/grpc/server.microgen.go b/spaces/transport/grpc/server.microgen.go
similarity index 98%
rename from pkg/spaces/transport/grpc/server.microgen.go
rename to spaces/transport/grpc/server.microgen.go
index 2a394550..cbea5604 100644
--- a/pkg/spaces/transport/grpc/server.microgen.go
+++ b/spaces/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
+ transport "git.perx.ru/perxis/perxis-go/spaces/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/spaces/transport/server.microgen.go b/spaces/transport/server.microgen.go
similarity index 98%
rename from pkg/spaces/transport/server.microgen.go
rename to spaces/transport/server.microgen.go
index ece65a8f..ac3704ce 100644
--- a/pkg/spaces/transport/server.microgen.go
+++ b/spaces/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
+ spaces "git.perx.ru/perxis/perxis-go/spaces"
endpoint "github.com/go-kit/kit/endpoint"
)
--
GitLab