From 97cfa60fc8bceaafc3799901b5aa8fdbd824da9d Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Thu, 16 Mar 2017 15:41:09 +0100 Subject: [PATCH 1/2] Enable all tests (fix #25) --- Makefile | 3 ++ examples/go-kit/Makefile | 3 +- .../session/gen/client/grpc/client.go | 3 +- .../session/gen/endpoints/endpoints.go | 7 ++- examples/go-kit/services/session/gen/pb/pb.go | 24 +++++----- .../session/gen/transports/grpc/grpc.go | 8 ++-- .../session/gen/transports/http/http.go | 6 ++- .../services/sprint/gen/client/grpc/client.go | 3 +- .../sprint/gen/endpoints/endpoints.go | 11 +++-- examples/go-kit/services/sprint/gen/pb/pb.go | 44 +++++++++---------- .../sprint/gen/transports/grpc/grpc.go | 12 ++--- .../sprint/gen/transports/http/http.go | 6 ++- .../services/user/gen/client/grpc/client.go | 3 +- .../services/user/gen/endpoints/endpoints.go | 9 ++-- examples/go-kit/services/user/gen/pb/pb.go | 34 +++++++------- .../services/user/gen/transports/grpc/grpc.go | 10 +++-- .../services/user/gen/transports/http/http.go | 6 ++- .../gen/client/grpc/client.go.tmpl | 5 ++- .../gen/endpoints/endpoints.go.tmpl | 5 ++- .../gen/transports/grpc/grpc.go.tmpl | 5 ++- .../gen/transports/http/http.go.tmpl | 2 +- 21 files changed, 123 insertions(+), 86 deletions(-) diff --git a/Makefile b/Makefile index e898e34..0bd74bb 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ install: test: build cd examples/dummy && make cd examples/flow && make + cd examples/concat && make + cd examples/flow && make + cd examples/go-kit && make .PHONY: docker.build docker.build: diff --git a/examples/go-kit/Makefile b/examples/go-kit/Makefile index d130960..b39252f 100644 --- a/examples/go-kit/Makefile +++ b/examples/go-kit/Makefile @@ -9,10 +9,11 @@ service_name = $(word 2,$(subst /, ,$1)) build: server server: $(TARGETS_GO) $(TARGETS_TMPL) + go get ./... go build -o server . $(TARGETS_GO): %_go: - protoc --gogo_out=plugins=grpc:. "$*" + protoc --go_out=plugins=grpc:. "$*" @mkdir -p services/$(call service_name,$*)/gen/pb @mv ./services/$(call service_name,$*)/$(call service_name,$*).pb.go ./services/$(call service_name,$*)/gen/pb/pb.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 index cfcaa7c..9d69bb5 100644 --- a/examples/go-kit/services/session/gen/client/grpc/client.go +++ b/examples/go-kit/services/session/gen/client/grpc/client.go @@ -1,11 +1,12 @@ package session_clientgrpc import ( + context "context" + 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" diff --git a/examples/go-kit/services/session/gen/endpoints/endpoints.go b/examples/go-kit/services/session/gen/endpoints/endpoints.go index 308c767..edba02a 100644 --- a/examples/go-kit/services/session/gen/endpoints/endpoints.go +++ b/examples/go-kit/services/session/gen/endpoints/endpoints.go @@ -1,14 +1,17 @@ package session_endpoints import ( + context "context" "fmt" "github.com/go-kit/kit/endpoint" pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb" - context "golang.org/x/net/context" + oldcontext "golang.org/x/net/context" ) +var _ = endpoint.Chain var _ = fmt.Errorf +var _ = context.Background type StreamEndpoint func(server interface{}, req interface{}) (err error) @@ -16,7 +19,7 @@ type Endpoints struct { LoginEndpoint endpoint.Endpoint } -func (e *Endpoints) Login(ctx context.Context, in *pb.LoginRequest) (*pb.LoginResponse, error) { +func (e *Endpoints) Login(ctx oldcontext.Context, in *pb.LoginRequest) (*pb.LoginResponse, error) { out, err := e.LoginEndpoint(ctx, in) if err != nil { return &pb.LoginResponse{ErrMsg: err.Error()}, err diff --git a/examples/go-kit/services/session/gen/pb/pb.go b/examples/go-kit/services/session/gen/pb/pb.go index c096289..b86cb5c 100644 --- a/examples/go-kit/services/session/gen/pb/pb.go +++ b/examples/go-kit/services/session/gen/pb/pb.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-go. // source: services/session/session.proto // DO NOT EDIT! @@ -14,7 +14,7 @@ It has these top-level messages: */ package session -import proto "github.com/gogo/protobuf/proto" +import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" @@ -32,17 +32,17 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type LoginRequest struct { - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` + Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"` } func (m *LoginRequest) Reset() { *m = LoginRequest{} } func (m *LoginRequest) String() string { return proto.CompactTextString(m) } func (*LoginRequest) ProtoMessage() {} -func (*LoginRequest) Descriptor() ([]byte, []int) { return fileDescriptorSession, []int{0} } +func (*LoginRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (m *LoginRequest) GetUsername() string { if m != nil { @@ -59,14 +59,14 @@ func (m *LoginRequest) GetPassword() string { } type LoginResponse struct { - Token string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + Token string `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` } func (m *LoginResponse) Reset() { *m = LoginResponse{} } func (m *LoginResponse) String() string { return proto.CompactTextString(m) } func (*LoginResponse) ProtoMessage() {} -func (*LoginResponse) Descriptor() ([]byte, []int) { return fileDescriptorSession, []int{1} } +func (*LoginResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *LoginResponse) GetToken() string { if m != nil { @@ -159,11 +159,11 @@ var _SessionService_serviceDesc = grpc.ServiceDesc{ Metadata: "services/session/session.proto", } -func init() { proto.RegisterFile("services/session/session.proto", fileDescriptorSession) } +func init() { proto.RegisterFile("services/session/session.proto", fileDescriptor0) } -var fileDescriptorSession = []byte{ +var fileDescriptor0 = []byte{ // 188 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x2d, 0x2a, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x4e, 0x2d, 0x2e, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xec, 0x50, 0xae, 0x92, 0x1b, 0x17, 0x8f, 0x4f, 0x7e, 0x7a, 0x66, 0x5e, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x90, 0x14, 0x17, 0x47, 0x69, 0x71, 0x6a, 0x51, 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 fae68b8..70ab7dc 100644 --- a/examples/go-kit/services/session/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/session/gen/transports/grpc/grpc.go @@ -1,10 +1,11 @@ package session_grpctransport import ( + context "context" "fmt" grpctransport "github.com/go-kit/kit/transport/grpc" - context "golang.org/x/net/context" + oldcontext "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" @@ -14,7 +15,8 @@ import ( var _ = fmt.Errorf func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SessionServiceServer { - options := []grpctransport.ServerOption{} + var options []grpctransport.ServerOption + _ = options return &grpcServer{ login: grpctransport.NewServer( @@ -31,7 +33,7 @@ type grpcServer struct { login grpctransport.Handler } -func (s *grpcServer) Login(ctx context.Context, req *pb.LoginRequest) (*pb.LoginResponse, error) { +func (s *grpcServer) Login(ctx oldcontext.Context, req *pb.LoginRequest) (*pb.LoginResponse, error) { _, rep, err := s.login.ServeGRPC(ctx, req) if err != nil { return nil, err 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 3cc269f..e0ea137 100644 --- a/examples/go-kit/services/session/gen/transports/http/http.go +++ b/examples/go-kit/services/session/gen/transports/http/http.go @@ -1,8 +1,8 @@ package session_httptransport import ( + "context" "encoding/json" - context "golang.org/x/net/context" "log" "net/http" @@ -12,6 +12,10 @@ import ( pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb" ) +var _ = log.Printf +var _ = gokit_endpoint.Chain +var _ = httptransport.NewClient + func MakeLoginHandler(ctx context.Context, svc pb.SessionServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( ctx, diff --git a/examples/go-kit/services/sprint/gen/client/grpc/client.go b/examples/go-kit/services/sprint/gen/client/grpc/client.go index 7c5c9f5..a7ef1d2 100644 --- a/examples/go-kit/services/sprint/gen/client/grpc/client.go +++ b/examples/go-kit/services/sprint/gen/client/grpc/client.go @@ -1,11 +1,12 @@ package sprint_clientgrpc import ( + context "context" + 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" diff --git a/examples/go-kit/services/sprint/gen/endpoints/endpoints.go b/examples/go-kit/services/sprint/gen/endpoints/endpoints.go index a3a6a0c..47869d5 100644 --- a/examples/go-kit/services/sprint/gen/endpoints/endpoints.go +++ b/examples/go-kit/services/sprint/gen/endpoints/endpoints.go @@ -1,14 +1,17 @@ package sprint_endpoints import ( + context "context" "fmt" "github.com/go-kit/kit/endpoint" pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb" - context "golang.org/x/net/context" + oldcontext "golang.org/x/net/context" ) +var _ = endpoint.Chain var _ = fmt.Errorf +var _ = context.Background type StreamEndpoint func(server interface{}, req interface{}) (err error) @@ -20,7 +23,7 @@ type Endpoints struct { GetSprintEndpoint endpoint.Endpoint } -func (e *Endpoints) AddSprint(ctx context.Context, in *pb.AddSprintRequest) (*pb.AddSprintResponse, error) { +func (e *Endpoints) AddSprint(ctx oldcontext.Context, in *pb.AddSprintRequest) (*pb.AddSprintResponse, error) { out, err := e.AddSprintEndpoint(ctx, in) if err != nil { return &pb.AddSprintResponse{ErrMsg: err.Error()}, err @@ -28,7 +31,7 @@ func (e *Endpoints) AddSprint(ctx context.Context, in *pb.AddSprintRequest) (*pb return out.(*pb.AddSprintResponse), err } -func (e *Endpoints) CloseSprint(ctx context.Context, in *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) { +func (e *Endpoints) CloseSprint(ctx oldcontext.Context, in *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) { out, err := e.CloseSprintEndpoint(ctx, in) if err != nil { return &pb.CloseSprintResponse{ErrMsg: err.Error()}, err @@ -36,7 +39,7 @@ func (e *Endpoints) CloseSprint(ctx context.Context, in *pb.CloseSprintRequest) return out.(*pb.CloseSprintResponse), err } -func (e *Endpoints) GetSprint(ctx context.Context, in *pb.GetSprintRequest) (*pb.GetSprintResponse, error) { +func (e *Endpoints) GetSprint(ctx oldcontext.Context, in *pb.GetSprintRequest) (*pb.GetSprintResponse, error) { out, err := e.GetSprintEndpoint(ctx, in) if err != nil { return &pb.GetSprintResponse{ErrMsg: err.Error()}, err diff --git a/examples/go-kit/services/sprint/gen/pb/pb.go b/examples/go-kit/services/sprint/gen/pb/pb.go index d06ebf4..a96058e 100644 --- a/examples/go-kit/services/sprint/gen/pb/pb.go +++ b/examples/go-kit/services/sprint/gen/pb/pb.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-go. // source: services/sprint/sprint.proto // DO NOT EDIT! @@ -19,7 +19,7 @@ It has these top-level messages: */ package sprint -import proto "github.com/gogo/protobuf/proto" +import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" @@ -37,16 +37,16 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type AddSprintRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` } func (m *AddSprintRequest) Reset() { *m = AddSprintRequest{} } func (m *AddSprintRequest) String() string { return proto.CompactTextString(m) } func (*AddSprintRequest) ProtoMessage() {} -func (*AddSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{0} } +func (*AddSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (m *AddSprintRequest) GetName() string { if m != nil { @@ -57,13 +57,13 @@ func (m *AddSprintRequest) GetName() string { type AddSprintResponse struct { Sprint *Sprint `protobuf:"bytes,1,opt,name=sprint" json:"sprint,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` } func (m *AddSprintResponse) Reset() { *m = AddSprintResponse{} } func (m *AddSprintResponse) String() string { return proto.CompactTextString(m) } func (*AddSprintResponse) ProtoMessage() {} -func (*AddSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{1} } +func (*AddSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *AddSprintResponse) GetSprint() *Sprint { if m != nil { @@ -80,13 +80,13 @@ func (m *AddSprintResponse) GetErrMsg() string { } type CloseSprintRequest struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` } func (m *CloseSprintRequest) Reset() { *m = CloseSprintRequest{} } func (m *CloseSprintRequest) String() string { return proto.CompactTextString(m) } func (*CloseSprintRequest) ProtoMessage() {} -func (*CloseSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{2} } +func (*CloseSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *CloseSprintRequest) GetId() string { if m != nil { @@ -96,13 +96,13 @@ func (m *CloseSprintRequest) GetId() string { } type CloseSprintResponse struct { - ErrMsg string `protobuf:"bytes,1,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrMsg string `protobuf:"bytes,1,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` } func (m *CloseSprintResponse) Reset() { *m = CloseSprintResponse{} } func (m *CloseSprintResponse) String() string { return proto.CompactTextString(m) } func (*CloseSprintResponse) ProtoMessage() {} -func (*CloseSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{3} } +func (*CloseSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *CloseSprintResponse) GetErrMsg() string { if m != nil { @@ -112,13 +112,13 @@ func (m *CloseSprintResponse) GetErrMsg() string { } type GetSprintRequest struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` } func (m *GetSprintRequest) Reset() { *m = GetSprintRequest{} } func (m *GetSprintRequest) String() string { return proto.CompactTextString(m) } func (*GetSprintRequest) ProtoMessage() {} -func (*GetSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{4} } +func (*GetSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *GetSprintRequest) GetId() string { if m != nil { @@ -129,13 +129,13 @@ func (m *GetSprintRequest) GetId() string { type GetSprintResponse struct { Sprint *Sprint `protobuf:"bytes,1,opt,name=sprint" json:"sprint,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` } func (m *GetSprintResponse) Reset() { *m = GetSprintResponse{} } func (m *GetSprintResponse) String() string { return proto.CompactTextString(m) } func (*GetSprintResponse) ProtoMessage() {} -func (*GetSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{5} } +func (*GetSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } func (m *GetSprintResponse) GetSprint() *Sprint { if m != nil { @@ -152,15 +152,15 @@ func (m *GetSprintResponse) GetErrMsg() string { } type Sprint struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - CreatedAt uint32 `protobuf:"varint,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + CreatedAt uint32 `protobuf:"varint,2,opt,name=created_at,json=createdAt" json:"created_at,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"` } func (m *Sprint) Reset() { *m = Sprint{} } func (m *Sprint) String() string { return proto.CompactTextString(m) } func (*Sprint) ProtoMessage() {} -func (*Sprint) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{6} } +func (*Sprint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } func (m *Sprint) GetId() string { if m != nil { @@ -331,11 +331,11 @@ var _SprintService_serviceDesc = grpc.ServiceDesc{ Metadata: "services/sprint/sprint.proto", } -func init() { proto.RegisterFile("services/sprint/sprint.proto", fileDescriptorSprint) } +func init() { proto.RegisterFile("services/sprint/sprint.proto", fileDescriptor0) } -var fileDescriptorSprint = []byte{ +var fileDescriptor0 = []byte{ // 290 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x52, 0x4d, 0x4b, 0xc3, 0x40, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x4d, 0x4b, 0xc3, 0x40, 0x10, 0x6d, 0xaa, 0x44, 0x32, 0xa5, 0xa5, 0x1d, 0x0f, 0xc6, 0xa8, 0x20, 0x8b, 0x14, 0x4f, 0x11, 0xea, 0x2f, 0x68, 0x3d, 0x28, 0x88, 0x97, 0xb4, 0xf7, 0x12, 0xbb, 0x43, 0x09, 0xd8, 0x24, 0xee, 0xac, 0xfe, 0x5f, 0xff, 0x89, 0xb0, 0xbb, 0xcd, 0x57, 0x8b, 0x27, 0x4f, 0xc9, 0xec, 0xbc, 0x7d, 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 f694786..3247a88 100644 --- a/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go @@ -1,10 +1,11 @@ package sprint_grpctransport import ( + context "context" "fmt" grpctransport "github.com/go-kit/kit/transport/grpc" - context "golang.org/x/net/context" + oldcontext "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" @@ -14,7 +15,8 @@ import ( var _ = fmt.Errorf func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SprintServiceServer { - options := []grpctransport.ServerOption{} + var options []grpctransport.ServerOption + _ = options return &grpcServer{ addsprint: grpctransport.NewServer( @@ -51,7 +53,7 @@ type grpcServer struct { getsprint grpctransport.Handler } -func (s *grpcServer) AddSprint(ctx context.Context, req *pb.AddSprintRequest) (*pb.AddSprintResponse, error) { +func (s *grpcServer) AddSprint(ctx oldcontext.Context, req *pb.AddSprintRequest) (*pb.AddSprintResponse, error) { _, rep, err := s.addsprint.ServeGRPC(ctx, req) if err != nil { return nil, err @@ -64,7 +66,7 @@ func encodeAddSprintResponse(ctx context.Context, response interface{}) (interfa return resp, nil } -func (s *grpcServer) CloseSprint(ctx context.Context, req *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) { +func (s *grpcServer) CloseSprint(ctx oldcontext.Context, req *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) { _, rep, err := s.closesprint.ServeGRPC(ctx, req) if err != nil { return nil, err @@ -77,7 +79,7 @@ func encodeCloseSprintResponse(ctx context.Context, response interface{}) (inter return resp, nil } -func (s *grpcServer) GetSprint(ctx context.Context, req *pb.GetSprintRequest) (*pb.GetSprintResponse, error) { +func (s *grpcServer) GetSprint(ctx oldcontext.Context, req *pb.GetSprintRequest) (*pb.GetSprintResponse, error) { _, rep, err := s.getsprint.ServeGRPC(ctx, req) if err != nil { return nil, err 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 2846afe..1ad3597 100644 --- a/examples/go-kit/services/sprint/gen/transports/http/http.go +++ b/examples/go-kit/services/sprint/gen/transports/http/http.go @@ -1,8 +1,8 @@ package sprint_httptransport import ( + "context" "encoding/json" - context "golang.org/x/net/context" "log" "net/http" @@ -12,6 +12,10 @@ import ( pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb" ) +var _ = log.Printf +var _ = gokit_endpoint.Chain +var _ = httptransport.NewClient + func MakeAddSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( ctx, diff --git a/examples/go-kit/services/user/gen/client/grpc/client.go b/examples/go-kit/services/user/gen/client/grpc/client.go index dde77ea..105f036 100644 --- a/examples/go-kit/services/user/gen/client/grpc/client.go +++ b/examples/go-kit/services/user/gen/client/grpc/client.go @@ -1,11 +1,12 @@ package user_clientgrpc import ( + context "context" + 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" diff --git a/examples/go-kit/services/user/gen/endpoints/endpoints.go b/examples/go-kit/services/user/gen/endpoints/endpoints.go index ba25326..bb13e4a 100644 --- a/examples/go-kit/services/user/gen/endpoints/endpoints.go +++ b/examples/go-kit/services/user/gen/endpoints/endpoints.go @@ -1,14 +1,17 @@ package user_endpoints import ( + context "context" "fmt" "github.com/go-kit/kit/endpoint" pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb" - context "golang.org/x/net/context" + oldcontext "golang.org/x/net/context" ) +var _ = endpoint.Chain var _ = fmt.Errorf +var _ = context.Background type StreamEndpoint func(server interface{}, req interface{}) (err error) @@ -18,7 +21,7 @@ type Endpoints struct { GetUserEndpoint endpoint.Endpoint } -func (e *Endpoints) CreateUser(ctx context.Context, in *pb.CreateUserRequest) (*pb.CreateUserResponse, error) { +func (e *Endpoints) CreateUser(ctx oldcontext.Context, in *pb.CreateUserRequest) (*pb.CreateUserResponse, error) { out, err := e.CreateUserEndpoint(ctx, in) if err != nil { return &pb.CreateUserResponse{ErrMsg: err.Error()}, err @@ -26,7 +29,7 @@ func (e *Endpoints) CreateUser(ctx context.Context, in *pb.CreateUserRequest) (* return out.(*pb.CreateUserResponse), err } -func (e *Endpoints) GetUser(ctx context.Context, in *pb.GetUserRequest) (*pb.GetUserResponse, error) { +func (e *Endpoints) GetUser(ctx oldcontext.Context, in *pb.GetUserRequest) (*pb.GetUserResponse, error) { out, err := e.GetUserEndpoint(ctx, in) if err != nil { return &pb.GetUserResponse{ErrMsg: err.Error()}, err diff --git a/examples/go-kit/services/user/gen/pb/pb.go b/examples/go-kit/services/user/gen/pb/pb.go index dfb145a..e1f2850 100644 --- a/examples/go-kit/services/user/gen/pb/pb.go +++ b/examples/go-kit/services/user/gen/pb/pb.go @@ -1,4 +1,4 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-go. // source: services/user/user.proto // DO NOT EDIT! @@ -17,7 +17,7 @@ It has these top-level messages: */ package user -import proto "github.com/gogo/protobuf/proto" +import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" @@ -35,16 +35,16 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type CreateUserRequest struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` } func (m *CreateUserRequest) Reset() { *m = CreateUserRequest{} } func (m *CreateUserRequest) String() string { return proto.CompactTextString(m) } func (*CreateUserRequest) ProtoMessage() {} -func (*CreateUserRequest) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{0} } +func (*CreateUserRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (m *CreateUserRequest) GetName() string { if m != nil { @@ -55,13 +55,13 @@ func (m *CreateUserRequest) GetName() string { type CreateUserResponse struct { User *User `protobuf:"bytes,1,opt,name=user" json:"user,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` } func (m *CreateUserResponse) Reset() { *m = CreateUserResponse{} } func (m *CreateUserResponse) String() string { return proto.CompactTextString(m) } func (*CreateUserResponse) ProtoMessage() {} -func (*CreateUserResponse) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{1} } +func (*CreateUserResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *CreateUserResponse) GetUser() *User { if m != nil { @@ -78,13 +78,13 @@ func (m *CreateUserResponse) GetErrMsg() string { } type GetUserRequest struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` } func (m *GetUserRequest) Reset() { *m = GetUserRequest{} } func (m *GetUserRequest) String() string { return proto.CompactTextString(m) } func (*GetUserRequest) ProtoMessage() {} -func (*GetUserRequest) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{2} } +func (*GetUserRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *GetUserRequest) GetId() string { if m != nil { @@ -95,13 +95,13 @@ func (m *GetUserRequest) GetId() string { type GetUserResponse struct { User *User `protobuf:"bytes,1,opt,name=user" json:"user,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` } func (m *GetUserResponse) Reset() { *m = GetUserResponse{} } func (m *GetUserResponse) String() string { return proto.CompactTextString(m) } func (*GetUserResponse) ProtoMessage() {} -func (*GetUserResponse) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{3} } +func (*GetUserResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *GetUserResponse) GetUser() *User { if m != nil { @@ -118,14 +118,14 @@ func (m *GetUserResponse) GetErrMsg() string { } type User struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` } func (m *User) Reset() { *m = User{} } func (m *User) String() string { return proto.CompactTextString(m) } func (*User) ProtoMessage() {} -func (*User) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{4} } +func (*User) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *User) GetId() string { if m != nil { @@ -254,11 +254,11 @@ var _UserService_serviceDesc = grpc.ServiceDesc{ Metadata: "services/user/user.proto", } -func init() { proto.RegisterFile("services/user/user.proto", fileDescriptorUser) } +func init() { proto.RegisterFile("services/user/user.proto", fileDescriptor0) } -var fileDescriptorUser = []byte{ +var fileDescriptor0 = []byte{ // 236 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4e, 0x2d, 0x2a, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x2d, 0x4e, 0x2d, 0x02, 0x13, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x2c, 0x20, 0xb6, 0x92, 0x3a, 0x97, 0xa0, 0x73, 0x51, 0x6a, 0x62, 0x49, 0x6a, 0x68, 0x71, 0x6a, 0x51, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x90, 0x10, 0x17, 0x4b, 0x5e, 0x62, 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 c208929..f41fb29 100644 --- a/examples/go-kit/services/user/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/user/gen/transports/grpc/grpc.go @@ -1,10 +1,11 @@ package user_grpctransport import ( + context "context" "fmt" grpctransport "github.com/go-kit/kit/transport/grpc" - context "golang.org/x/net/context" + oldcontext "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" @@ -14,7 +15,8 @@ import ( var _ = fmt.Errorf func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserServiceServer { - options := []grpctransport.ServerOption{} + var options []grpctransport.ServerOption + _ = options return &grpcServer{ createuser: grpctransport.NewServer( @@ -41,7 +43,7 @@ type grpcServer struct { getuser grpctransport.Handler } -func (s *grpcServer) CreateUser(ctx context.Context, req *pb.CreateUserRequest) (*pb.CreateUserResponse, error) { +func (s *grpcServer) CreateUser(ctx oldcontext.Context, req *pb.CreateUserRequest) (*pb.CreateUserResponse, error) { _, rep, err := s.createuser.ServeGRPC(ctx, req) if err != nil { return nil, err @@ -54,7 +56,7 @@ func encodeCreateUserResponse(ctx context.Context, response interface{}) (interf return resp, nil } -func (s *grpcServer) GetUser(ctx context.Context, req *pb.GetUserRequest) (*pb.GetUserResponse, error) { +func (s *grpcServer) GetUser(ctx oldcontext.Context, req *pb.GetUserRequest) (*pb.GetUserResponse, error) { _, rep, err := s.getuser.ServeGRPC(ctx, req) if err != nil { return nil, err 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 879bb2c..1a1f344 100644 --- a/examples/go-kit/services/user/gen/transports/http/http.go +++ b/examples/go-kit/services/user/gen/transports/http/http.go @@ -1,8 +1,8 @@ package user_httptransport import ( + "context" "encoding/json" - context "golang.org/x/net/context" "log" "net/http" @@ -12,6 +12,10 @@ import ( pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb" ) +var _ = log.Printf +var _ = gokit_endpoint.Chain +var _ = httptransport.NewClient + func MakeCreateUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( ctx, diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/client/grpc/client.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/client/grpc/client.go.tmpl index e3813c9..6300d2e 100644 --- a/examples/go-kit/templates/{{.File.Package}}/gen/client/grpc/client.go.tmpl +++ b/examples/go-kit/templates/{{.File.Package}}/gen/client/grpc/client.go.tmpl @@ -1,8 +1,9 @@ package {{.File.Package}}_clientgrpc import ( - "github.com/go-kit/kit/log" - context "golang.org/x/net/context" + context "context" + + "github.com/go-kit/kit/log" "google.golang.org/grpc" grpctransport "github.com/go-kit/kit/transport/grpc" "github.com/go-kit/kit/endpoint" diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl index 06d6207..0cc4e17 100644 --- a/examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl +++ b/examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl @@ -3,9 +3,10 @@ package {{.File.Package}}_endpoints {{$file := .File}} import ( + context "context" "fmt" - context "golang.org/x/net/context" + oldcontext "golang.org/x/net/context" pb "{{cat .GoPWD "/" .DestinationDir | nospace | clean}}/pb" "github.com/go-kit/kit/endpoint" ) @@ -43,7 +44,7 @@ type Endpoints struct { return fmt.Errorf("not implemented") } {{else}} - func (e *Endpoints){{.Name}}(ctx context.Context, in *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) { + func (e *Endpoints){{.Name}}(ctx oldcontext.Context, in *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) { out, err := e.{{.Name}}Endpoint(ctx, in) if err != nil { return &pb.{{.OutputType | splitArray "." | last}}{ErrMsg: err.Error()}, err diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl index 2883cc0..0ddfe27 100644 --- a/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl +++ b/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl @@ -3,9 +3,10 @@ package {{.File.Package}}_grpctransport {{$file := .File}} import ( + context "context" "fmt" - context "golang.org/x/net/context" + oldcontext "golang.org/x/net/context" grpctransport "github.com/go-kit/kit/transport/grpc" pb "{{cat .GoPWD "/" .DestinationDir | nospace | clean}}/pb" @@ -57,7 +58,7 @@ type grpcServer struct { return s.{{.Name | lower}}.Do(server, req) } {{else}} - func (s *grpcServer) {{.Name}}(ctx context.Context, req *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) { + func (s *grpcServer) {{.Name}}(ctx oldcontext.Context, req *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) { _, rep, err := s.{{.Name | lower}}.ServeGRPC(ctx, req) if err != nil { return nil, err diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl index 0759a19..40d04c0 100644 --- a/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl +++ b/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl @@ -6,7 +6,7 @@ import ( "log" "net/http" "encoding/json" - context "golang.org/x/net/context" + "context" pb "{{cat .GoPWD "/" .DestinationDir | nospace | clean}}/pb" gokit_endpoint "github.com/go-kit/kit/endpoint" From 9da682760bd60a69f36b9cc8fb4e9a61b08e84d6 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Thu, 16 Mar 2017 16:16:45 +0100 Subject: [PATCH 2/2] Fix Go-Kit test (#25) --- .travis.yml | 3 +- examples/go-kit/.gitignore | 1 + examples/go-kit/Makefile | 2 +- examples/go-kit/glide.lock | 48 +++++++++++++++++++ examples/go-kit/glide.yaml | 20 ++++++++ examples/go-kit/main.go | 22 ++++----- .../session/gen/transports/grpc/grpc.go | 3 +- .../session/gen/transports/http/http.go | 7 ++- .../sprint/gen/transports/grpc/grpc.go | 5 +- .../sprint/gen/transports/http/http.go | 17 +++---- .../services/user/gen/transports/grpc/grpc.go | 4 +- .../services/user/gen/transports/http/http.go | 12 ++--- .../gen/transports/grpc/grpc.go.tmpl | 3 +- .../gen/transports/http/http.go.tmpl | 7 ++- 14 files changed, 104 insertions(+), 50 deletions(-) create mode 100644 examples/go-kit/glide.lock create mode 100644 examples/go-kit/glide.yaml diff --git a/.travis.yml b/.travis.yml index 4a93fed..7381ecb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: go go: 1.7.x install: +- mkdir -p $GOPATH/bin && curl https://glide.sh/get | sh - wget https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/.travis/install-protoc.sh && chmod +x install-protoc.sh && ./install-protoc.sh 3.1.0 -- go get github.com/gogo/protobuf/protoc-gen-gogo +- go get -u github.com/golang/protobuf/protoc-gen-go script: - make install - make test diff --git a/examples/go-kit/.gitignore b/examples/go-kit/.gitignore index 06845b1..dc01103 100644 --- a/examples/go-kit/.gitignore +++ b/examples/go-kit/.gitignore @@ -1 +1,2 @@ +/vendor/ /server diff --git a/examples/go-kit/Makefile b/examples/go-kit/Makefile index b39252f..409f4f4 100644 --- a/examples/go-kit/Makefile +++ b/examples/go-kit/Makefile @@ -9,7 +9,7 @@ service_name = $(word 2,$(subst /, ,$1)) build: server server: $(TARGETS_GO) $(TARGETS_TMPL) - go get ./... + glide install go build -o server . $(TARGETS_GO): %_go: diff --git a/examples/go-kit/glide.lock b/examples/go-kit/glide.lock new file mode 100644 index 0000000..9b26bce --- /dev/null +++ b/examples/go-kit/glide.lock @@ -0,0 +1,48 @@ +hash: e225ab17b49f8d6601b2bd813d43ad34ee04380d29c278c11919efd454c7b2d7 +updated: 2017-03-16T17:03:34.437968115+01:00 +imports: +- name: github.com/dgrijalva/jwt-go + version: 2268707a8f0843315e2004ee4f1d021dc08baedf +- name: github.com/go-kit/kit + version: fadad6fffe0466b19df9efd9acde5c9a52df5fa4 + subpackages: + - auth/jwt + - endpoint + - log + - transport/grpc + - transport/http +- name: github.com/go-logfmt/logfmt + version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 +- name: github.com/go-stack/stack + version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 +- name: github.com/golang/protobuf + version: c9c7427a2a70d2eb3bafa0ab2dc163e45f143317 + subpackages: + - proto +- name: github.com/gorilla/handlers + version: 3a5767ca75ece5f7f1440b1d16975247f8d8b221 +- name: github.com/kr/logfmt + version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 +- name: golang.org/x/net + version: a6577fac2d73be281a500b310739095313165611 + subpackages: + - context + - context/ctxhttp + - http2 + - http2/hpack + - idna + - internal/timeseries + - lex/httplex + - trace +- name: google.golang.org/grpc + version: 777daa17ff9b5daef1cfdf915088a2ada3332bf0 + subpackages: + - codes + - credentials + - grpclog + - internal + - metadata + - naming + - peer + - transport +testImports: [] diff --git a/examples/go-kit/glide.yaml b/examples/go-kit/glide.yaml new file mode 100644 index 0000000..807973a --- /dev/null +++ b/examples/go-kit/glide.yaml @@ -0,0 +1,20 @@ +package: github.com/moul/protoc-gen-gotemplate/examples/go-kit +import: +- package: github.com/go-kit/kit + subpackages: + - auth/jwt + - endpoint + - log + - transport/grpc + - transport/http +- package: github.com/golang/protobuf + subpackages: + - proto + version: c9c7427a2a70d2eb3bafa0ab2dc163e45f143317 +- package: github.com/gorilla/handlers +- package: golang.org/x/net + subpackages: + - context + - http2 + version: a6577fac2d73be281a500b310739095313165611 +- package: google.golang.org/grpc diff --git a/examples/go-kit/main.go b/examples/go-kit/main.go index 32c03a6..e544e3c 100644 --- a/examples/go-kit/main.go +++ b/examples/go-kit/main.go @@ -1,7 +1,6 @@ package main import ( - "context" "fmt" "net" "net/http" @@ -34,37 +33,36 @@ import ( func main() { mux := http.NewServeMux() - ctx := context.Background() errc := make(chan error) s := grpc.NewServer() var logger log.Logger { logger = log.NewLogfmtLogger(os.Stdout) - logger = log.NewContext(logger).With("ts", log.DefaultTimestampUTC) - logger = log.NewContext(logger).With("caller", log.DefaultCaller) + logger = log.With(logger, "ts", log.DefaultTimestampUTC) + logger = log.With(logger, "caller", log.DefaultCaller) } // initialize services { svc := session_svc.New() endpoints := session_endpoints.MakeEndpoints(svc) - srv := session_grpctransport.MakeGRPCServer(ctx, endpoints) + srv := session_grpctransport.MakeGRPCServer(endpoints) session_pb.RegisterSessionServiceServer(s, srv) - session_httptransport.RegisterHandlers(ctx, svc, mux, endpoints) + session_httptransport.RegisterHandlers(svc, mux, endpoints) } { svc := sprint_svc.New() endpoints := sprint_endpoints.MakeEndpoints(svc) - srv := sprint_grpctransport.MakeGRPCServer(ctx, endpoints) + srv := sprint_grpctransport.MakeGRPCServer(endpoints) sprint_pb.RegisterSprintServiceServer(s, srv) - sprint_httptransport.RegisterHandlers(ctx, svc, mux, endpoints) + sprint_httptransport.RegisterHandlers(svc, mux, endpoints) } { svc := user_svc.New() endpoints := user_endpoints.MakeEndpoints(svc) - srv := user_grpctransport.MakeGRPCServer(ctx, endpoints) + srv := user_grpctransport.MakeGRPCServer(endpoints) user_pb.RegisterUserServiceServer(s, srv) - user_httptransport.RegisterHandlers(ctx, svc, mux, endpoints) + user_httptransport.RegisterHandlers(svc, mux, endpoints) } // start servers @@ -75,13 +73,13 @@ func main() { }() go func() { - logger := log.NewContext(logger).With("transport", "HTTP") + logger := log.With(logger, "transport", "HTTP") logger.Log("addr", ":8000") errc <- http.ListenAndServe(":8000", handlers.LoggingHandler(os.Stderr, mux)) }() go func() { - logger := log.NewContext(logger).With("transport", "gRPC") + logger := log.With(logger, "transport", "gRPC") ln, err := net.Listen("tcp", ":9000") if err != nil { errc <- err 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 70ab7dc..eccbb3d 100644 --- a/examples/go-kit/services/session/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/session/gen/transports/grpc/grpc.go @@ -14,13 +14,12 @@ import ( // avoid import errors var _ = fmt.Errorf -func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SessionServiceServer { +func MakeGRPCServer(endpoints endpoints.Endpoints) pb.SessionServiceServer { var options []grpctransport.ServerOption _ = options return &grpcServer{ login: grpctransport.NewServer( - ctx, endpoints.LoginEndpoint, decodeRequest, encodeLoginResponse, 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 e0ea137..b608681 100644 --- a/examples/go-kit/services/session/gen/transports/http/http.go +++ b/examples/go-kit/services/session/gen/transports/http/http.go @@ -16,9 +16,8 @@ var _ = log.Printf var _ = gokit_endpoint.Chain var _ = httptransport.NewClient -func MakeLoginHandler(ctx context.Context, svc pb.SessionServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { +func MakeLoginHandler(svc pb.SessionServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decodeLoginRequest, encodeResponse, @@ -38,10 +37,10 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa return json.NewEncoder(w).Encode(response) } -func RegisterHandlers(ctx context.Context, svc pb.SessionServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { +func RegisterHandlers(svc pb.SessionServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { log.Println("new HTTP endpoint: \"/Login\" (service=Session)") - mux.Handle("/Login", MakeLoginHandler(ctx, svc, endpoints.LoginEndpoint)) + mux.Handle("/Login", MakeLoginHandler(svc, endpoints.LoginEndpoint)) return nil } 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 3247a88..5fd10c8 100644 --- a/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/sprint/gen/transports/grpc/grpc.go @@ -14,13 +14,12 @@ import ( // avoid import errors var _ = fmt.Errorf -func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SprintServiceServer { +func MakeGRPCServer(endpoints endpoints.Endpoints) pb.SprintServiceServer { var options []grpctransport.ServerOption _ = options return &grpcServer{ addsprint: grpctransport.NewServer( - ctx, endpoints.AddSprintEndpoint, decodeRequest, encodeAddSprintResponse, @@ -28,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin ), closesprint: grpctransport.NewServer( - ctx, endpoints.CloseSprintEndpoint, decodeRequest, encodeCloseSprintResponse, @@ -36,7 +34,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin ), getsprint: grpctransport.NewServer( - ctx, endpoints.GetSprintEndpoint, decodeRequest, encodeGetSprintResponse, 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 1ad3597..b6df66a 100644 --- a/examples/go-kit/services/sprint/gen/transports/http/http.go +++ b/examples/go-kit/services/sprint/gen/transports/http/http.go @@ -16,9 +16,8 @@ var _ = log.Printf var _ = gokit_endpoint.Chain var _ = httptransport.NewClient -func MakeAddSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { +func MakeAddSprintHandler(svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decodeAddSprintRequest, encodeResponse, @@ -34,9 +33,8 @@ func decodeAddSprintRequest(ctx context.Context, r *http.Request) (interface{}, return &req, nil } -func MakeCloseSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { +func MakeCloseSprintHandler(svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decodeCloseSprintRequest, encodeResponse, @@ -52,9 +50,8 @@ func decodeCloseSprintRequest(ctx context.Context, r *http.Request) (interface{} return &req, nil } -func MakeGetSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { +func MakeGetSprintHandler(svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decodeGetSprintRequest, encodeResponse, @@ -74,16 +71,16 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa return json.NewEncoder(w).Encode(response) } -func RegisterHandlers(ctx context.Context, svc pb.SprintServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { +func RegisterHandlers(svc pb.SprintServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { log.Println("new HTTP endpoint: \"/AddSprint\" (service=Sprint)") - mux.Handle("/AddSprint", MakeAddSprintHandler(ctx, svc, endpoints.AddSprintEndpoint)) + mux.Handle("/AddSprint", MakeAddSprintHandler(svc, endpoints.AddSprintEndpoint)) log.Println("new HTTP endpoint: \"/CloseSprint\" (service=Sprint)") - mux.Handle("/CloseSprint", MakeCloseSprintHandler(ctx, svc, endpoints.CloseSprintEndpoint)) + mux.Handle("/CloseSprint", MakeCloseSprintHandler(svc, endpoints.CloseSprintEndpoint)) log.Println("new HTTP endpoint: \"/GetSprint\" (service=Sprint)") - mux.Handle("/GetSprint", MakeGetSprintHandler(ctx, svc, endpoints.GetSprintEndpoint)) + mux.Handle("/GetSprint", MakeGetSprintHandler(svc, endpoints.GetSprintEndpoint)) return nil } 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 f41fb29..636107f 100644 --- a/examples/go-kit/services/user/gen/transports/grpc/grpc.go +++ b/examples/go-kit/services/user/gen/transports/grpc/grpc.go @@ -14,13 +14,12 @@ import ( // avoid import errors var _ = fmt.Errorf -func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserServiceServer { +func MakeGRPCServer(endpoints endpoints.Endpoints) pb.UserServiceServer { var options []grpctransport.ServerOption _ = options return &grpcServer{ createuser: grpctransport.NewServer( - ctx, endpoints.CreateUserEndpoint, decodeRequest, encodeCreateUserResponse, @@ -28,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserS ), getuser: grpctransport.NewServer( - ctx, endpoints.GetUserEndpoint, decodeRequest, encodeGetUserResponse, 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 1a1f344..409ab6f 100644 --- a/examples/go-kit/services/user/gen/transports/http/http.go +++ b/examples/go-kit/services/user/gen/transports/http/http.go @@ -16,9 +16,8 @@ var _ = log.Printf var _ = gokit_endpoint.Chain var _ = httptransport.NewClient -func MakeCreateUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { +func MakeCreateUserHandler(svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decodeCreateUserRequest, encodeResponse, @@ -34,9 +33,8 @@ func decodeCreateUserRequest(ctx context.Context, r *http.Request) (interface{}, return &req, nil } -func MakeGetUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { +func MakeGetUserHandler(svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decodeGetUserRequest, encodeResponse, @@ -56,13 +54,13 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa return json.NewEncoder(w).Encode(response) } -func RegisterHandlers(ctx context.Context, svc pb.UserServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { +func RegisterHandlers(svc pb.UserServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { log.Println("new HTTP endpoint: \"/CreateUser\" (service=User)") - mux.Handle("/CreateUser", MakeCreateUserHandler(ctx, svc, endpoints.CreateUserEndpoint)) + mux.Handle("/CreateUser", MakeCreateUserHandler(svc, endpoints.CreateUserEndpoint)) log.Println("new HTTP endpoint: \"/GetUser\" (service=User)") - mux.Handle("/GetUser", MakeGetUserHandler(ctx, svc, endpoints.GetUserEndpoint)) + mux.Handle("/GetUser", MakeGetUserHandler(svc, endpoints.GetUserEndpoint)) return nil } diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl index 0ddfe27..a10ee70 100644 --- a/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl +++ b/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl @@ -16,7 +16,7 @@ import ( // avoid import errors var _ = fmt.Errorf -func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.{{.File.Package | title}}ServiceServer { +func MakeGRPCServer(endpoints endpoints.Endpoints) pb.{{.File.Package | title}}ServiceServer { var options []grpctransport.ServerOption _ = options return &grpcServer{ @@ -27,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.{{.Fi }, {{else}} {{.Name | lower}}: grpctransport.NewServer( - ctx, endpoints.{{.Name}}Endpoint, decodeRequest, encode{{.Name}}Response, diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl index 40d04c0..a5b577d 100644 --- a/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl +++ b/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl @@ -21,9 +21,8 @@ var _ = httptransport.NewClient {{range .Service.Method}} {{if and (not .ServerStreaming) (not .ClientStreaming)}} - func Make{{.Name}}Handler(ctx context.Context, svc pb.{{$file.Package | title}}ServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { + func Make{{.Name}}Handler(svc pb.{{$file.Package | title}}ServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server { return httptransport.NewServer( - ctx, endpoint, decode{{.Name}}Request, encodeResponse, @@ -45,11 +44,11 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa return json.NewEncoder(w).Encode(response) } -func RegisterHandlers(ctx context.Context, svc pb.{{$file.Package | title}}ServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { +func RegisterHandlers(svc pb.{{$file.Package | title}}ServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error { {{range .Service.Method}} {{if and (not .ServerStreaming) (not .ClientStreaming)}} log.Println("new HTTP endpoint: \"/{{.Name}}\" (service={{$file.Package | title}})") - mux.Handle("/{{.Name}}", Make{{.Name}}Handler(ctx, svc, endpoints.{{.Name}}Endpoint)) + mux.Handle("/{{.Name}}", Make{{.Name}}Handler(svc, endpoints.{{.Name}}Endpoint)) {{end}} {{end}} return nil