fix BUG: upgrade cluster missing packageVersion

housepower · Mar 9, 2021 · 6f17fcb · 6f17fcb
1 parent 2314146
commit 6f17fcb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/controller/clickhouse.go b/controller/clickhouse.go
@@ -359,9 +359,16 @@ func (ck *ClickHouseController) QueryInfo(c *gin.Context) {
 // @Success 200 {string} json "{"code":200,"msg":"success","data":null}"
 // @Router /api/v1/ck/upgrade/{clusterName} [put]
 func (ck *ClickHouseController) UpgradeCk(c *gin.Context) {
+	var req model.CkUpgradeCk
 	var conf model.CKManClickHouseConfig
 	clusterName := c.Param(ClickHouseClusterPath)
-	packageVersion := c.Query("packageVersion")
+
+	if err := model.DecodeRequestBody(c.Request, &req); err != nil {
+		model.WrapMsg(c, model.INVALID_PARAMS, model.GetMsg(c, model.INVALID_PARAMS), err.Error())
+		return
+	}
+
+	packageVersion := req.PackageVersion
 
 	con, ok := clickhouse.CkClusters.Load(clusterName)
 	if !ok {

diff --git a/model/ck_table.go b/model/ck_table.go
@@ -101,3 +101,7 @@ type CkTableCost struct {
 	SecondaryMax float64 `json:"secondaryMax"`
 	Max          float64 `json:"max"`
 }
+
+type CkUpgradeCk struct {
+	PackageVersion string `json:"packageVersion"`
+}