zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix zrpc code generation error with --remote (#1739)

Browse Source 
Co-authored-by: anqiansong <anqiansong@bytedance.com>
This commit is contained in:
anqiansong
2022-04-01 22:19:33 +08:00
committed by GitHub
parent ac18cc470d
commit 7e0b0ab0b1
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/goctl/rpc/cli/zrpc.go
View File

@@ -118,13 +118,18 @@ func removeGoctlFlag(args []string) []string {
for step < len(args) {
arg := args[step]
switch {
case arg == "--style", arg == "--home", arg == "--zrpc_out", arg == "--verbose", arg == "-v":
case arg == "--style", arg == "--home",
arg == "--zrpc_out", arg == "--verbose",
arg == "-v", arg == "--remote",
arg == "--branch":
step += 2
continue
case strings.HasPrefix(arg, "--style="),
strings.HasPrefix(arg, "--home="),
strings.HasPrefix(arg, "--verbose="),
strings.HasPrefix(arg, "-v="),
strings.HasPrefix(arg, "--remote="),
strings.HasPrefix(arg, "--branch="),
strings.HasPrefix(arg, "--zrpc_out="):
step += 1
continue

8
tools/goctl/rpc/cli/zrpc_test.go
View File

@@ -83,6 +83,14 @@ func Test_RemoveGoctlFlag(t *testing.T) {
source: strings.Fields(`protoc --go_opt=. --go-grpc_out=. --zrpc_out=. foo.proto`),
expected: "protoc --go_opt=. --go-grpc_out=. foo.proto",
},
{
source: strings.Fields(`protoc --go_opt=. --go-grpc_out=. --zrpc_out=. --remote=foo --branch=bar foo.proto`),
expected: "protoc --go_opt=. --go-grpc_out=. foo.proto",
},
{
source: strings.Fields(`protoc --go_opt=. --go-grpc_out=. --zrpc_out=. --remote foo --branch bar foo.proto`),
expected: "protoc --go_opt=. --go-grpc_out=. foo.proto",
},
}
for _, e := range testData {
cmd := strings.Join(removeGoctlFlag(e.source), " ")