Skip to content
Snippets Groups Projects
Commit e45a3db8 authored by Alex Petraky's avatar Alex Petraky :basketball_player_tone1: Committed by Pavel Antonov
Browse files

Возврат GRPC-ошибки в сервисах

parent a1afa563
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 185 additions and 66 deletions
pkg/members/transport/grpc/server.go 0 → 100644
+ 21
− 0
View file @ e45a3db8
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
"git.perx.ru/perxis/perxis-go/pkg/members"
"git.perx.ru/perxis/perxis-go/pkg/members/transport"
pb "git.perx.ru/perxis/perxis-go/proto/members"
grpckit "github.com/go-kit/kit/transport/grpc"
)
func NewServer(svc members.Members, opts ...grpckit.ServerOption) pb.MembersServer {
eps := transport.Endpoints(svc)
eps = transport.EndpointsSet{
GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
ListMembersEndpoint: grpcerr.ServerMiddleware(eps.ListMembersEndpoint),
ListOrganizationsEndpoint: grpcerr.ServerMiddleware(eps.ListOrganizationsEndpoint),
RemoveEndpoint: grpcerr.ServerMiddleware(eps.RemoveEndpoint),
SetEndpoint: grpcerr.ServerMiddleware(eps.SetEndpoint),
}
return NewGRPCServer(&eps, opts...)
}
pkg/organizations/transport/client.microgen.go → pkg/organizations/transport/client.go
+ 0
− 18
View file @ e45a3db8
......@@ -4,21 +4,15 @@ package transport
import (
"context"
"errors"
options "git.perx.ru/perxis/perxis-go/pkg/options"
organizations "git.perx.ru/perxis/perxis-go/pkg/organizations"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *organizations.Organization) (res0 *organizations.Organization, res1 error) {
request := CreateRequest{Org: arg1}
response, res1 := set.CreateEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*CreateResponse).Created, res1
......@@ -28,9 +22,6 @@ func (set EndpointsSet) Get(arg0 context.Context, arg1 string) (res0 *organizati
request := GetRequest{OrgId: arg1}
response, res1 := set.GetEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*GetResponse).Org, res1
......@@ -40,9 +31,6 @@ func (set EndpointsSet) Update(arg0 context.Context, arg1 *organizations.Organiz
request := UpdateRequest{Org: arg1}
_, res0 = set.UpdateEndpoint(arg0, &request)
if res0 != nil {
if e, ok := status.FromError(res0); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res0 = errors.New(e.Message())
}
return
}
return res0
......@@ -52,9 +40,6 @@ func (set EndpointsSet) Delete(arg0 context.Context, arg1 string) (res0 error) {
request := DeleteRequest{OrgId: arg1}
_, res0 = set.DeleteEndpoint(arg0, &request)
if res0 != nil {
if e, ok := status.FromError(res0); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res0 = errors.New(e.Message())
}
return
}
return res0
......@@ -67,9 +52,6 @@ func (set EndpointsSet) Find(arg0 context.Context, arg1 *organizations.Filter, a
}
response, res2 := set.FindEndpoint(arg0, &request)
if res2 != nil {
if e, ok := status.FromError(res2); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res2 = errors.New(e.Message())
}
return
}
return response.(*FindResponse).Orgs, response.(*FindResponse).Total, res2
......
pkg/organizations/transport/grpc/client.go 0 → 100644
+ 21
− 0
View file @ e45a3db8
// Code generated by microgen 0.9.1. DO NOT EDIT.
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
transport "git.perx.ru/perxis/perxis-go/pkg/organizations/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
func NewClient(conn *grpc.ClientConn, opts ...grpckit.ClientOption) transport.EndpointsSet {
c := NewGRPCClient(conn, "", opts...)
return transport.EndpointsSet{
CreateEndpoint: grpcerr.ClientMiddleware(c.CreateEndpoint),
DeleteEndpoint: grpcerr.ClientMiddleware(c.DeleteEndpoint),
FindEndpoint: grpcerr.ClientMiddleware(c.FindEndpoint),
GetEndpoint: grpcerr.ClientMiddleware(c.GetEndpoint),
UpdateEndpoint: grpcerr.ClientMiddleware(c.UpdateEndpoint),
}
}
pkg/organizations/transport/grpc/server.go 0 → 100644
+ 21
− 0
View file @ e45a3db8
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
"git.perx.ru/perxis/perxis-go/pkg/organizations"
"git.perx.ru/perxis/perxis-go/pkg/organizations/transport"
pb "git.perx.ru/perxis/perxis-go/proto/organizations"
grpckit "github.com/go-kit/kit/transport/grpc"
)
func NewServer(svc organizations.Organizations, opts ...grpckit.ServerOption) pb.OrganizationsServer {
eps := transport.Endpoints(svc)
eps = transport.EndpointsSet{
CreateEndpoint: grpcerr.ServerMiddleware(eps.CreateEndpoint),
DeleteEndpoint: grpcerr.ServerMiddleware(eps.DeleteEndpoint),
FindEndpoint: grpcerr.ServerMiddleware(eps.FindEndpoint),
GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
UpdateEndpoint: grpcerr.ServerMiddleware(eps.UpdateEndpoint),
}
return NewGRPCServer(&eps, opts...)
}
pkg/references/transport/client.microgen.go → pkg/references/transport/client.go
+ 0
− 9
View file @ e45a3db8
......@@ -4,12 +4,9 @@ package transport
import (
"context"
"errors"
items "git.perx.ru/perxis/perxis-go/pkg/items"
references "git.perx.ru/perxis/perxis-go/pkg/references"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
func (set EndpointsSet) Get(arg0 context.Context, arg1 string, arg2 string, arg3 []*references.Reference) (res0 []*items.Item, res1 []*references.Reference, res2 error) {
......@@ -20,9 +17,6 @@ func (set EndpointsSet) Get(arg0 context.Context, arg1 string, arg2 string, arg3
}
response, res2 := set.GetEndpoint(arg0, &request)
if res2 != nil {
if e, ok := status.FromError(res2); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res2 = errors.New(e.Message())
}
return
}
return response.(*GetResponse).Items, response.(*GetResponse).Notfound, res2
......@@ -38,9 +32,6 @@ func (set EndpointsSet) Publish(arg0 context.Context, arg1 string, arg2 string,
}
response, res3 := set.PublishEndpoint(arg0, &request)
if res3 != nil {
if e, ok := status.FromError(res3); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res3 = errors.New(e.Message())
}
return
}
return response.(*PublishResponse).Published, response.(*PublishResponse).Notfound, response.(*PublishResponse).Unpublished, res3
......
pkg/references/transport/grpc/client.go 0 → 100644
+ 18
− 0
View file @ e45a3db8
// Code generated by microgen 0.9.1. DO NOT EDIT.
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
transport "git.perx.ru/perxis/perxis-go/pkg/references/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
func NewClient(conn *grpc.ClientConn, opts ...grpckit.ClientOption) transport.EndpointsSet {
c := NewGRPCClient(conn, "", opts...)
return transport.EndpointsSet{
GetEndpoint: grpcerr.ClientMiddleware(c.GetEndpoint),
PublishEndpoint: grpcerr.ClientMiddleware(c.PublishEndpoint),
}
}
pkg/references/transport/grpc/server.go 0 → 100644
+ 18
− 0
View file @ e45a3db8
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
"git.perx.ru/perxis/perxis-go/pkg/references"
"git.perx.ru/perxis/perxis-go/pkg/references/transport"
pb "git.perx.ru/perxis/perxis-go/proto/references"
grpckit "github.com/go-kit/kit/transport/grpc"
)
func NewServer(svc references.References, opts ...grpckit.ServerOption) pb.ReferencesServer {
eps := transport.Endpoints(svc)
eps = transport.EndpointsSet{
GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
PublishEndpoint: grpcerr.ServerMiddleware(eps.PublishEndpoint),
}
return NewGRPCServer(&eps, opts...)
}
pkg/roles/transport/client.microgen.go → pkg/roles/transport/client.go
+ 0
− 18
View file @ e45a3db8
......@@ -4,20 +4,14 @@ package transport
import (
"context"
"errors"
roles "git.perx.ru/perxis/perxis-go/pkg/roles"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *roles.Role) (res0 *roles.Role, res1 error) {
request := CreateRequest{Role: arg1}
response, res1 := set.CreateEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*CreateResponse).Created, res1
......@@ -30,9 +24,6 @@ func (set EndpointsSet) Get(arg0 context.Context, arg1 string, arg2 string) (res
}
response, res1 := set.GetEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*GetResponse).Role, res1
......@@ -42,9 +33,6 @@ func (set EndpointsSet) List(arg0 context.Context, arg1 string) (res0 []*roles.R
request := ListRequest{SpaceId: arg1}
response, res1 := set.ListEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*ListResponse).Roles, res1
......@@ -54,9 +42,6 @@ func (set EndpointsSet) Update(arg0 context.Context, arg1 *roles.Role) (res0 err
request := UpdateRequest{Role: arg1}
_, res0 = set.UpdateEndpoint(arg0, &request)
if res0 != nil {
if e, ok := status.FromError(res0); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res0 = errors.New(e.Message())
}
return
}
return res0
......@@ -69,9 +54,6 @@ func (set EndpointsSet) Delete(arg0 context.Context, arg1 string, arg2 string) (
}
_, res0 = set.DeleteEndpoint(arg0, &request)
if res0 != nil {
if e, ok := status.FromError(res0); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res0 = errors.New(e.Message())
}
return
}
return res0
......
pkg/roles/transport/grpc/client.go 0 → 100644
+ 21
− 0
View file @ e45a3db8
// Code generated by microgen 0.9.1. DO NOT EDIT.
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
func NewClient(conn *grpc.ClientConn, opts ...grpckit.ClientOption) transport.EndpointsSet {
c := NewGRPCClient(conn, "", opts...)
return transport.EndpointsSet{
CreateEndpoint: grpcerr.ClientMiddleware(c.CreateEndpoint),
DeleteEndpoint: grpcerr.ClientMiddleware(c.DeleteEndpoint),
GetEndpoint: grpcerr.ClientMiddleware(c.GetEndpoint),
ListEndpoint: grpcerr.ClientMiddleware(c.ListEndpoint),
UpdateEndpoint: grpcerr.ClientMiddleware(c.UpdateEndpoint),
}
}
pkg/roles/transport/grpc/server.go 0 → 100644
+ 21
− 0
View file @ e45a3db8
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"
grpckit "github.com/go-kit/kit/transport/grpc"
)
func NewServer(svc roles.Roles, opts ...grpckit.ServerOption) pb.RolesServer {
eps := transport.Endpoints(svc)
eps = transport.EndpointsSet{
CreateEndpoint: grpcerr.ServerMiddleware(eps.CreateEndpoint),
DeleteEndpoint: grpcerr.ServerMiddleware(eps.DeleteEndpoint),
GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
ListEndpoint: grpcerr.ServerMiddleware(eps.ListEndpoint),
UpdateEndpoint: grpcerr.ServerMiddleware(eps.UpdateEndpoint),
}
return NewGRPCServer(&eps, opts...)
}
pkg/users/transport/client.microgen.go → pkg/users/transport/client.go
+ 0
− 21
View file @ e45a3db8
......@@ -4,21 +4,15 @@ package transport
import (
"context"
"errors"
options "git.perx.ru/perxis/perxis-go/pkg/options"
users "git.perx.ru/perxis/perxis-go/pkg/users"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *users.User) (res0 *users.User, res1 error) {
request := CreateRequest{Create: arg1}
response, res1 := set.CreateEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*CreateResponse).User, res1
......@@ -28,9 +22,6 @@ func (set EndpointsSet) Get(arg0 context.Context, arg1 string) (res0 *users.User
request := GetRequest{UserId: arg1}
response, res1 := set.GetEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*GetResponse).User, res1
......@@ -43,9 +34,6 @@ func (set EndpointsSet) Find(arg0 context.Context, arg1 *users.Filter, arg2 *opt
}
response, res2 := set.FindEndpoint(arg0, &request)
if res2 != nil {
if e, ok := status.FromError(res2); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res2 = errors.New(e.Message())
}
return
}
return response.(*FindResponse).Users, response.(*FindResponse).Total, res2
......@@ -55,9 +43,6 @@ func (set EndpointsSet) Update(arg0 context.Context, arg1 *users.User) (res0 err
request := UpdateRequest{Update: arg1}
_, res0 = set.UpdateEndpoint(arg0, &request)
if res0 != nil {
if e, ok := status.FromError(res0); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res0 = errors.New(e.Message())
}
return
}
return res0
......@@ -67,9 +52,6 @@ func (set EndpointsSet) Delete(arg0 context.Context, arg1 string) (res0 error) {
request := DeleteRequest{UserId: arg1}
_, res0 = set.DeleteEndpoint(arg0, &request)
if res0 != nil {
if e, ok := status.FromError(res0); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res0 = errors.New(e.Message())
}
return
}
return res0
......@@ -79,9 +61,6 @@ func (set EndpointsSet) GetByIdentity(arg0 context.Context, arg1 string) (res0 *
request := GetByIdentityRequest{Identity: arg1}
response, res1 := set.GetByIdentityEndpoint(arg0, &request)
if res1 != nil {
if e, ok := status.FromError(res1); ok || e.Code() == codes.Internal || e.Code() == codes.Unknown {
res1 = errors.New(e.Message())
}
return
}
return response.(*GetByIdentityResponse).User, res1
......
pkg/users/transport/grpc/client.go 0 → 100644
+ 22
− 0
View file @ e45a3db8
// Code generated by microgen 0.9.1. DO NOT EDIT.
package transportgrpc
import (
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
transport "git.perx.ru/perxis/perxis-go/pkg/users/transport"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
)
func NewClient(conn *grpc.ClientConn, opts ...grpckit.ClientOption) transport.EndpointsSet {
c := NewGRPCClient(conn, "", opts...)
return transport.EndpointsSet{
CreateEndpoint: grpcerr.ClientMiddleware(c.CreateEndpoint),
DeleteEndpoint: grpcerr.ClientMiddleware(c.DeleteEndpoint),
FindEndpoint: grpcerr.ClientMiddleware(c.FindEndpoint),
GetByIdentityEndpoint: grpcerr.ClientMiddleware(c.GetByIdentityEndpoint),
GetEndpoint: grpcerr.ClientMiddleware(c.GetEndpoint),
UpdateEndpoint: grpcerr.ClientMiddleware(c.UpdateEndpoint),
}
}
pkg/users/transport/grpc/server.go 0 → 100644
+ 22
− 0
View file @ e45a3db8
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"
grpckit "github.com/go-kit/kit/transport/grpc"
)
func NewServer(svc users.Users, opts ...grpckit.ServerOption) pb.UsersServer {
eps := transport.Endpoints(svc)
eps = transport.EndpointsSet{
CreateEndpoint: grpcerr.ServerMiddleware(eps.CreateEndpoint),
DeleteEndpoint: grpcerr.ServerMiddleware(eps.DeleteEndpoint),
FindEndpoint: grpcerr.ServerMiddleware(eps.FindEndpoint),
GetByIdentityEndpoint: grpcerr.ServerMiddleware(eps.GetByIdentityEndpoint),
GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
UpdateEndpoint: grpcerr.ServerMiddleware(eps.UpdateEndpoint),
}
return NewGRPCServer(&eps, opts...)
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment