From 71fb53ae02e4dca93e9ef1cc268a8fcf45e7a12f Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Tue, 13 Dec 2016 10:59:34 +0100 Subject: [PATCH] Add templates --- examples/go-kit/Makefile | 5 +- .../output/services/session/session.pb.go | 98 ------------ .../output/services/sprint/sprint.pb.go | 151 ------------------ .../{{.File.Package}}/gen/README.md.tmpl | 0 .../gen/client/client.go.tmpl | 1 + .../gen/cmd/{{.File.Package}}/main.go.tmpl | 1 + .../gen/endpoints/endpoints.go.tmpl | 1 + .../{{.File.Package}}/gen/init/init.go.tmpl | 1 + .../gen/transports/grpc/grpc.go.tmpl | 1 + .../gen/transports/http/http.go.tmpl | 1 + 10 files changed, 9 insertions(+), 251 deletions(-) delete mode 100644 examples/go-kit/output/services/session/session.pb.go delete mode 100644 examples/go-kit/output/services/sprint/sprint.pb.go create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/README.md.tmpl create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/client/client.go.tmpl create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/cmd/{{.File.Package}}/main.go.tmpl create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/init/init.go.tmpl create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl create mode 100644 examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl diff --git a/examples/go-kit/Makefile b/examples/go-kit/Makefile index a9ffa0d..6cb08f1 100644 --- a/examples/go-kit/Makefile +++ b/examples/go-kit/Makefile @@ -7,8 +7,9 @@ TARGETS_TMPL := $(foreach source, $(SOURCES), $(source)_tmpl) build: $(TARGETS_GO) $(TARGETS_TMPL) $(TARGETS_GO): %_go: - protoc --gogo_out="$(dir $*)" "$*" + protoc --gogo_out=. "$*" $(TARGETS_TMPL): %_tmpl: @mkdir -p $(dir $*)gen - protoc -I. --gotemplate_out=template_dir=templates:output "$*" + protoc -I. --gotemplate_out=template_dir=templates:services "$*" + gofmt -w $(dir $*)gen diff --git a/examples/go-kit/output/services/session/session.pb.go b/examples/go-kit/output/services/session/session.pb.go deleted file mode 100644 index ca98145..0000000 --- a/examples/go-kit/output/services/session/session.pb.go +++ /dev/null @@ -1,98 +0,0 @@ -// Code generated by protoc-gen-go. -// source: services/session/session.proto -// DO NOT EDIT! - -/* -Package session is a generated protocol buffer package. - -It is generated from these files: - services/session/session.proto - -It has these top-level messages: - LoginRequest - LoginResponse - LogoutRequest - LogoutResponse -*/ -package session - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// 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.ProtoPackageIsVersion2 // please upgrade the proto package - -type LoginRequest struct { - 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 fileDescriptor0, []int{0} } - -type LoginResponse struct { - 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 fileDescriptor0, []int{1} } - -type LogoutRequest struct { - Token string `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"` -} - -func (m *LogoutRequest) Reset() { *m = LogoutRequest{} } -func (m *LogoutRequest) String() string { return proto.CompactTextString(m) } -func (*LogoutRequest) ProtoMessage() {} -func (*LogoutRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } - -type LogoutResponse struct { - ErrMsg string `protobuf:"bytes,1,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"` -} - -func (m *LogoutResponse) Reset() { *m = LogoutResponse{} } -func (m *LogoutResponse) String() string { return proto.CompactTextString(m) } -func (*LogoutResponse) ProtoMessage() {} -func (*LogoutResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } - -func init() { - proto.RegisterType((*LoginRequest)(nil), "session.LoginRequest") - proto.RegisterType((*LoginResponse)(nil), "session.LoginResponse") - proto.RegisterType((*LogoutRequest)(nil), "session.LogoutRequest") - proto.RegisterType((*LogoutResponse)(nil), "session.LogoutResponse") -} - -func init() { proto.RegisterFile("services/session/session.proto", fileDescriptor0) } - -var fileDescriptor0 = []byte{ - // 231 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x50, 0xcb, 0x4a, 0xc5, 0x30, - 0x10, 0x35, 0xc2, 0xed, 0xd5, 0x41, 0xef, 0x62, 0x50, 0x6f, 0xe9, 0x42, 0x24, 0x20, 0xe8, 0xa6, - 0x82, 0x6e, 0x04, 0xc1, 0xa5, 0x2b, 0xdd, 0xb4, 0x1f, 0x20, 0x55, 0x87, 0x52, 0xa4, 0x99, 0x3a, - 0x93, 0xea, 0x27, 0xf8, 0xdb, 0x62, 0x93, 0x68, 0x7d, 0xac, 0xc2, 0xc9, 0xcc, 0x79, 0xcc, 0x81, - 0x43, 0x25, 0x79, 0xed, 0x1e, 0x49, 0xcf, 0x94, 0x54, 0x3b, 0x76, 0xe9, 0x2d, 0x07, 0x61, 0xcf, - 0xb8, 0x8c, 0xd0, 0xde, 0xc0, 0xce, 0x2d, 0xb7, 0x9d, 0xab, 0xe8, 0x65, 0x24, 0xf5, 0x58, 0xc0, - 0xd6, 0xa8, 0x24, 0xae, 0xe9, 0x29, 0x37, 0x47, 0xe6, 0x64, 0xbb, 0xfa, 0xc2, 0x9f, 0xb3, 0xa1, - 0x51, 0x7d, 0x63, 0x79, 0xca, 0x37, 0xc3, 0x2c, 0x61, 0x7b, 0x0d, 0xbb, 0x51, 0x47, 0x07, 0x76, - 0x4a, 0xb8, 0x07, 0x0b, 0xcf, 0xcf, 0xe4, 0xa2, 0x4a, 0x00, 0xb8, 0x86, 0x25, 0x89, 0xdc, 0xf7, - 0xda, 0x46, 0x85, 0x8c, 0x44, 0xee, 0xb4, 0xb5, 0xc7, 0x13, 0x9f, 0x47, 0x9f, 0x82, 0xfc, 0xcb, - 0xb7, 0xa7, 0xb0, 0x4a, 0x6b, 0xd1, 0x67, 0xa6, 0x68, 0xe6, 0x8a, 0xe7, 0xef, 0x06, 0x56, 0x75, - 0xb8, 0xb2, 0x0e, 0x65, 0xe0, 0x25, 0x2c, 0xa6, 0x90, 0xb8, 0x5f, 0xa6, 0x3a, 0xe6, 0xc7, 0x17, - 0x07, 0xbf, 0xbf, 0x83, 0x87, 0xdd, 0xc0, 0x2b, 0xc8, 0x82, 0x2f, 0xfe, 0xd8, 0xf9, 0xce, 0x5b, - 0xac, 0xff, 0xfc, 0x27, 0xf2, 0x43, 0x36, 0x75, 0x7e, 0xf1, 0x11, 0x00, 0x00, 0xff, 0xff, 0xc7, - 0x91, 0x50, 0x79, 0x95, 0x01, 0x00, 0x00, -} diff --git a/examples/go-kit/output/services/sprint/sprint.pb.go b/examples/go-kit/output/services/sprint/sprint.pb.go deleted file mode 100644 index 41ccefe..0000000 --- a/examples/go-kit/output/services/sprint/sprint.pb.go +++ /dev/null @@ -1,151 +0,0 @@ -// Code generated by protoc-gen-go. -// source: services/sprint/sprint.proto -// DO NOT EDIT! - -/* -Package sprint is a generated protocol buffer package. - -It is generated from these files: - services/sprint/sprint.proto - -It has these top-level messages: - AddSprintRequest - AddSprintResponse - CloseSprintRequest - CloseSprintResponse - GetSprintRequest - GetSprintResponse - Sprint -*/ -package sprint - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// 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.ProtoPackageIsVersion2 // please upgrade the proto package - -type AddSprintRequest struct { - 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 fileDescriptor0, []int{0} } - -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" 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 fileDescriptor0, []int{1} } - -func (m *AddSprintResponse) GetSprint() *Sprint { - if m != nil { - return m.Sprint - } - return nil -} - -type CloseSprintRequest struct { - 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 fileDescriptor0, []int{2} } - -type CloseSprintResponse struct { - 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 fileDescriptor0, []int{3} } - -type GetSprintRequest struct { - 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 fileDescriptor0, []int{4} } - -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" 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 fileDescriptor0, []int{5} } - -func (m *GetSprintResponse) GetSprint() *Sprint { - if m != nil { - return m.Sprint - } - return nil -} - -type Sprint struct { - 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 fileDescriptor0, []int{6} } - -func init() { - proto.RegisterType((*AddSprintRequest)(nil), "sprint.AddSprintRequest") - proto.RegisterType((*AddSprintResponse)(nil), "sprint.AddSprintResponse") - proto.RegisterType((*CloseSprintRequest)(nil), "sprint.CloseSprintRequest") - proto.RegisterType((*CloseSprintResponse)(nil), "sprint.CloseSprintResponse") - proto.RegisterType((*GetSprintRequest)(nil), "sprint.GetSprintRequest") - proto.RegisterType((*GetSprintResponse)(nil), "sprint.GetSprintResponse") - proto.RegisterType((*Sprint)(nil), "sprint.Sprint") -} - -func init() { proto.RegisterFile("services/sprint/sprint.proto", fileDescriptor0) } - -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, - 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, - 0x6f, 0xe6, 0xbd, 0x85, 0x6b, 0x26, 0xf5, 0x9d, 0x6d, 0x88, 0x1f, 0xb8, 0x54, 0x59, 0xae, 0xdd, - 0x27, 0x2e, 0x55, 0xa1, 0x0b, 0xf4, 0x6d, 0x25, 0xa6, 0x30, 0x9e, 0x4b, 0xb9, 0x34, 0x45, 0x42, - 0x9f, 0x5f, 0xc4, 0x1a, 0x11, 0x4e, 0xf3, 0x74, 0x47, 0xa1, 0x77, 0xeb, 0xdd, 0x07, 0x89, 0xf9, - 0x17, 0x2b, 0x98, 0x34, 0x70, 0x5c, 0x16, 0x39, 0x13, 0x4e, 0xc1, 0xd1, 0x18, 0xe8, 0x60, 0x36, - 0x8a, 0x9d, 0x86, 0xc3, 0xb9, 0x2e, 0x5e, 0xc0, 0x19, 0x29, 0xb5, 0xde, 0xf1, 0x36, 0xec, 0x1b, - 0x4e, 0x9f, 0x94, 0x7a, 0xe3, 0xad, 0xb8, 0x03, 0x7c, 0xfa, 0x28, 0x98, 0xda, 0xfa, 0x23, 0xe8, - 0x67, 0xd2, 0xa9, 0xf7, 0x33, 0x29, 0x62, 0x38, 0x6f, 0xa1, 0x9c, 0x7a, 0x83, 0xd5, 0x6b, 0xb1, - 0x0a, 0x18, 0x3f, 0x93, 0xfe, 0x9b, 0x73, 0x05, 0x93, 0x06, 0xe6, 0xbf, 0xf6, 0x79, 0x05, 0xdf, - 0x42, 0xbb, 0x7a, 0x78, 0x03, 0xb0, 0x51, 0x94, 0x6a, 0x92, 0xeb, 0x54, 0x9b, 0x5b, 0xc3, 0x24, - 0x70, 0x27, 0xf3, 0xda, 0xf2, 0x93, 0xda, 0xf2, 0xd9, 0x8f, 0x07, 0x43, 0xcb, 0xb6, 0xb4, 0x49, - 0xe2, 0x02, 0x82, 0x2a, 0x04, 0x0c, 0xf7, 0xc3, 0x75, 0xf3, 0x8b, 0x2e, 0x8f, 0x74, 0xec, 0x86, - 0xa2, 0x87, 0x2f, 0x30, 0x68, 0x98, 0x89, 0xd1, 0x1e, 0x7b, 0x98, 0x43, 0x74, 0x75, 0xb4, 0x57, - 0x31, 0x2d, 0x20, 0xa8, 0x2c, 0xac, 0xa7, 0xe9, 0x3a, 0x5f, 0x4f, 0x73, 0xe0, 0xb7, 0xe8, 0xbd, - 0xfb, 0xe6, 0x35, 0x3e, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x9e, 0xb2, 0x1e, 0xad, 0x02, - 0x00, 0x00, -} diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/README.md.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/README.md.tmpl new file mode 100644 index 0000000..e69de29 diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/client/client.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/client/client.go.tmpl new file mode 100644 index 0000000..361fda1 --- /dev/null +++ b/examples/go-kit/templates/{{.File.Package}}/gen/client/client.go.tmpl @@ -0,0 +1 @@ +package {{.File.Package}}_client \ No newline at end of file diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/cmd/{{.File.Package}}/main.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/cmd/{{.File.Package}}/main.go.tmpl new file mode 100644 index 0000000..85f0393 --- /dev/null +++ b/examples/go-kit/templates/{{.File.Package}}/gen/cmd/{{.File.Package}}/main.go.tmpl @@ -0,0 +1 @@ +package main \ No newline at end of file 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 new file mode 100644 index 0000000..0189f91 --- /dev/null +++ b/examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl @@ -0,0 +1 @@ +package {{.File.Package}}_endpoints \ No newline at end of file diff --git a/examples/go-kit/templates/{{.File.Package}}/gen/init/init.go.tmpl b/examples/go-kit/templates/{{.File.Package}}/gen/init/init.go.tmpl new file mode 100644 index 0000000..176248c --- /dev/null +++ b/examples/go-kit/templates/{{.File.Package}}/gen/init/init.go.tmpl @@ -0,0 +1 @@ +package {{.File.Package}}_init \ No newline at end of file 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 new file mode 100644 index 0000000..9b86de9 --- /dev/null +++ b/examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl @@ -0,0 +1 @@ +package {{.File.Package}}_transportgrpc \ No newline at end of file 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 new file mode 100644 index 0000000..ff0559d --- /dev/null +++ b/examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl @@ -0,0 +1 @@ +package {{.File.Package}}_transporthttp \ No newline at end of file