chore: release v0.6.3 (#760)

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,9 +21,9 @@ The description of the title will be attached in Release Notes,
 so please describe it from user-oriented, what this PR does / why we need it.
 Please check your PR title with the below requirements:
 -->
-- [ ] This PR title match the format: \<type\>(optional scope): \<description\>
+- [ ] This PR title match the format: `<type>(optional scope): <description>`.
 - [ ] The description of this PR title is user-oriented and clear enough for others to understand.
-
+- [ ] Attach the PR updating the user documentation if the current PR requires user awareness at the usage level. [User docs repo](https://github.com/cloudwego/cloudwego.github.io).
 
 #### (Optional) Translate the PR title into Chinese.
 
@@ -35,8 +35,13 @@ Provide more detailed info for review. If it is a perf type PR, perf data is sug
 en:
 zh(optional):
 
-#### Which issue(s) this PR fixes:
+#### (Optional) Which issue(s) this PR fixes:
 <!--
 Automatically closes linked issue when PR is merged.
 Eg: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
 -->
+
+#### (Optional) The PR that updates user documentation:
+<!--
+If the current PR requires user awareness at the usage level, please submit a PR to update user docs. [User docs repo](https://github.com/cloudwego/cloudwego.github.io)
+-->

cmd/hz/app/app.go

@@ -140,17 +140,16 @@ func Client(c *cli.Context) error {
 }
 
 func PluginMode() {
-	pluginName := filepath.Base(os.Args[0])
-	if util.IsWindows() {
-		pluginName = strings.TrimSuffix(pluginName, ".exe")
-	}
-	switch pluginName {
-	case meta.ThriftPluginName:
-		plugin := new(thrift.Plugin)
-		os.Exit(plugin.Run())
-	case meta.ProtocPluginName:
-		plugin := new(protobuf.Plugin)
-		os.Exit(plugin.Run())
+	mode := os.Getenv(meta.EnvPluginMode)
+	if len(os.Args) <= 1 && mode != "" {
+		switch mode {
+		case meta.ThriftPluginName:
+			plugin := new(thrift.Plugin)
+			os.Exit(plugin.Run())
+		case meta.ProtocPluginName:
+			plugin := new(protobuf.Plugin)
+			os.Exit(plugin.Run())
+		}
 	}
 }
 

cmd/hz/config/cmd.go

@@ -71,54 +71,6 @@ func lookupTool(idlType string) (string, error) {
 		}
 	}
 
-	exe, err := os.Executable()
-	if err != nil {
-		return "", fmt.Errorf("failed to get executable path: %s", err)
-	}
-	gopath, err := util.GetGOPATH()
-	if err != nil {
-		return "", err
-	}
-	// softlink the plugin to "$GOPATH/bin"
-	dir := gopath + string(os.PathSeparator) + "bin"
-	if tool == meta.TpCompilerProto {
-		pgh, err := exec.LookPath(meta.ProtocPluginName)
-		linkName := filepath.Join(dir, meta.ProtocPluginName)
-		if util.IsWindows() {
-			linkName = linkName + ".exe"
-		}
-		if err != nil {
-			err = link(exe, linkName)
-			if err != nil {
-				return "", err
-			}
-		} else {
-			err = link(exe, pgh)
-			if err != nil {
-				return "", err
-			}
-		}
-	}
-
-	if tool == meta.TpCompilerThrift {
-		tgh, err := exec.LookPath(meta.ThriftPluginName)
-		linkName := filepath.Join(dir, meta.ThriftPluginName)
-		if util.IsWindows() {
-			linkName = linkName + ".exe"
-		}
-		if err != nil {
-			err = link(exe, linkName)
-			if err != nil {
-				return "", err
-			}
-		} else {
-			err = link(exe, tgh)
-			if err != nil {
-				return "", err
-			}
-		}
-	}
-
 	return path, nil
 }
 
@@ -136,6 +88,11 @@ func link(src, dst string) error {
 }
 
 func BuildPluginCmd(args *Argument) (*exec.Cmd, error) {
+	exe, err := os.Executable()
+	if err != nil {
+		return nil, fmt.Errorf("failed to detect current executable, err: %v", err)
+	}
+
 	argPacks, err := args.Pack()
 	if err != nil {
 		return nil, err
@@ -152,6 +109,7 @@ func BuildPluginCmd(args *Argument) (*exec.Cmd, error) {
 
 	if args.IdlType == meta.IdlThrift {
 		// thriftgo
+		os.Setenv(meta.EnvPluginMode, meta.ThriftPluginName)
 		cmd.Args = append(cmd.Args, meta.TpCompilerThrift)
 		for _, inc := range args.Includes {
 			cmd.Args = append(cmd.Args, "-i", inc)
@@ -167,7 +125,7 @@ func BuildPluginCmd(args *Argument) (*exec.Cmd, error) {
 		cmd.Args = append(cmd.Args,
 			"-o", args.ModelOutDir(),
 			"-g", thriftOpt,
-			"-p", "hertz:"+kas,
+			"-p", "hertz="+exe+":"+kas,
 		)
 		for _, p := range args.ThriftPlugins {
 			cmd.Args = append(cmd.Args, "-p", p)
@@ -177,6 +135,7 @@ func BuildPluginCmd(args *Argument) (*exec.Cmd, error) {
 		}
 	} else {
 		// protoc
+		os.Setenv(meta.EnvPluginMode, meta.ProtocPluginName)
 		cmd.Args = append(cmd.Args, meta.TpCompilerProto)
 		for _, inc := range args.Includes {
 			cmd.Args = append(cmd.Args, "-I", inc)
@@ -185,6 +144,7 @@ func BuildPluginCmd(args *Argument) (*exec.Cmd, error) {
 			cmd.Args = append(cmd.Args, "-I", filepath.Dir(inc))
 		}
 		cmd.Args = append(cmd.Args,
+			"--plugin=protoc-gen-hertz="+exe,
 			"--hertz_out="+args.OutDir,
 			"--hertz_opt="+kas,
 		)

cmd/hz/generator/handler.go

@@ -152,6 +152,9 @@ func (pkgGen *HttpPackageGenerator) updateHandler(handler interface{}, handlerTp
 	if !isExist {
 		return pkgGen.TemplateGenerator.Generate(handler, handlerTpl, filePath, noRepeat)
 	}
+	if pkgGen.HandlerByMethod { // method by handler, do not need to insert new content
+		return nil
+	}
 
 	file, err := ioutil.ReadFile(filePath)
 	if err != nil {

cmd/hz/meta/const.go

@@ -19,7 +19,7 @@ package meta
 import "runtime"
 
 // Version hz version
-const Version = "v0.6.2"
+const Version = "v0.6.3"
 
 // Mode hz run modes
 type Mode int
@@ -29,6 +29,8 @@ const SysType = runtime.GOOS
 
 const WindowsOS = "windows"
 
+const EnvPluginMode = "HERTZ_PLUGIN_MODE"
+
 // hz Commands
 const (
 	CmdUpdate = "update"