go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-10 00:29:01 +02:00
Code Issues Releases Activity

add protoc args (#821)

Browse Source
This commit is contained in:
Tony Chen 2021-04-12 21:36:26 +08:00 committed by GitHub
parent 3636179347
commit af11512ee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/kratos/internal/proto/client/client.go
View File

@ -14,10 +14,11 @@ import (
var ( var (
// CmdClient represents the source command. // CmdClient represents the source command.
CmdClient = &cobra.Command{ CmdClient = &cobra.Command{
Use: "client", Use: "client",
Short: "Generate the proto client code", Short: "Generate the proto client code",
Long: "Generate the proto client code. Example: kratos proto client helloworld.proto", Long: "Generate the proto client code. Example: kratos proto client helloworld.proto",
Run: run, DisableFlagParsing: true,
Run: run,
} }
) )
@ -41,9 +42,9 @@ func run(cmd *cobra.Command, args []string) {
} }
} }
if strings.HasSuffix(proto, ".proto") { if strings.HasSuffix(proto, ".proto") {
err = generate(proto) err = generate(proto, args)
} else { } else {
err = walk(proto) err = walk(proto, args)
} }
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
@ -59,7 +60,7 @@ func look(name ...string) error {
return nil return nil
} }
func walk(dir string) error { func walk(dir string, args []string) error {
if dir == "" { if dir == "" {
dir = "." dir = "."
} }
@ -67,14 +68,14 @@ func walk(dir string) error {
if ext := filepath.Ext(path); ext != ".proto" { if ext := filepath.Ext(path); ext != ".proto" {
return nil return nil
} }
return generate(path) return generate(path, args)
}) })
} }
// generate is used to execute the generate command for the specified proto file // generate is used to execute the generate command for the specified proto file
func generate(proto string) error { func generate(proto string, args []string) error {
path, name := filepath.Split(proto) path, name := filepath.Split(proto)
fd := exec.Command("protoc", []string{ input := []string{
"--proto_path=.", "--proto_path=.",
"--proto_path=" + filepath.Join(base.KratosMod(), "api"), "--proto_path=" + filepath.Join(base.KratosMod(), "api"),
"--proto_path=" + filepath.Join(base.KratosMod(), "third_party"), "--proto_path=" + filepath.Join(base.KratosMod(), "third_party"),
@ -84,7 +85,13 @@ func generate(proto string) error {
"--go-http_out=paths=source_relative:.", "--go-http_out=paths=source_relative:.",
"--go-errors_out=paths=source_relative:.", "--go-errors_out=paths=source_relative:.",
name, name,
}...) }
for _, a := range args {
if strings.HasPrefix(a, "-") {
input = append(input, a)
}
}
fd := exec.Command("protoc", input...)
fd.Stdout = os.Stdout fd.Stdout = os.Stdout
fd.Stderr = os.Stderr fd.Stderr = os.Stderr
fd.Dir = path fd.Dir = path