From bced227284714dc890ff5886cab2c8ff1306ef26 Mon Sep 17 00:00:00 2001
From: Anton Sattarov <sattarov@perx.ru>
Date: Wed, 12 Apr 2023 14:50:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
=?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
=?UTF-8?q?=20space=20=D0=B2=20spaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/{space => spaces}/mocks/Spaces.go | 42 +++++++++----------
pkg/{space => spaces}/service.go | 2 +-
pkg/{space => spaces}/space.go | 2 +-
pkg/{space => spaces}/transport/client.go | 2 +-
.../transport/endpoints.microgen.go | 0
.../transport/exchanges.microgen.go | 2 +-
.../transport/grpc/client.go | 2 +-
.../transport/grpc/client.microgen.go | 2 +-
.../protobuf_endpoint_converters.microgen.go | 2 +-
.../grpc/protobuf_type_converters.microgen.go | 2 +-
.../transport/grpc/server.go | 6 +--
.../transport/grpc/server.microgen.go | 2 +-
.../transport/server.microgen.go | 2 +-
13 files changed, 34 insertions(+), 34 deletions(-)
rename pkg/{space => spaces}/mocks/Spaces.go (70%)
rename pkg/{space => spaces}/service.go (99%)
rename pkg/{space => spaces}/space.go (99%)
rename pkg/{space => spaces}/transport/client.go (97%)
rename pkg/{space => spaces}/transport/endpoints.microgen.go (100%)
rename pkg/{space => spaces}/transport/exchanges.microgen.go (94%)
rename pkg/{space => spaces}/transport/grpc/client.go (92%)
rename pkg/{space => spaces}/transport/grpc/client.microgen.go (95%)
rename pkg/{space => spaces}/transport/grpc/protobuf_endpoint_converters.microgen.go (99%)
rename pkg/{space => spaces}/transport/grpc/protobuf_type_converters.microgen.go (97%)
rename pkg/{space => spaces}/transport/grpc/server.go (80%)
rename pkg/{space => spaces}/transport/grpc/server.microgen.go (97%)
rename pkg/{space => spaces}/transport/server.microgen.go (97%)
diff --git a/pkg/space/mocks/Spaces.go b/pkg/spaces/mocks/Spaces.go
similarity index 70%
rename from pkg/space/mocks/Spaces.go
rename to pkg/spaces/mocks/Spaces.go
index 6fd9ef4a..e272ebce 100644
--- a/pkg/space/mocks/Spaces.go
+++ b/pkg/spaces/mocks/Spaces.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- space "git.perx.ru/perxis/perxis-go/pkg/space"
+ spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
mock "github.com/stretchr/testify/mock"
)
@@ -15,23 +15,23 @@ type Spaces struct {
}
// Create provides a mock function with given fields: ctx, _a1
-func (_m *Spaces) Create(ctx context.Context, _a1 *space.Space) (*space.Space, error) {
+func (_m *Spaces) Create(ctx context.Context, _a1 *spaces.Space) (*spaces.Space, error) {
ret := _m.Called(ctx, _a1)
- var r0 *space.Space
+ var r0 *spaces.Space
var r1 error
- if rf, ok := ret.Get(0).(func(context.Context, *space.Space) (*space.Space, error)); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, *spaces.Space) (*spaces.Space, error)); ok {
return rf(ctx, _a1)
}
- if rf, ok := ret.Get(0).(func(context.Context, *space.Space) *space.Space); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, *spaces.Space) *spaces.Space); ok {
r0 = rf(ctx, _a1)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(*space.Space)
+ r0 = ret.Get(0).(*spaces.Space)
}
}
- if rf, ok := ret.Get(1).(func(context.Context, *space.Space) error); ok {
+ if rf, ok := ret.Get(1).(func(context.Context, *spaces.Space) error); ok {
r1 = rf(ctx, _a1)
} else {
r1 = ret.Error(1)
@@ -55,19 +55,19 @@ func (_m *Spaces) Delete(ctx context.Context, spaceId string) error {
}
// Get provides a mock function with given fields: ctx, spaceId
-func (_m *Spaces) Get(ctx context.Context, spaceId string) (*space.Space, error) {
+func (_m *Spaces) Get(ctx context.Context, spaceId string) (*spaces.Space, error) {
ret := _m.Called(ctx, spaceId)
- var r0 *space.Space
+ var r0 *spaces.Space
var r1 error
- if rf, ok := ret.Get(0).(func(context.Context, string) (*space.Space, error)); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, string) (*spaces.Space, error)); ok {
return rf(ctx, spaceId)
}
- if rf, ok := ret.Get(0).(func(context.Context, string) *space.Space); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, string) *spaces.Space); ok {
r0 = rf(ctx, spaceId)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(*space.Space)
+ r0 = ret.Get(0).(*spaces.Space)
}
}
@@ -81,19 +81,19 @@ func (_m *Spaces) Get(ctx context.Context, spaceId string) (*space.Space, error)
}
// List provides a mock function with given fields: ctx, orgId
-func (_m *Spaces) List(ctx context.Context, orgId string) ([]*space.Space, error) {
+func (_m *Spaces) List(ctx context.Context, orgId string) ([]*spaces.Space, error) {
ret := _m.Called(ctx, orgId)
- var r0 []*space.Space
+ var r0 []*spaces.Space
var r1 error
- if rf, ok := ret.Get(0).(func(context.Context, string) ([]*space.Space, error)); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, string) ([]*spaces.Space, error)); ok {
return rf(ctx, orgId)
}
- if rf, ok := ret.Get(0).(func(context.Context, string) []*space.Space); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, string) []*spaces.Space); ok {
r0 = rf(ctx, orgId)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).([]*space.Space)
+ r0 = ret.Get(0).([]*spaces.Space)
}
}
@@ -107,11 +107,11 @@ func (_m *Spaces) List(ctx context.Context, orgId string) ([]*space.Space, error
}
// Update provides a mock function with given fields: ctx, _a1
-func (_m *Spaces) Update(ctx context.Context, _a1 *space.Space) error {
+func (_m *Spaces) Update(ctx context.Context, _a1 *spaces.Space) error {
ret := _m.Called(ctx, _a1)
var r0 error
- if rf, ok := ret.Get(0).(func(context.Context, *space.Space) error); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, *spaces.Space) error); ok {
r0 = rf(ctx, _a1)
} else {
r0 = ret.Error(0)
@@ -121,11 +121,11 @@ func (_m *Spaces) Update(ctx context.Context, _a1 *space.Space) error {
}
// UpdateConfig provides a mock function with given fields: ctx, spaceId, config
-func (_m *Spaces) UpdateConfig(ctx context.Context, spaceId string, config *space.Config) error {
+func (_m *Spaces) UpdateConfig(ctx context.Context, spaceId string, config *spaces.Config) error {
ret := _m.Called(ctx, spaceId, config)
var r0 error
- if rf, ok := ret.Get(0).(func(context.Context, string, *space.Config) error); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, string, *spaces.Config) error); ok {
r0 = rf(ctx, spaceId, config)
} else {
r0 = ret.Error(0)
diff --git a/pkg/space/service.go b/pkg/spaces/service.go
similarity index 99%
rename from pkg/space/service.go
rename to pkg/spaces/service.go
index 576f5c2f..d31cbfeb 100644
--- a/pkg/space/service.go
+++ b/pkg/spaces/service.go
@@ -1,4 +1,4 @@
-package space
+package spaces
import (
"context"
diff --git a/pkg/space/space.go b/pkg/spaces/space.go
similarity index 99%
rename from pkg/space/space.go
rename to pkg/spaces/space.go
index dad51255..772caa9c 100644
--- a/pkg/space/space.go
+++ b/pkg/spaces/space.go
@@ -1,4 +1,4 @@
-package space
+package spaces
type State int
diff --git a/pkg/space/transport/client.go b/pkg/spaces/transport/client.go
similarity index 97%
rename from pkg/space/transport/client.go
rename to pkg/spaces/transport/client.go
index 44b72b6f..4f13271e 100644
--- a/pkg/space/transport/client.go
+++ b/pkg/spaces/transport/client.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- spaces "git.perx.ru/perxis/perxis-go/pkg/space"
+ spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *spaces.Space) (res0 *spaces.Space, res1 error) {
diff --git a/pkg/space/transport/endpoints.microgen.go b/pkg/spaces/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/space/transport/endpoints.microgen.go
rename to pkg/spaces/transport/endpoints.microgen.go
diff --git a/pkg/space/transport/exchanges.microgen.go b/pkg/spaces/transport/exchanges.microgen.go
similarity index 94%
rename from pkg/space/transport/exchanges.microgen.go
rename to pkg/spaces/transport/exchanges.microgen.go
index 05ad1182..106753c6 100644
--- a/pkg/space/transport/exchanges.microgen.go
+++ b/pkg/spaces/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import spaces "git.perx.ru/perxis/perxis-go/pkg/space"
+import spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
type (
CreateRequest struct {
diff --git a/pkg/space/transport/grpc/client.go b/pkg/spaces/transport/grpc/client.go
similarity index 92%
rename from pkg/space/transport/grpc/client.go
rename to pkg/spaces/transport/grpc/client.go
index bfa48ae9..693011ce 100644
--- a/pkg/space/transport/grpc/client.go
+++ b/pkg/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/space/transport"
+ transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
diff --git a/pkg/space/transport/grpc/client.microgen.go b/pkg/spaces/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/space/transport/grpc/client.microgen.go
rename to pkg/spaces/transport/grpc/client.microgen.go
index b0d7d35e..d6547f84 100644
--- a/pkg/space/transport/grpc/client.microgen.go
+++ b/pkg/spaces/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+ transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
grpckit "github.com/go-kit/kit/transport/grpc"
empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/space/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 99%
rename from pkg/space/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
index 606d41cf..3ea51a2a 100644
--- a/pkg/space/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/spaces/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
"context"
"errors"
- transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+ transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
empty "github.com/golang/protobuf/ptypes/empty"
)
diff --git a/pkg/space/transport/grpc/protobuf_type_converters.microgen.go b/pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
similarity index 97%
rename from pkg/space/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
index 56e2dc38..27bb510d 100644
--- a/pkg/space/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/spaces/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,7 +5,7 @@
package transportgrpc
import (
- service "git.perx.ru/perxis/perxis-go/pkg/space"
+ service "git.perx.ru/perxis/perxis-go/pkg/spaces"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
)
diff --git a/pkg/space/transport/grpc/server.go b/pkg/spaces/transport/grpc/server.go
similarity index 80%
rename from pkg/space/transport/grpc/server.go
rename to pkg/spaces/transport/grpc/server.go
index f8220070..bd38b0b9 100644
--- a/pkg/space/transport/grpc/server.go
+++ b/pkg/spaces/transport/grpc/server.go
@@ -2,13 +2,13 @@ package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
- "git.perx.ru/perxis/perxis-go/pkg/space"
- "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+ "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"
grpckit "github.com/go-kit/kit/transport/grpc"
)
-func NewServer(svc space.Spaces, opts ...grpckit.ServerOption) pb.SpacesServer {
+func NewServer(svc spaces.Spaces, opts ...grpckit.ServerOption) pb.SpacesServer {
eps := transport.Endpoints(svc)
eps = transport.EndpointsSet{
CreateEndpoint: grpcerr.ServerMiddleware(eps.CreateEndpoint),
diff --git a/pkg/space/transport/grpc/server.microgen.go b/pkg/spaces/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/space/transport/grpc/server.microgen.go
rename to pkg/spaces/transport/grpc/server.microgen.go
index 0d004334..437b8ad3 100644
--- a/pkg/space/transport/grpc/server.microgen.go
+++ b/pkg/spaces/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/space/transport"
+ transport "git.perx.ru/perxis/perxis-go/pkg/spaces/transport"
pb "git.perx.ru/perxis/perxis-go/proto/spaces"
grpc "github.com/go-kit/kit/transport/grpc"
empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/space/transport/server.microgen.go b/pkg/spaces/transport/server.microgen.go
similarity index 97%
rename from pkg/space/transport/server.microgen.go
rename to pkg/spaces/transport/server.microgen.go
index b4546383..864dbffe 100644
--- a/pkg/space/transport/server.microgen.go
+++ b/pkg/spaces/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
- spaces "git.perx.ru/perxis/perxis-go/pkg/space"
+ spaces "git.perx.ru/perxis/perxis-go/pkg/spaces"
endpoint "github.com/go-kit/kit/endpoint"
)
--
GitLab