Feature rpc protoc (#1251)
* code generation by protoc * generate pb by protoc direct * support: grpc code generation by protoc directly * format code * check --go_out & --go-grpc_out * fix typo * Update version * fix typo * optimize: remove deprecated unit test * format code Co-authored-by: anqiansong <anqiansong@bytedance.com>
This commit is contained in:
@@ -14,23 +14,44 @@ import (
|
||||
type RPCGenerator struct {
|
||||
g Generator
|
||||
cfg *conf.Config
|
||||
ctx *ZRpcContext
|
||||
}
|
||||
|
||||
type RPCGeneratorOption func(g *RPCGenerator)
|
||||
|
||||
type ZRpcContext struct {
|
||||
Src string
|
||||
ProtocCmd string
|
||||
ProtoGenGrpcDir string
|
||||
ProtoGenGoDir string
|
||||
Output string
|
||||
}
|
||||
|
||||
// NewDefaultRPCGenerator wraps Generator with configure
|
||||
func NewDefaultRPCGenerator(style string) (*RPCGenerator, error) {
|
||||
func NewDefaultRPCGenerator(style string, options ...RPCGeneratorOption) (*RPCGenerator, error) {
|
||||
cfg, err := conf.NewConfig(style)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return NewRPCGenerator(NewDefaultGenerator(), cfg), nil
|
||||
return NewRPCGenerator(NewDefaultGenerator(), cfg, options...), nil
|
||||
}
|
||||
|
||||
// NewRPCGenerator creates an instance for RPCGenerator
|
||||
func NewRPCGenerator(g Generator, cfg *conf.Config) *RPCGenerator {
|
||||
return &RPCGenerator{
|
||||
func NewRPCGenerator(g Generator, cfg *conf.Config, options ...RPCGeneratorOption) *RPCGenerator {
|
||||
out := &RPCGenerator{
|
||||
g: g,
|
||||
cfg: cfg,
|
||||
}
|
||||
for _, opt := range options {
|
||||
opt(out)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func WithZRpcContext(c *ZRpcContext) RPCGeneratorOption {
|
||||
return func(g *RPCGenerator) {
|
||||
g.ctx = c
|
||||
}
|
||||
}
|
||||
|
||||
// Generate generates an rpc service, through the proto file,
|
||||
@@ -63,7 +84,7 @@ func (g *RPCGenerator) Generate(src, target string, protoImportPath []string, go
|
||||
return err
|
||||
}
|
||||
|
||||
dirCtx, err := mkdir(projectCtx, proto, g.cfg)
|
||||
dirCtx, err := mkdir(projectCtx, proto, g.cfg, g.ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -73,7 +94,7 @@ func (g *RPCGenerator) Generate(src, target string, protoImportPath []string, go
|
||||
return err
|
||||
}
|
||||
|
||||
err = g.g.GenPb(dirCtx, protoImportPath, proto, g.cfg, goOptions...)
|
||||
err = g.g.GenPb(dirCtx, protoImportPath, proto, g.cfg, g.ctx, goOptions...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user