From af11512ee320757566643c4546f90204eb24353f Mon Sep 17 00:00:00 2001
From: Tony Chen <zhihui_chen@foxmail.com>
Date: Mon, 12 Apr 2021 21:36:26 +0800
Subject: [PATCH] add protoc args (#821)

---
 cmd/kratos/internal/proto/client/client.go | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

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