Refactor: Migrate to use the rest package in util/ (#1060)

Author: breezewish

.golangci.yml

@@ -32,7 +32,7 @@ linters:
     - exhaustive
     - exportloopref
     - godot
-    - gofmt
+    - gofumpt
     - goheader
     - goimports
     - gosec

CONTRIBUTING.md

@@ -92,6 +92,10 @@ yarn test
 
 ## Additional Guides
 
+### Style Guidelines
+
+This project follows the [Uber's Golang style guide](https://github.com/uber-go/guide/blob/master/style.md). Please refer to [its documentation](https://github.com/uber-go/guide/blob/master/style.md) for details.
+
 ### Swagger UI
 
 We use [Swagger] to generate the API server and corresponding clients. Swagger provides a web UI in which you can

Makefile

@@ -46,4 +46,4 @@ endif
 	go build -o bin/tidb-dashboard -ldflags '$(LDFLAGS)' -tags "${BUILD_TAGS}" cmd/tidb-dashboard/main.go
 
 run:
-	bin/tidb-dashboard --debug --experimental
+	bin/tidb-dashboard --debug --experimental --feature-version "6.0.0"

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/Xeoncross/go-aesctr-with-hmac v0.0.0-20200623134604-12b17a7ff502
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/antonmedv/expr v1.9.0
-	github.com/appleboy/gin-jwt/v2 v2.6.3
+	github.com/breeswish/gin-jwt/v2 v2.6.4-jwt-patch
 	github.com/cenkalti/backoff/v4 v4.0.2
 	github.com/fatih/structtag v1.2.0
 	github.com/gin-contrib/gzip v0.0.1

go.sum

@@ -29,8 +29,6 @@ github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT
 github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
 github.com/antonmedv/expr v1.9.0 h1:j4HI3NHEdgDnN9p6oI6Ndr0G5QryMY0FNxT4ONrFDGU=
 github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8=
-github.com/appleboy/gin-jwt/v2 v2.6.3 h1:aK4E3DjihWEBUTjEeRnGkA5nUkmwJPL1CPonMa2usRs=
-github.com/appleboy/gin-jwt/v2 v2.6.3/go.mod h1:MfPYA4ogzvOcVkRwAxT7quHOtQmVKDpTwxyUrC2DNw0=
 github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
 github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
@@ -39,6 +37,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/breeswish/gin-jwt/v2 v2.6.4-jwt-patch h1:KLE/YeX+9FNaGVW5MtImRVPhjDpfpgJhvkuYWBmOYbo=
+github.com/breeswish/gin-jwt/v2 v2.6.4-jwt-patch/go.mod h1:KjBLriHXe7L6fGceqWzTod8HUB/TP1WWDtfuSYtYXaI=
 github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs=
 github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -86,6 +86,7 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
 github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs=
@@ -116,6 +117,7 @@ github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8c
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-resty/resty/v2 v2.6.0 h1:joIR5PNLM2EFqqESUjCMGXrWmXNHEU9CEiK813oKYS4=
@@ -324,8 +326,8 @@ github.com/swaggo/swag v1.6.6-0.20200529100950-7c765ddd0476 h1:UjnSXdNPIG+5FJ6xL
 github.com/swaggo/swag v1.6.6-0.20200529100950-7c765ddd0476/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc=
 github.com/thoas/go-funk v0.8.0 h1:JP9tKSvnpFVclYgDM0Is7FD9M4fhPvqA0s0BsXmzSRQ=
 github.com/thoas/go-funk v0.8.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q=
-github.com/tidwall/gjson v1.3.5 h1:2oW9FBNu8qt9jy5URgrzsVx/T/KSn3qn/smJQ0crlDQ=
-github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
+github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
+github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
 github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
@@ -519,7 +521,6 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/apiserver/apiserver.go

@@ -30,14 +30,13 @@ import (
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/user/sso"
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/user/sso/ssoauth"
 	"github.com/pingcap/tidb-dashboard/pkg/tiflash"
+	"github.com/pingcap/tidb-dashboard/util/rest"
 
 	// "github.com/pingcap/tidb-dashboard/pkg/apiserver/__APP_NAME__"
 	// NOTE: Don't remove above comment line, it is a placeholder for code generator.
-
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/slowquery"
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/statement"
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/user"
-	apiutils "github.com/pingcap/tidb-dashboard/pkg/apiserver/utils"
 	"github.com/pingcap/tidb-dashboard/pkg/config"
 	"github.com/pingcap/tidb-dashboard/pkg/dbstore"
 	"github.com/pingcap/tidb-dashboard/pkg/httpc"
@@ -54,9 +53,7 @@ func Handler(s *Service) http.Handler {
 	return s.NewStatusAwareHandler(http.HandlerFunc(s.handler), s.stoppedHandler)
 }
 
-var (
-	once sync.Once
-)
+var once sync.Once
 
 type Service struct {
 	app    *fx.App
@@ -209,7 +206,7 @@ func newAPIHandlerEngine() (apiHandlerEngine *gin.Engine, endpoint *gin.RouterGr
 	apiHandlerEngine.Use(gin.Recovery())
 	apiHandlerEngine.Use(cors.AllowAll())
 	apiHandlerEngine.Use(gzip.Gzip(gzip.DefaultCompression))
-	apiHandlerEngine.Use(apiutils.MWHandleErrors())
+	apiHandlerEngine.Use(rest.ErrorHandlerFn())
 
 	endpoint = apiHandlerEngine.Group("/dashboard/api")
 

pkg/apiserver/clusterinfo/service.go

@@ -23,6 +23,7 @@ import (
 	"github.com/pingcap/tidb-dashboard/pkg/pd"
 	"github.com/pingcap/tidb-dashboard/pkg/tidb"
 	"github.com/pingcap/tidb-dashboard/pkg/utils/topology"
+	"github.com/pingcap/tidb-dashboard/util/rest"
 )
 
 type ServiceParams struct {
@@ -72,7 +73,7 @@ func RegisterRouter(r *gin.RouterGroup, auth *user.AuthService, s *Service) {
 // @Summary Hide a TiDB instance
 // @Param address path string true "ip:port"
 // @Success 200 "delete ok"
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 // @Security JwtAuth
 // @Router /topology/tidb/{address} [delete]
 func (s *Service) deleteTiDBTopology(c *gin.Context) {
@@ -113,7 +114,7 @@ func (s *Service) deleteTiDBTopology(c *gin.Context) {
 // @Success 200 {array} topology.TiDBInfo
 // @Router /topology/tidb [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getTiDBTopology(c *gin.Context) {
 	instances, err := topology.FetchTiDBTopology(s.lifecycleCtx, s.params.EtcdClient)
 	if err != nil {
@@ -133,7 +134,7 @@ type StoreTopologyResponse struct {
 // @Success 200 {object} StoreTopologyResponse
 // @Router /topology/store [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getStoreTopology(c *gin.Context) {
 	tikvInstances, tiFlashInstances, err := topology.FetchStoreTopology(s.params.PDClient)
 	if err != nil {
@@ -151,7 +152,7 @@ func (s *Service) getStoreTopology(c *gin.Context) {
 // @Success 200 {object} topology.StoreLocation
 // @Router /topology/store_location [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getStoreLocationTopology(c *gin.Context) {
 	storeLocation, err := topology.FetchStoreLocation(s.params.PDClient)
 	if err != nil {
@@ -166,7 +167,7 @@ func (s *Service) getStoreLocationTopology(c *gin.Context) {
 // @Success 200 {array} topology.PDInfo
 // @Router /topology/pd [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getPDTopology(c *gin.Context) {
 	instances, err := topology.FetchPDTopology(s.params.PDClient)
 	if err != nil {
@@ -181,7 +182,7 @@ func (s *Service) getPDTopology(c *gin.Context) {
 // @Success 200 {object} topology.AlertManagerInfo
 // @Router /topology/alertmanager [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getAlertManagerTopology(c *gin.Context) {
 	instance, err := topology.FetchAlertManagerTopology(s.lifecycleCtx, s.params.EtcdClient)
 	if err != nil {
@@ -196,7 +197,7 @@ func (s *Service) getAlertManagerTopology(c *gin.Context) {
 // @Success 200 {object} topology.GrafanaInfo
 // @Router /topology/grafana [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getGrafanaTopology(c *gin.Context) {
 	instance, err := topology.FetchGrafanaTopology(s.lifecycleCtx, s.params.EtcdClient)
 	if err != nil {
@@ -212,7 +213,7 @@ func (s *Service) getGrafanaTopology(c *gin.Context) {
 // @Param address path string true "ip:port"
 // @Router /topology/alertmanager/{address}/count [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getAlertManagerCounts(c *gin.Context) {
 	address := c.Param("address")
 	cnt, err := fetchAlertManagerCounts(s.lifecycleCtx, address, s.params.HTTPClient)
@@ -224,16 +225,16 @@ func (s *Service) getAlertManagerCounts(c *gin.Context) {
 }
 
 type GetHostsInfoResponse struct {
-	Hosts   []*hostinfo.Info `json:"hosts"`
-	Warning *utils.APIError  `json:"warning"`
+	Hosts   []*hostinfo.Info   `json:"hosts"`
+	Warning rest.ErrorResponse `json:"warning"`
 }
 
 // @ID clusterInfoGetHostsInfo
 // @Summary Get information of all hosts
 // @Router /host/all [get]
 // @Security JwtAuth
 // @Success 200 {object} GetHostsInfoResponse
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getHostsInfo(c *gin.Context) {
 	db := utils.GetTiDBConnection(c)
 
@@ -243,9 +244,9 @@ func (s *Service) getHostsInfo(c *gin.Context) {
 		return
 	}
 
-	var warning *utils.APIError
+	var warning rest.ErrorResponse
 	if err != nil {
-		warning = utils.NewAPIError(err)
+		warning = rest.NewErrorResponse(err)
 	}
 
 	c.JSON(http.StatusOK, GetHostsInfoResponse{
@@ -259,7 +260,7 @@ func (s *Service) getHostsInfo(c *gin.Context) {
 // @Router /host/statistics [get]
 // @Security JwtAuth
 // @Success 200 {object} ClusterStatistics
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
+// @Failure 401 {object} rest.ErrorResponse
 func (s *Service) getStatistics(c *gin.Context) {
 	db := utils.GetTiDBConnection(c)
 	stats, err := s.calculateStatistics(db)

pkg/apiserver/configuration/router.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/user"
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver/utils"
+	"github.com/pingcap/tidb-dashboard/util/rest"
 )
 
 func RegisterRouter(r *gin.RouterGroup, auth *user.AuthService, s *Service) {
@@ -25,9 +26,9 @@ func RegisterRouter(r *gin.RouterGroup, auth *user.AuthService, s *Service) {
 // @Success 200 {object} AllConfigItems
 // @Router /configuration/all [get]
 // @Security JwtAuth
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
-// @Failure 403 {object} utils.APIError "Experimental feature not enabled"
-// @Failure 500 {object} utils.APIError "Internal error"
+// @Failure 401 {object} rest.ErrorResponse
+// @Failure 403 {object} rest.ErrorResponse
+// @Failure 500 {object} rest.ErrorResponse
 func (s *Service) getHandler(c *gin.Context) {
 	db := utils.GetTiDBConnection(c)
 	r, err := s.getAllConfigItems(db)
@@ -45,7 +46,7 @@ type EditRequest struct {
 }
 
 type EditResponse struct {
-	Warnings []*utils.APIError `json:"warnings"`
+	Warnings []rest.ErrorResponse `json:"warnings"`
 }
 
 // @ID configurationEdit
@@ -54,14 +55,14 @@ type EditResponse struct {
 // @Success 200 {object} EditResponse
 // @Router /configuration/edit [post]
 // @Security JwtAuth
-// @Failure 400 {object} utils.APIError "Bad request"
-// @Failure 401 {object} utils.APIError "Unauthorized failure"
-// @Failure 403 {object} utils.APIError "Experimental feature not enabled"
-// @Failure 500 {object} utils.APIError "Internal error"
+// @Failure 400 {object} rest.ErrorResponse
+// @Failure 401 {object} rest.ErrorResponse
+// @Failure 403 {object} rest.ErrorResponse
+// @Failure 500 {object} rest.ErrorResponse
 func (s *Service) editHandler(c *gin.Context) {
 	var req EditRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
-		utils.MakeInvalidRequestErrorFromError(c, err)
+		_ = c.Error(rest.ErrBadRequest.NewWithNoMessage())
 		return
 	}
 

pkg/apiserver/configuration/service.go

@@ -14,13 +14,13 @@ import (
 	"go.uber.org/fx"
 	"gorm.io/gorm"
 
-	"github.com/pingcap/tidb-dashboard/pkg/apiserver/utils"
 	"github.com/pingcap/tidb-dashboard/pkg/config"
 	"github.com/pingcap/tidb-dashboard/pkg/pd"
 	"github.com/pingcap/tidb-dashboard/pkg/tidb"
 	"github.com/pingcap/tidb-dashboard/pkg/tikv"
 	"github.com/pingcap/tidb-dashboard/pkg/utils/distro"
 	"github.com/pingcap/tidb-dashboard/pkg/utils/topology"
+	"github.com/pingcap/tidb-dashboard/util/rest"
 )
 
 var (
@@ -190,8 +190,8 @@ type Item struct {
 }
 
 type AllConfigItems struct {
-	Errors []*utils.APIError   `json:"errors"`
-	Items  map[ItemKind][]Item `json:"items"`
+	Errors []rest.ErrorResponse `json:"errors"`
+	Items  map[ItemKind][]Item  `json:"items"`
 }
 
 func (s *Service) getAllConfigItems(db *gorm.DB) (*AllConfigItems, error) {
@@ -228,13 +228,13 @@ func (s *Service) getAllConfigItems(db *gorm.DB) (*AllConfigItems, error) {
 		go s.getConfigItemsFromTiDBToChannel(&item2, ch)
 	}
 
-	errors := make([]*utils.APIError, 0)
+	errors := make([]rest.ErrorResponse, 0)
 	successItems := make([]channelItem, 0)
 
 	for i := 0; i < waitItems; i++ {
 		item := <-ch
 		if item.Err != nil {
-			errors = append(errors, utils.NewAPIError(err))
+			errors = append(errors, rest.NewErrorResponse(err))
 			continue
 		}
 		successItems = append(successItems, item)
@@ -308,7 +308,7 @@ func (s *Service) getAllConfigItems(db *gorm.DB) (*AllConfigItems, error) {
 	}, nil
 }
 
-func (s *Service) editConfig(db *gorm.DB, kind ItemKind, id string, newValue interface{}) ([]*utils.APIError, error) {
+func (s *Service) editConfig(db *gorm.DB, kind ItemKind, id string, newValue interface{}) ([]rest.ErrorResponse, error) {
 	if !isConfigItemEditable(kind, id) {
 		return nil, ErrNotEditable.New("Configuration `%s` is not editable", id)
 	}
@@ -344,9 +344,9 @@ func (s *Service) editConfig(db *gorm.DB, kind ItemKind, id string, newValue int
 			}
 			return nil, nil
 		}
-		warnings := make([]*utils.APIError, 0)
+		warnings := make([]rest.ErrorResponse, 0)
 		for _, err := range failures {
-			warnings = append(warnings, utils.NewAPIError(err))
+			warnings = append(warnings, rest.NewErrorResponse(err))
 		}
 		return warnings, nil
 	case ItemKindTiDBVariable: