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

fix import error if generate multiple proto (#3694)

Browse Source
master
zhaolei 1 year ago committed by GitHub
parent fd8ee0b851
commit df2799fff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File

14
tools/goctl/rpc/generator/genpb.go
Unescape Escape View File

@ -31,14 +31,14 @@ func (g *Generator) genPbDirect(ctx DirContext, c *ZRpcContext) error {
} }
func (g *Generator) setPbDir(ctx DirContext, c *ZRpcContext) error { func (g *Generator) setPbDir(ctx DirContext, c *ZRpcContext) error {
pbDir, err := findPbFile(c.GoOutput, false) pbDir, err := findPbFile(c.GoOutput, c.Src, false)
if err != nil { if err != nil {
return err return err
} }
if len(pbDir) == 0 { if len(pbDir) == 0 {
return fmt.Errorf("pg.go is not found under %q", c.GoOutput) return fmt.Errorf("pg.go is not found under %q", c.GoOutput)
} }
grpcDir, err := findPbFile(c.GrpcOutput, true) grpcDir, err := findPbFile(c.GrpcOutput, c.Src, true)
if err != nil { if err != nil {
return err return err
} }
@ -62,7 +62,11 @@ const (
grpcSuffix = "_grpc.pb.go" grpcSuffix = "_grpc.pb.go"
) )
func findPbFile(current string, grpc bool) (string, error) { func findPbFile(current string, src string, grpc bool) (string, error) {
protoName := strings.TrimSuffix(filepath.Base(src), filepath.Ext(src))
pbFile := protoName + "." + pbSuffix
grpcFile := protoName + grpcSuffix
fileSystem := os.DirFS(current) fileSystem := os.DirFS(current)
var ret string var ret string
err := fs.WalkDir(fileSystem, ".", func(path string, d fs.DirEntry, err error) error { err := fs.WalkDir(fileSystem, ".", func(path string, d fs.DirEntry, err error) error {
@ -71,11 +75,11 @@ func findPbFile(current string, grpc bool) (string, error) {
} }
if strings.HasSuffix(path, pbSuffix) { if strings.HasSuffix(path, pbSuffix) {
if grpc { if grpc {
if strings.HasSuffix(path, grpcSuffix) { if strings.HasSuffix(path, grpcFile) {
ret = path ret = path
return os.ErrExist return os.ErrExist
} }
} else if !strings.HasSuffix(path, grpcSuffix) { } else if strings.HasSuffix(path, pbFile) {
ret = path ret = path
return os.ErrExist return os.ErrExist
} }

20
tools/goctl/rpc/generator/genpb_test.go
Unescape Escape View File

@ -46,12 +46,12 @@ service Greeter {
t.Log(err) t.Log(err)
return return
} }
pbDir, err := findPbFile(output, false) pbDir, err := findPbFile(output, protoFile, false)
assert.Nil(t, err) assert.Nil(t, err)
pbGo := filepath.Join(pbDir, "greet.pb.go") pbGo := filepath.Join(pbDir, "greet.pb.go")
assert.True(t, pathx.FileExists(pbGo)) assert.True(t, pathx.FileExists(pbGo))
grpcDir, err := findPbFile(output, true) grpcDir, err := findPbFile(output, protoFile, true)
assert.Nil(t, err) assert.Nil(t, err)
grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go") grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go")
assert.True(t, pathx.FileExists(grpcGo)) assert.True(t, pathx.FileExists(grpcGo))
@ -76,12 +76,12 @@ service Greeter {
t.Log(err) t.Log(err)
return return
} }
pbDir, err := findPbFile(output, false) pbDir, err := findPbFile(output, protoFile, false)
assert.Nil(t, err) assert.Nil(t, err)
pbGo := filepath.Join(pbDir, "greet.pb.go") pbGo := filepath.Join(pbDir, "greet.pb.go")
assert.True(t, pathx.FileExists(pbGo)) assert.True(t, pathx.FileExists(pbGo))
grpcDir, err := findPbFile(output, true) grpcDir, err := findPbFile(output, protoFile, true)
assert.Nil(t, err) assert.Nil(t, err)
grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go") grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go")
assert.True(t, pathx.FileExists(grpcGo)) assert.True(t, pathx.FileExists(grpcGo))
@ -108,12 +108,12 @@ service Greeter {
t.Log(err) t.Log(err)
return return
} }
pbDir, err := findPbFile(output, false) pbDir, err := findPbFile(output, protoFile, false)
assert.Nil(t, err) assert.Nil(t, err)
pbGo := filepath.Join(pbDir, "greet.pb.go") pbGo := filepath.Join(pbDir, "greet.pb.go")
assert.True(t, pathx.FileExists(pbGo)) assert.True(t, pathx.FileExists(pbGo))
grpcDir, err := findPbFile(output, true) grpcDir, err := findPbFile(output, protoFile, true)
assert.Nil(t, err) assert.Nil(t, err)
grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go") grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go")
assert.True(t, pathx.FileExists(grpcGo)) assert.True(t, pathx.FileExists(grpcGo))
@ -140,12 +140,12 @@ service Greeter {
t.Log(err) t.Log(err)
return return
} }
pbDir, err := findPbFile(output, false) pbDir, err := findPbFile(output, protoFile, false)
assert.Nil(t, err) assert.Nil(t, err)
pbGo := filepath.Join(pbDir, "greet.pb.go") pbGo := filepath.Join(pbDir, "greet.pb.go")
assert.True(t, pathx.FileExists(pbGo)) assert.True(t, pathx.FileExists(pbGo))
grpcDir, err := findPbFile(output, true) grpcDir, err := findPbFile(output, protoFile, true)
assert.Nil(t, err) assert.Nil(t, err)
grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go") grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go")
assert.True(t, pathx.FileExists(grpcGo)) assert.True(t, pathx.FileExists(grpcGo))
@ -183,12 +183,12 @@ service Greeter {
t.Log(err) t.Log(err)
return return
} }
pbDir, err := findPbFile(output, false) pbDir, err := findPbFile(output, protoFile, false)
assert.Nil(t, err) assert.Nil(t, err)
pbGo := filepath.Join(pbDir, "greet.pb.go") pbGo := filepath.Join(pbDir, "greet.pb.go")
assert.True(t, pathx.FileExists(pbGo)) assert.True(t, pathx.FileExists(pbGo))
grpcDir, err := findPbFile(output, true) grpcDir, err := findPbFile(output, protoFile, true)
assert.Nil(t, err) assert.Nil(t, err)
grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go") grpcGo := filepath.Join(grpcDir, "greet_grpc.pb.go")
assert.True(t, pathx.FileExists(grpcGo)) assert.True(t, pathx.FileExists(grpcGo))

Write Preview
Loading…
Cancel
Save