From 91e9114c240f725d40be19653eadf6a41ab87e96 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Sun, 25 Dec 2016 19:55:34 +0100 Subject: [PATCH] Regenerate boilerplate --- .../session/gen/client/grpc/client.go | 44 +++++++++ .../session/gen/endpoints/endpoints.go | 2 + .../session/gen/transports/grpc/grpc.go | 28 ++++-- .../session/gen/transports/http/http.go | 4 +- .../services/sprint/gen/client/grpc/client.go | 94 +++++++++++++++++++ .../sprint/gen/endpoints/endpoints.go | 2 + .../sprint/gen/transports/grpc/grpc.go | 40 ++++---- .../sprint/gen/transports/http/http.go | 16 +--- .../services/user/gen/client/grpc/client.go | 69 ++++++++++++++ .../services/user/gen/endpoints/endpoints.go | 2 + .../services/user/gen/transports/grpc/grpc.go | 34 ++++--- .../services/user/gen/transports/http/http.go | 10 +- 12 files changed, 291 insertions(+), 54 deletions(-) create mode 100644 examples/go-kit/services/session/gen/client/grpc/client.go create mode 100644 examples/go-kit/services/sprint/gen/client/grpc/client.go create mode 100644 examples/go-kit/services/user/gen/client/grpc/client.go diff --git a/examples/go-kit/services/session/gen/client/grpc/client.go b/examples/go-kit/services/session/gen/client/grpc/client.go new file mode 100644 index 0000000..cfcaa7c --- /dev/null +++ b/examples/go-kit/services/session/gen/client/grpc/client.go @@ -0,0 +1,44 @@ +package session_clientgrpc + +import ( + jwt "github.com/go-kit/kit/auth/jwt" + "github.com/go-kit/kit/endpoint" + "github.com/go-kit/kit/log" + grpctransport "github.com/go-kit/kit/transport/grpc" + context "golang.org/x/net/context" + "google.golang.org/grpc" + + endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints" + pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb" +) + +func New(conn *grpc.ClientConn, logger log.Logger) pb.SessionServiceServer { + + var loginEndpoint endpoint.Endpoint + { + loginEndpoint = grpctransport.NewClient( + conn, + "session.SessionService", + "Login", + EncodeLoginRequest, + DecodeLoginResponse, + pb.LoginResponse{}, + append([]grpctransport.ClientOption{}, grpctransport.ClientBefore(jwt.FromGRPCContext()))..., + ).Endpoint() + } + + return &endpoints.Endpoints{ + + LoginEndpoint: loginEndpoint, + } +} + +func EncodeLoginRequest(_ context.Context, request interface{}) (interface{}, error) { + req := request.(*pb.LoginRequest) + return req, nil +} + +func DecodeLoginResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) { + response := grpcResponse.(*pb.LoginResponse) + return response, nil +} diff --git a/examples/go-kit/services/session/gen/endpoints/endpoints.go b/examples/go-kit/services/session/gen/endpoints/endpoints.go index daad857..308c767 100644 --- a/examples/go-kit/services/session/gen/endpoints/endpoints.go +++ b/examples/go-kit/services/session/gen/endpoints/endpoints.go @@ -10,6 +10,8 @@ import ( var _ = fmt.Errorf +type StreamEndpoint func(server interface{}, req interface{}) (err error) + type Endpoints struct { LoginEndpoint endpoint.Endpoint } diff --git a/examples/go-kit/services/session/gen/transports/grpc/grpc.go b/examples/go-kit/services/session/gen/transports/grpc/grpc.go index f42474d..fae68b8 100644 --- a/examples/go-kit/services/session/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/session/gen/transports/grpc/grpc.go @@ -4,9 +4,10 @@ import ( "fmt" grpctransport "github.com/go-kit/kit/transport/grpc" + context "golang.org/x/net/context" + endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints" pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb" - context "golang.org/x/net/context" ) // avoid import errors @@ -19,7 +20,7 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sessi login: grpctransport.NewServer( ctx, endpoints.LoginEndpoint, - decodeLoginRequest, + decodeRequest, encodeLoginResponse, options..., ), @@ -38,11 +39,26 @@ func (s *grpcServer) Login(ctx context.Context, req *pb.LoginRequest) (*pb.Login return rep.(*pb.LoginResponse), nil } -func decodeLoginRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { - return grpcReq, nil -} - func encodeLoginResponse(ctx context.Context, response interface{}) (interface{}, error) { resp := response.(*pb.LoginResponse) return resp, nil } + +func decodeRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { + return grpcReq, nil +} + +type streamHandler interface { + Do(server interface{}, req interface{}) (err error) +} + +type server struct { + e endpoints.StreamEndpoint +} + +func (s server) Do(server interface{}, req interface{}) (err error) { + if err := s.e(server, req); err != nil { + return err + } + return nil +} diff --git a/examples/go-kit/services/session/gen/transports/http/http.go b/examples/go-kit/services/session/gen/transports/http/http.go index 2c977f2..3cc269f 100644 --- a/examples/go-kit/services/session/gen/transports/http/http.go +++ b/examples/go-kit/services/session/gen/transports/http/http.go @@ -17,7 +17,7 @@ func MakeLoginHandler(ctx context.Context, svc pb.SessionServiceServer, endpoint ctx, endpoint, decodeLoginRequest, - encodeLoginResponse, + encodeResponse, []httptransport.ServerOption{}..., ) } @@ -30,7 +30,7 @@ func decodeLoginRequest(ctx context.Context, r *http.Request) (interface{}, erro return &req, nil } -func encodeLoginResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { +func encodeResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { return json.NewEncoder(w).Encode(response) } diff --git a/examples/go-kit/services/sprint/gen/client/grpc/client.go b/examples/go-kit/services/sprint/gen/client/grpc/client.go new file mode 100644 index 0000000..7c5c9f5 --- /dev/null +++ b/examples/go-kit/services/sprint/gen/client/grpc/client.go @@ -0,0 +1,94 @@ +package sprint_clientgrpc + +import ( + jwt "github.com/go-kit/kit/auth/jwt" + "github.com/go-kit/kit/endpoint" + "github.com/go-kit/kit/log" + grpctransport "github.com/go-kit/kit/transport/grpc" + context "golang.org/x/net/context" + "google.golang.org/grpc" + + endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints" + pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb" +) + +func New(conn *grpc.ClientConn, logger log.Logger) pb.SprintServiceServer { + + var addsprintEndpoint endpoint.Endpoint + { + addsprintEndpoint = grpctransport.NewClient( + conn, + "sprint.SprintService", + "AddSprint", + EncodeAddSprintRequest, + DecodeAddSprintResponse, + pb.AddSprintResponse{}, + append([]grpctransport.ClientOption{}, grpctransport.ClientBefore(jwt.FromGRPCContext()))..., + ).Endpoint() + } + + var closesprintEndpoint endpoint.Endpoint + { + closesprintEndpoint = grpctransport.NewClient( + conn, + "sprint.SprintService", + "CloseSprint", + EncodeCloseSprintRequest, + DecodeCloseSprintResponse, + pb.CloseSprintResponse{}, + append([]grpctransport.ClientOption{}, grpctransport.ClientBefore(jwt.FromGRPCContext()))..., + ).Endpoint() + } + + var getsprintEndpoint endpoint.Endpoint + { + getsprintEndpoint = grpctransport.NewClient( + conn, + "sprint.SprintService", + "GetSprint", + EncodeGetSprintRequest, + DecodeGetSprintResponse, + pb.GetSprintResponse{}, + append([]grpctransport.ClientOption{}, grpctransport.ClientBefore(jwt.FromGRPCContext()))..., + ).Endpoint() + } + + return &endpoints.Endpoints{ + + AddSprintEndpoint: addsprintEndpoint, + + CloseSprintEndpoint: closesprintEndpoint, + + GetSprintEndpoint: getsprintEndpoint, + } +} + +func EncodeAddSprintRequest(_ context.Context, request interface{}) (interface{}, error) { + req := request.(*pb.AddSprintRequest) + return req, nil +} + +func DecodeAddSprintResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) { + response := grpcResponse.(*pb.AddSprintResponse) + return response, nil +} + +func EncodeCloseSprintRequest(_ context.Context, request interface{}) (interface{}, error) { + req := request.(*pb.CloseSprintRequest) + return req, nil +} + +func DecodeCloseSprintResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) { + response := grpcResponse.(*pb.CloseSprintResponse) + return response, nil +} + +func EncodeGetSprintRequest(_ context.Context, request interface{}) (interface{}, error) { + req := request.(*pb.GetSprintRequest) + return req, nil +} + +func DecodeGetSprintResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) { + response := grpcResponse.(*pb.GetSprintResponse) + return response, nil +} diff --git a/examples/go-kit/services/sprint/gen/endpoints/endpoints.go b/examples/go-kit/services/sprint/gen/endpoints/endpoints.go index f502b5c..a3a6a0c 100644 --- a/examples/go-kit/services/sprint/gen/endpoints/endpoints.go +++ b/examples/go-kit/services/sprint/gen/endpoints/endpoints.go @@ -10,6 +10,8 @@ import ( var _ = fmt.Errorf +type StreamEndpoint func(server interface{}, req interface{}) (err error) + type Endpoints struct { AddSprintEndpoint endpoint.Endpoint diff --git a/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go b/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go index 3ae8e22..f694786 100644 --- a/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go @@ -4,9 +4,10 @@ import ( "fmt" grpctransport "github.com/go-kit/kit/transport/grpc" + context "golang.org/x/net/context" + endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints" pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb" - context "golang.org/x/net/context" ) // avoid import errors @@ -19,7 +20,7 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin addsprint: grpctransport.NewServer( ctx, endpoints.AddSprintEndpoint, - decodeAddSprintRequest, + decodeRequest, encodeAddSprintResponse, options..., ), @@ -27,7 +28,7 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin closesprint: grpctransport.NewServer( ctx, endpoints.CloseSprintEndpoint, - decodeCloseSprintRequest, + decodeRequest, encodeCloseSprintResponse, options..., ), @@ -35,7 +36,7 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin getsprint: grpctransport.NewServer( ctx, endpoints.GetSprintEndpoint, - decodeGetSprintRequest, + decodeRequest, encodeGetSprintResponse, options..., ), @@ -58,10 +59,6 @@ func (s *grpcServer) AddSprint(ctx context.Context, req *pb.AddSprintRequest) (* return rep.(*pb.AddSprintResponse), nil } -func decodeAddSprintRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { - return grpcReq, nil -} - func encodeAddSprintResponse(ctx context.Context, response interface{}) (interface{}, error) { resp := response.(*pb.AddSprintResponse) return resp, nil @@ -75,10 +72,6 @@ func (s *grpcServer) CloseSprint(ctx context.Context, req *pb.CloseSprintRequest return rep.(*pb.CloseSprintResponse), nil } -func decodeCloseSprintRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { - return grpcReq, nil -} - func encodeCloseSprintResponse(ctx context.Context, response interface{}) (interface{}, error) { resp := response.(*pb.CloseSprintResponse) return resp, nil @@ -92,11 +85,26 @@ func (s *grpcServer) GetSprint(ctx context.Context, req *pb.GetSprintRequest) (* return rep.(*pb.GetSprintResponse), nil } -func decodeGetSprintRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { - return grpcReq, nil -} - func encodeGetSprintResponse(ctx context.Context, response interface{}) (interface{}, error) { resp := response.(*pb.GetSprintResponse) return resp, nil } + +func decodeRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { + return grpcReq, nil +} + +type streamHandler interface { + Do(server interface{}, req interface{}) (err error) +} + +type server struct { + e endpoints.StreamEndpoint +} + +func (s server) Do(server interface{}, req interface{}) (err error) { + if err := s.e(server, req); err != nil { + return err + } + return nil +} diff --git a/examples/go-kit/services/sprint/gen/transports/http/http.go b/examples/go-kit/services/sprint/gen/transports/http/http.go index 5d76962..2846afe 100644 --- a/examples/go-kit/services/sprint/gen/transports/http/http.go +++ b/examples/go-kit/services/sprint/gen/transports/http/http.go @@ -17,7 +17,7 @@ func MakeAddSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpo ctx, endpoint, decodeAddSprintRequest, - encodeAddSprintResponse, + encodeResponse, []httptransport.ServerOption{}..., ) } @@ -30,16 +30,12 @@ func decodeAddSprintRequest(ctx context.Context, r *http.Request) (interface{}, return &req, nil } -func encodeAddSprintResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { - return json.NewEncoder(w).Encode(response) -} - func MakeCloseSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( ctx, endpoint, decodeCloseSprintRequest, - encodeCloseSprintResponse, + encodeResponse, []httptransport.ServerOption{}..., ) } @@ -52,16 +48,12 @@ func decodeCloseSprintRequest(ctx context.Context, r *http.Request) (interface{} return &req, nil } -func encodeCloseSprintResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { - return json.NewEncoder(w).Encode(response) -} - func MakeGetSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( ctx, endpoint, decodeGetSprintRequest, - encodeGetSprintResponse, + encodeResponse, []httptransport.ServerOption{}..., ) } @@ -74,7 +66,7 @@ func decodeGetSprintRequest(ctx context.Context, r *http.Request) (interface{}, return &req, nil } -func encodeGetSprintResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { +func encodeResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { return json.NewEncoder(w).Encode(response) } diff --git a/examples/go-kit/services/user/gen/client/grpc/client.go b/examples/go-kit/services/user/gen/client/grpc/client.go new file mode 100644 index 0000000..dde77ea --- /dev/null +++ b/examples/go-kit/services/user/gen/client/grpc/client.go @@ -0,0 +1,69 @@ +package user_clientgrpc + +import ( + jwt "github.com/go-kit/kit/auth/jwt" + "github.com/go-kit/kit/endpoint" + "github.com/go-kit/kit/log" + grpctransport "github.com/go-kit/kit/transport/grpc" + context "golang.org/x/net/context" + "google.golang.org/grpc" + + endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints" + pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb" +) + +func New(conn *grpc.ClientConn, logger log.Logger) pb.UserServiceServer { + + var createuserEndpoint endpoint.Endpoint + { + createuserEndpoint = grpctransport.NewClient( + conn, + "user.UserService", + "CreateUser", + EncodeCreateUserRequest, + DecodeCreateUserResponse, + pb.CreateUserResponse{}, + append([]grpctransport.ClientOption{}, grpctransport.ClientBefore(jwt.FromGRPCContext()))..., + ).Endpoint() + } + + var getuserEndpoint endpoint.Endpoint + { + getuserEndpoint = grpctransport.NewClient( + conn, + "user.UserService", + "GetUser", + EncodeGetUserRequest, + DecodeGetUserResponse, + pb.GetUserResponse{}, + append([]grpctransport.ClientOption{}, grpctransport.ClientBefore(jwt.FromGRPCContext()))..., + ).Endpoint() + } + + return &endpoints.Endpoints{ + + CreateUserEndpoint: createuserEndpoint, + + GetUserEndpoint: getuserEndpoint, + } +} + +func EncodeCreateUserRequest(_ context.Context, request interface{}) (interface{}, error) { + req := request.(*pb.CreateUserRequest) + return req, nil +} + +func DecodeCreateUserResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) { + response := grpcResponse.(*pb.CreateUserResponse) + return response, nil +} + +func EncodeGetUserRequest(_ context.Context, request interface{}) (interface{}, error) { + req := request.(*pb.GetUserRequest) + return req, nil +} + +func DecodeGetUserResponse(_ context.Context, grpcResponse interface{}) (interface{}, error) { + response := grpcResponse.(*pb.GetUserResponse) + return response, nil +} diff --git a/examples/go-kit/services/user/gen/endpoints/endpoints.go b/examples/go-kit/services/user/gen/endpoints/endpoints.go index a07b11c..ba25326 100644 --- a/examples/go-kit/services/user/gen/endpoints/endpoints.go +++ b/examples/go-kit/services/user/gen/endpoints/endpoints.go @@ -10,6 +10,8 @@ import ( var _ = fmt.Errorf +type StreamEndpoint func(server interface{}, req interface{}) (err error) + type Endpoints struct { CreateUserEndpoint endpoint.Endpoint diff --git a/examples/go-kit/services/user/gen/transports/grpc/grpc.go b/examples/go-kit/services/user/gen/transports/grpc/grpc.go index 1daf45b..c208929 100644 --- a/examples/go-kit/services/user/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/user/gen/transports/grpc/grpc.go @@ -4,9 +4,10 @@ import ( "fmt" grpctransport "github.com/go-kit/kit/transport/grpc" + context "golang.org/x/net/context" + endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints" pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb" - context "golang.org/x/net/context" ) // avoid import errors @@ -19,7 +20,7 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserS createuser: grpctransport.NewServer( ctx, endpoints.CreateUserEndpoint, - decodeCreateUserRequest, + decodeRequest, encodeCreateUserResponse, options..., ), @@ -27,7 +28,7 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserS getuser: grpctransport.NewServer( ctx, endpoints.GetUserEndpoint, - decodeGetUserRequest, + decodeRequest, encodeGetUserResponse, options..., ), @@ -48,10 +49,6 @@ func (s *grpcServer) CreateUser(ctx context.Context, req *pb.CreateUserRequest) return rep.(*pb.CreateUserResponse), nil } -func decodeCreateUserRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { - return grpcReq, nil -} - func encodeCreateUserResponse(ctx context.Context, response interface{}) (interface{}, error) { resp := response.(*pb.CreateUserResponse) return resp, nil @@ -65,11 +62,26 @@ func (s *grpcServer) GetUser(ctx context.Context, req *pb.GetUserRequest) (*pb.G return rep.(*pb.GetUserResponse), nil } -func decodeGetUserRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { - return grpcReq, nil -} - func encodeGetUserResponse(ctx context.Context, response interface{}) (interface{}, error) { resp := response.(*pb.GetUserResponse) return resp, nil } + +func decodeRequest(ctx context.Context, grpcReq interface{}) (interface{}, error) { + return grpcReq, nil +} + +type streamHandler interface { + Do(server interface{}, req interface{}) (err error) +} + +type server struct { + e endpoints.StreamEndpoint +} + +func (s server) Do(server interface{}, req interface{}) (err error) { + if err := s.e(server, req); err != nil { + return err + } + return nil +} diff --git a/examples/go-kit/services/user/gen/transports/http/http.go b/examples/go-kit/services/user/gen/transports/http/http.go index a537c22..879bb2c 100644 --- a/examples/go-kit/services/user/gen/transports/http/http.go +++ b/examples/go-kit/services/user/gen/transports/http/http.go @@ -17,7 +17,7 @@ func MakeCreateUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoi ctx, endpoint, decodeCreateUserRequest, - encodeCreateUserResponse, + encodeResponse, []httptransport.ServerOption{}..., ) } @@ -30,16 +30,12 @@ func decodeCreateUserRequest(ctx context.Context, r *http.Request) (interface{}, return &req, nil } -func encodeCreateUserResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { - return json.NewEncoder(w).Encode(response) -} - func MakeGetUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( ctx, endpoint, decodeGetUserRequest, - encodeGetUserResponse, + encodeResponse, []httptransport.ServerOption{}..., ) } @@ -52,7 +48,7 @@ func decodeGetUserRequest(ctx context.Context, r *http.Request) (interface{}, er return &req, nil } -func encodeGetUserResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { +func encodeResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error { return json.NewEncoder(w).Encode(response) }