unistack-org/protoc-gen-go-micro
4
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 65 Wiki Activity

Fix Go-Kit test (#25)

Browse Source
This commit is contained in:
Manfred Touron
2017-03-16 16:16:45 +01:00
parent 97cfa60fc8
commit 9da682760b
14 changed files with 104 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -1,8 +1,9 @@
language: go language: go
go: 1.7.x go: 1.7.x
install: 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 - 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: script:
- make install - make install
- make test - make test

1
examples/go-kit/.gitignore vendored
View File

@@ -1 +1,2 @@
/vendor/
/server /server

2
examples/go-kit/Makefile
View File

@@ -9,7 +9,7 @@ service_name = $(word 2,$(subst /, ,$1))
build: server build: server
server: $(TARGETS_GO) $(TARGETS_TMPL) server: $(TARGETS_GO) $(TARGETS_TMPL)
go get ./... glide install
go build -o server . go build -o server .
$(TARGETS_GO): %_go: $(TARGETS_GO): %_go:

48
examples/go-kit/glide.lock generated Normal file
View File

@@ -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: []

20
examples/go-kit/glide.yaml Normal file
View File

@@ -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

22
examples/go-kit/main.go
View File

@@ -1,7 +1,6 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"net" "net"
"net/http" "net/http"
@@ -34,37 +33,36 @@ import (
func main() { func main() {
mux := http.NewServeMux() mux := http.NewServeMux()
ctx := context.Background()
errc := make(chan error) errc := make(chan error)
s := grpc.NewServer() s := grpc.NewServer()
var logger log.Logger var logger log.Logger
{ {
logger = log.NewLogfmtLogger(os.Stdout) logger = log.NewLogfmtLogger(os.Stdout)
logger = log.NewContext(logger).With("ts", log.DefaultTimestampUTC) logger = log.With(logger, "ts", log.DefaultTimestampUTC)
logger = log.NewContext(logger).With("caller", log.DefaultCaller) logger = log.With(logger, "caller", log.DefaultCaller)
} }
// initialize services // initialize services
{ {
svc := session_svc.New() svc := session_svc.New()
endpoints := session_endpoints.MakeEndpoints(svc) endpoints := session_endpoints.MakeEndpoints(svc)
srv := session_grpctransport.MakeGRPCServer(ctx, endpoints) srv := session_grpctransport.MakeGRPCServer(endpoints)
session_pb.RegisterSessionServiceServer(s, srv) session_pb.RegisterSessionServiceServer(s, srv)
session_httptransport.RegisterHandlers(ctx, svc, mux, endpoints) session_httptransport.RegisterHandlers(svc, mux, endpoints)
} }
{ {
svc := sprint_svc.New() svc := sprint_svc.New()
endpoints := sprint_endpoints.MakeEndpoints(svc) endpoints := sprint_endpoints.MakeEndpoints(svc)
srv := sprint_grpctransport.MakeGRPCServer(ctx, endpoints) srv := sprint_grpctransport.MakeGRPCServer(endpoints)
sprint_pb.RegisterSprintServiceServer(s, srv) sprint_pb.RegisterSprintServiceServer(s, srv)
sprint_httptransport.RegisterHandlers(ctx, svc, mux, endpoints) sprint_httptransport.RegisterHandlers(svc, mux, endpoints)
} }
{ {
svc := user_svc.New() svc := user_svc.New()
endpoints := user_endpoints.MakeEndpoints(svc) endpoints := user_endpoints.MakeEndpoints(svc)
srv := user_grpctransport.MakeGRPCServer(ctx, endpoints) srv := user_grpctransport.MakeGRPCServer(endpoints)
user_pb.RegisterUserServiceServer(s, srv) user_pb.RegisterUserServiceServer(s, srv)
user_httptransport.RegisterHandlers(ctx, svc, mux, endpoints) user_httptransport.RegisterHandlers(svc, mux, endpoints)
} }
// start servers // start servers
@@ -75,13 +73,13 @@ func main() {
}() }()
go func() { go func() {
logger := log.NewContext(logger).With("transport", "HTTP") logger := log.With(logger, "transport", "HTTP")
logger.Log("addr", ":8000") logger.Log("addr", ":8000")
errc <- http.ListenAndServe(":8000", handlers.LoggingHandler(os.Stderr, mux)) errc <- http.ListenAndServe(":8000", handlers.LoggingHandler(os.Stderr, mux))
}() }()
go func() { go func() {
logger := log.NewContext(logger).With("transport", "gRPC") logger := log.With(logger, "transport", "gRPC")
ln, err := net.Listen("tcp", ":9000") ln, err := net.Listen("tcp", ":9000")
if err != nil { if err != nil {
errc <- err errc <- err

3
examples/go-kit/services/session/gen/transports/grpc/grpc.go
View File

@@ -14,13 +14,12 @@ import (
// avoid import errors // avoid import errors
var _ = fmt.Errorf var _ = fmt.Errorf
func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SessionServiceServer { func MakeGRPCServer(endpoints endpoints.Endpoints) pb.SessionServiceServer {
var options []grpctransport.ServerOption var options []grpctransport.ServerOption
_ = options _ = options
return &grpcServer{ return &grpcServer{
login: grpctransport.NewServer( login: grpctransport.NewServer(
ctx,
endpoints.LoginEndpoint, endpoints.LoginEndpoint,
decodeRequest, decodeRequest,
encodeLoginResponse, encodeLoginResponse,

7
examples/go-kit/services/session/gen/transports/http/http.go
View File

@@ -16,9 +16,8 @@ var _ = log.Printf
var _ = gokit_endpoint.Chain var _ = gokit_endpoint.Chain
var _ = httptransport.NewClient 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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decodeLoginRequest, decodeLoginRequest,
encodeResponse, encodeResponse,
@@ -38,10 +37,10 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
return json.NewEncoder(w).Encode(response) 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)") 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 return nil
} }

5
examples/go-kit/services/sprint/gen/transports/grpc/grpc.go
View File

@@ -14,13 +14,12 @@ import (
// avoid import errors // avoid import errors
var _ = fmt.Errorf var _ = fmt.Errorf
func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SprintServiceServer { func MakeGRPCServer(endpoints endpoints.Endpoints) pb.SprintServiceServer {
var options []grpctransport.ServerOption var options []grpctransport.ServerOption
_ = options _ = options
return &grpcServer{ return &grpcServer{
addsprint: grpctransport.NewServer( addsprint: grpctransport.NewServer(
ctx,
endpoints.AddSprintEndpoint, endpoints.AddSprintEndpoint,
decodeRequest, decodeRequest,
encodeAddSprintResponse, encodeAddSprintResponse,
@@ -28,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin
), ),
closesprint: grpctransport.NewServer( closesprint: grpctransport.NewServer(
ctx,
endpoints.CloseSprintEndpoint, endpoints.CloseSprintEndpoint,
decodeRequest, decodeRequest,
encodeCloseSprintResponse, encodeCloseSprintResponse,
@@ -36,7 +34,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin
), ),
getsprint: grpctransport.NewServer( getsprint: grpctransport.NewServer(
ctx,
endpoints.GetSprintEndpoint, endpoints.GetSprintEndpoint,
decodeRequest, decodeRequest,
encodeGetSprintResponse, encodeGetSprintResponse,

17
examples/go-kit/services/sprint/gen/transports/http/http.go
View File

@@ -16,9 +16,8 @@ var _ = log.Printf
var _ = gokit_endpoint.Chain var _ = gokit_endpoint.Chain
var _ = httptransport.NewClient 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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decodeAddSprintRequest, decodeAddSprintRequest,
encodeResponse, encodeResponse,
@@ -34,9 +33,8 @@ func decodeAddSprintRequest(ctx context.Context, r *http.Request) (interface{},
return &req, nil 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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decodeCloseSprintRequest, decodeCloseSprintRequest,
encodeResponse, encodeResponse,
@@ -52,9 +50,8 @@ func decodeCloseSprintRequest(ctx context.Context, r *http.Request) (interface{}
return &req, nil 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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decodeGetSprintRequest, decodeGetSprintRequest,
encodeResponse, encodeResponse,
@@ -74,16 +71,16 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
return json.NewEncoder(w).Encode(response) 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)") 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)") 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)") 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 return nil
} }

4
examples/go-kit/services/user/gen/transports/grpc/grpc.go
View File

@@ -14,13 +14,12 @@ import (
// avoid import errors // avoid import errors
var _ = fmt.Errorf var _ = fmt.Errorf
func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserServiceServer { func MakeGRPCServer(endpoints endpoints.Endpoints) pb.UserServiceServer {
var options []grpctransport.ServerOption var options []grpctransport.ServerOption
_ = options _ = options
return &grpcServer{ return &grpcServer{
createuser: grpctransport.NewServer( createuser: grpctransport.NewServer(
ctx,
endpoints.CreateUserEndpoint, endpoints.CreateUserEndpoint,
decodeRequest, decodeRequest,
encodeCreateUserResponse, encodeCreateUserResponse,
@@ -28,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserS
), ),
getuser: grpctransport.NewServer( getuser: grpctransport.NewServer(
ctx,
endpoints.GetUserEndpoint, endpoints.GetUserEndpoint,
decodeRequest, decodeRequest,
encodeGetUserResponse, encodeGetUserResponse,

12
examples/go-kit/services/user/gen/transports/http/http.go
View File

@@ -16,9 +16,8 @@ var _ = log.Printf
var _ = gokit_endpoint.Chain var _ = gokit_endpoint.Chain
var _ = httptransport.NewClient 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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decodeCreateUserRequest, decodeCreateUserRequest,
encodeResponse, encodeResponse,
@@ -34,9 +33,8 @@ func decodeCreateUserRequest(ctx context.Context, r *http.Request) (interface{},
return &req, nil 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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decodeGetUserRequest, decodeGetUserRequest,
encodeResponse, encodeResponse,
@@ -56,13 +54,13 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
return json.NewEncoder(w).Encode(response) 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)") 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)") 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 return nil
} }

3
examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl
View File

@@ -16,7 +16,7 @@ import (
// avoid import errors // avoid import errors
var _ = fmt.Errorf 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 var options []grpctransport.ServerOption
_ = options _ = options
return &grpcServer{ return &grpcServer{
@@ -27,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.{{.Fi
}, },
{{else}} {{else}}
{{.Name | lower}}: grpctransport.NewServer( {{.Name | lower}}: grpctransport.NewServer(
ctx,
endpoints.{{.Name}}Endpoint, endpoints.{{.Name}}Endpoint,
decodeRequest, decodeRequest,
encode{{.Name}}Response, encode{{.Name}}Response,

7
examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl
View File

@@ -21,9 +21,8 @@ var _ = httptransport.NewClient
{{range .Service.Method}} {{range .Service.Method}}
{{if and (not .ServerStreaming) (not .ClientStreaming)}} {{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( return httptransport.NewServer(
ctx,
endpoint, endpoint,
decode{{.Name}}Request, decode{{.Name}}Request,
encodeResponse, encodeResponse,
@@ -45,11 +44,11 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
return json.NewEncoder(w).Encode(response) 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}} {{range .Service.Method}}
{{if and (not .ServerStreaming) (not .ClientStreaming)}} {{if and (not .ServerStreaming) (not .ClientStreaming)}}
log.Println("new HTTP endpoint: \"/{{.Name}}\" (service={{$file.Package | title}})") 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}}
{{end}} {{end}}
return nil return nil