diff --git a/id/system/system.go b/id/system/system.go
index c33995d905a615b6c24422e27239da34141d4752..85d17c53b7625b317c8bebd130dbe035b7468ccc 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 2f01fa125e376623ceb710bbe594235b8434d853..fbc5b71f6f5c28c5070b800c8d84e94403780910 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 9fffc86351e794758a00f70218d820a3855eb95a..7759b73e09ab26ee3d7ae42355fc774ea7228336 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 9db7a5683681137c346f6cba91ec3d40c6a331d6..53d4e46bd99773645ba4c3db637a74cbde1abeed 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 2394c62a2f15ca7605959b3f5b31996a5c79a164..bf5d801dfbb6d5ef159f7b86154fecb0d3499426 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 29e879457bebc4da201ce126c6c140e02989f2c0..c81b9176ec5d99d3576bee4f3cd21010847da36f 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 adc5f784dff8fccd5b505867bf65efb373a9149d..c5c8f2933b88c56a59c3691daaec6f325a9675e3 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 1d351e9308da0ea2c81f8afa80fb2be219c633ea..e38edd4a18b888bff5abccc89e03c3aee9ea19aa 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 87e600e5b40da50381245a626e8228ab20485de8..2bb71a5a4d62744d0198b7b761e9b36da9f68a0e 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 8855269638d1901b553ee4a6ecc6ed2c488f3d17..74e26caad8e73d43c0c0f27a980c0a07191d1981 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 ff73b745deb0fcec807fa0c0f28b2ba5a0dd7258..03a9ca640bf19640810ec006b02edddd37e998f8 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 64530be62337de21dc5b93956df261ce5211a302..ea6d720f546afb45044dd5aa6eea4f834a50f918 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 128f706423f3ecc67097a76b8926fbed619eb1ce..7745b6ab5aec5b395078ec2f28b7efa8b518b560 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 c7dda43f08c852f590cd7cfa16ec00709423c7a3..194b70faacb081ee27572d9e23264bb67d95a273 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 d155ee1f0d95daad6b29c5961604cdc8b466fcd9..76b6270cf606f892c5d3ce067a0be4b51d219ec4 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 c7f35de12106e9aa828e56ebd6f6ec4361c70da7..9975e173b94904488e4e0d53f805c25276d0adb3 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 0674c932eb4e5f9d519a587a45cc4c5003b8f7d7..4899296129f664e9c8fd775eb6b3141f31de6b19 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 677b48366b6304e47988578bcb694ad758ba3ab0..bb9a026e9c1399e629bca1e9954083343ee8e4c4 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 a45ec2df50923d480f9c94f3c2f26bf266121aff..cf66959f8ccab8c8a7faef6e05e95c9884bdc209 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 15f2bc259beacd5ea312632ba042a33b59022f32..63a68a18be1668018515153f39f533c861dd7848 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 cca581b6643b32bf21f31964aac200bb9613515d..527e21e6d3ea4061e21c36d3e6c8a5a62eb795de 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 84c90bd6a74bd9bdce5479ae6d100e306916355d..1da97fb5d9ef834de591b36a0e275fa59f609e23 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 0979e72e453c18aafb52448768f6f78fa54495c4..ed5113b1f5bea03b1590722fcd1a5d5b04294ea6 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 049a741a757f5d107d347f826363eafeb29d85ac..9a9e29fa27ae4e7a454bbfa95f56476ae6181fac 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 d4e65da6af20b85ab56159fcafed103f92b9c26b..b1093ba41ae24bf13e2cc42beede18c4c628f197 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 adfa9ea58992d08746ae6072743fe59a21a4bd10..9fbccebb85ba7d69973ece023070dc0e4d73365c 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 76121895f428dbcd8aa8117f4a8e376845d81e0b..5a254708231a1ae1ccf00f191643fbf4d7f4c474 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 078993cebec0cb2a5748c0d5bf1c50fb68d4def0..e9dcc620624eaba9b1eede82bebd1deb594728e8 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 52a30a561eb51812831f15b26c1b1665691ee6d3..f21065bc608a2fa0889a984600994de2e032a672 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 5fe6cfbad14530dc543091ea0df0dc960f75a023..dc32419301a9dcaaa4fd8a561acb7756e39524e5 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 a4c431a7d80e0953a46fb9e7048ef63fa8f31a93..ff34d92e29ee03ca6410d72bb88ae01a3b4f9a7f 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 1e7095cd261f03111fafaafc361ca49b7f12cb70..721a82b7d13e0cf61adc826da69e5d24622f256c 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 6797cc200801de828c8cefe14c085280188a6a75..b097f8ff701216eec76d54ea3480f6506ca5448b 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 d7231bdba357885b1506b3f5d2301149feb8cd5a..f08c7d1920885c3d419796447b4f433cbbebb17f 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 01574994044d527046ad6f33ac631c37bbb03e1f..c3a24457519671c3222ad2e3a13ce9f968756ad2 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 2a39455033e628b9ac7766b6057575793e2f8f6c..cbea56041ac7d0edd82ae9ce2622ea21583b2971 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 ece65a8fefe877cb031a9dc7854c141d3545d8fe..ac3704ce0677cb44d0277f09865d8bd6c297f7d9 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"
)