chore: upgrade google protobuf

Signed-off-by: rogerogers <rogers@rogerogers.com>
cloudwego · Mar 12, 2024 · 064d0d2 · 064d0d2
1 parent ac50c34
commit 064d0d2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/cmd/static/cmd.go b/cmd/static/cmd.go
@@ -192,7 +192,7 @@ Examples:
 `
 
 	ApiListName = "api-list"
-	ApiUsage    = `analyze router codes by golang asy
+	ApiUsage    = `analyze router codes by golang ast
 
 Examples:
   cwgo api --project_path ./

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -70,6 +70,7 @@ func Client(c *config.ClientArgument) error {
 			os.Exit(1)
 		}
 		utils.ReplaceThriftVersion()
+		utils.UpgradeGolangProtobuf()
 		utils.Hessian2PostProcessing(args)
 	case consts.HTTP:
 		args := hzConfig.NewArgument()

diff --git a/pkg/common/utils/env.go b/pkg/common/utils/env.go
@@ -143,16 +143,27 @@ func IsWindows() bool {
 	return consts.SysType == consts.WindowsOS
 }
 
-func ReplaceThriftVersion() {
-	cmd := "go mod edit -replace github.com/apache/thrift=github.com/apache/thrift@v0.13.0"
+func commandAndNotice(cmd, notice string) {
 	argv := strings.Split(cmd, consts.BlackSpace)
 	err := exec.Command(argv[0], argv[1:]...).Run()
 
 	res := "Done"
 	if err != nil {
 		res = err.Error()
 	}
-	logs.Warn("Adding apache/thrift@v0.13.0 to go.mod for generated code ..........", res)
+	logs.Warn(notice, res)
+}
+
+func ReplaceThriftVersion() {
+	cmd := "go mod edit -replace github.com/apache/thrift=github.com/apache/thrift@v0.13.0"
+	notice := "Adding apache/thrift@v0.13.0 to go.mod for generated code .........."
+	commandAndNotice(cmd, notice)
+}
+
+func UpgradeGolangProtobuf() {
+	cmd := "go get github.com/golang/protobuf"
+	notice := "Upgrading github.com/golang/protobuf to 1.5.4 ........."
+	commandAndNotice(cmd, notice)
 }
 
 // Hessian2PostProcessing is responsible for performing hessian2-related post-processing.

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -85,6 +85,7 @@ func Server(c *config.ServerArgument) error {
 			}
 		}
 		utils.ReplaceThriftVersion()
+		utils.UpgradeGolangProtobuf()
 		utils.Hessian2PostProcessing(args)
 	case consts.HTTP:
 		args := hzConfig.NewArgument()