go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

feat(cmd): support the third party specify by self and fix the warning when third party is not in current directory (#1266)

Browse Source 
* feat(cmd): support the third party specify by self and fix the warning when third party is not in current directory

* add env support and fix the directory of specify as full directory

* fix the env and flag variable name and rename the function name of the directory is exist check
This commit is contained in:
opensite 2021-07-28 19:20:29 +08:00 committed by GitHub
parent 352d6c8d66
commit a636fd52a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,14 +17,22 @@ 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",
DisableFlagParsing: true,
Run: run,
Use: "client",
Short: "Generate the proto client code",
Long: "Generate the proto client code. Example: kratos proto client helloworld.proto",
Run: run,
}
)
var protoPath string
func init() {
if protoPath = os.Getenv("KRATOS_PROTO_PATH"); protoPath == "" {
protoPath = "./third_party"
}
CmdClient.Flags().StringVarP(&protoPath, "proto_path", "p", protoPath, "proto path")
}
func run(cmd *cobra.Command, args []string) {
if len(args) == 0 {
fmt.Println("Please enter the proto file or directory")
@ -79,7 +87,11 @@ func walk(dir string, args []string) error {
func generate(proto string, args []string) error {
input := []string{
"--proto_path=.",
"--proto_path=./third_party",
}
if pathExists(protoPath) {
input = append(input, "--proto_path="+protoPath)
}
inputExt := []string{
"--proto_path=" + base.KratosMod(),
"--proto_path=" + filepath.Join(base.KratosMod(), "third_party"),
"--go_out=paths=source_relative:.",
@ -87,6 +99,7 @@ func generate(proto string, args []string) error {
"--go-http_out=paths=source_relative:.",
"--go-errors_out=paths=source_relative:.",
}
input = append(input, inputExt...)
protoBytes, err := ioutil.ReadFile(proto)
if err == nil && len(protoBytes) > 0 {
if ok, _ := regexp.Match(`\n[^/]*(import)\s+"validate/validate.proto"`, protoBytes); ok {
@ -109,3 +122,11 @@ func generate(proto string, args []string) error {
fmt.Printf("proto: %s\n", proto)
return nil
}
func pathExists(path string) bool {
_, err := os.Stat(path)
if err != nil {
return os.IsExist(err)
}
return true
}