Merge branch 'feature/PRXS-1064-2415-FilesErrorsGRPC' into 'feature/PRXS-1064-ErrorsServicesGRPC'

Добавлен возврат ошибок в сервисе Files по GRPC

See merge request perxis/perxis-go!227

pkg/files/transport/client.microgen.go → pkg/files/transport/client.go

@@ -4,20 +4,14 @@ package transport
 
 import (
 	"context"
-	"errors"
 
 	files "git.perx.ru/perxis/perxis-go/pkg/files"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 )
 
 func (set EndpointsSet) StartUpload(arg0 context.Context, arg1 *files.MultipartUpload) (res0 *files.MultipartUpload, res1 error) {
 	request := StartUploadRequest{Upload: arg1}
 	response, res1 := set.StartUploadEndpoint(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.(*StartUploadResponse).U, res1
@@ -27,9 +21,6 @@ func (set EndpointsSet) CompleteUpload(arg0 context.Context, arg1 *files.Multipa
 	request := CompleteUploadRequest{Upload: arg1}
 	response, res1 := set.CompleteUploadEndpoint(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.(*CompleteUploadResponse).U, res1
@@ -39,9 +30,6 @@ func (set EndpointsSet) AbortUpload(arg0 context.Context, arg1 *files.MultipartU
 	request := AbortUploadRequest{Upload: arg1}
 	_, res0 = set.AbortUploadEndpoint(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
@@ -51,9 +39,6 @@ func (set EndpointsSet) MoveUpload(arg0 context.Context, arg1 *files.MultipartUp
 	request := MoveUploadRequest{Upload: arg1}
 	response, res1 := set.MoveUploadEndpoint(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.(*MoveUploadResponse).File, res1
@@ -63,9 +48,6 @@ func (set EndpointsSet) Upload(arg0 context.Context, arg1 *files.File) (res0 *fi
 	request := UploadRequest{File: arg1}
 	response, res1 := set.UploadEndpoint(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.(*UploadResponse).U, res1
@@ -75,9 +57,6 @@ func (set EndpointsSet) GetFile(arg0 context.Context, arg1 *files.File) (res0 *f
 	request := GetFileRequest{File: arg1}
 	response, res1 := set.GetFileEndpoint(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.(*GetFileResponse).F, res1
@@ -87,9 +66,6 @@ func (set EndpointsSet) DeleteFile(arg0 context.Context, arg1 *files.File) (res0
 	request := DeleteFileRequest{File: arg1}
 	_, res0 = set.DeleteFileEndpoint(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/files/transport/grpc/client.go

+// 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/files/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{
+		AbortUploadEndpoint:    grpcerr.ClientMiddleware(c.AbortUploadEndpoint),
+		CompleteUploadEndpoint: grpcerr.ClientMiddleware(c.CompleteUploadEndpoint),
+		DeleteFileEndpoint:     grpcerr.ClientMiddleware(c.DeleteFileEndpoint),
+		GetFileEndpoint:        grpcerr.ClientMiddleware(c.GetFileEndpoint),
+		MoveUploadEndpoint:     grpcerr.ClientMiddleware(c.MoveUploadEndpoint),
+		StartUploadEndpoint:    grpcerr.ClientMiddleware(c.StartUploadEndpoint),
+		UploadEndpoint:         grpcerr.ClientMiddleware(c.UploadEndpoint),
+	}
+}

pkg/files/transport/grpc/server.go

+package transportgrpc
+
+import (
+	grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
+	"git.perx.ru/perxis/perxis-go/pkg/files"
+	"git.perx.ru/perxis/perxis-go/pkg/files/transport"
+	pb "git.perx.ru/perxis/perxis-go/proto/files"
+	grpckit "github.com/go-kit/kit/transport/grpc"
+)
+
+func NewServer(svc files.Files, opts ...grpckit.ServerOption) pb.FilesServer {
+	eps := transport.Endpoints(svc)
+	eps = transport.EndpointsSet{
+		AbortUploadEndpoint:    grpcerr.ServerMiddleware(eps.AbortUploadEndpoint),
+		CompleteUploadEndpoint: grpcerr.ServerMiddleware(eps.CompleteUploadEndpoint),
+		DeleteFileEndpoint:     grpcerr.ServerMiddleware(eps.DeleteFileEndpoint),
+		GetFileEndpoint:        grpcerr.ServerMiddleware(eps.GetFileEndpoint),
+		MoveUploadEndpoint:     grpcerr.ServerMiddleware(eps.MoveUploadEndpoint),
+		StartUploadEndpoint:    grpcerr.ServerMiddleware(eps.StartUploadEndpoint),
+		UploadEndpoint:         grpcerr.ServerMiddleware(eps.UploadEndpoint),
+	}
+	return NewGRPCServer(&eps, opts...)
+}