fix conflict

Signed-off-by: lhy1024 <admin@liudos.us>

Author: lhy1024

pkg/mcs/resourcemanager/server/apis/v1/api.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"net/http"
 	"reflect"
-	"strconv"
 	"strings"
 
 	"github.com/gin-contrib/cors"
@@ -29,10 +28,8 @@ import (
 
 	rmpb "github.com/pingcap/kvproto/pkg/resource_manager"
 
-	"github.com/tikv/pd/pkg/errs"
 	rmserver "github.com/tikv/pd/pkg/mcs/resourcemanager/server"
 	"github.com/tikv/pd/pkg/mcs/utils"
-	"github.com/tikv/pd/pkg/mcs/utils/constant"
 	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/pkg/utils/apiutil/multiservicesapi"
 	"github.com/tikv/pd/pkg/utils/reflectutil"
@@ -167,15 +164,17 @@ func (s *Service) putResourceGroup(c *gin.Context) {
 //	@Failure	404		    {string}	error
 //	@Param		name	    path		string	true	"groupName"
 //	@Param		with_stats	query		bool	false	"whether to return statistics data."
-//	@Param		keyspace_id	query		uint32	false	"keyspace ID, if not set, it will be treated as null keyspace ID."
+//	@Param		keyspace_name		path	string	true	"Keyspace name"
 //	@Router		/config/group/{name} [get]
 func (s *Service) getResourceGroup(c *gin.Context) {
 	withStats := strings.EqualFold(c.Query("with_stats"), "true")
-	keyspaceID, err := getKeyspaceIDFromQuery(c)
+	keyspaceName := c.Query("keyspace_name")
+	keyspaceIDValue, err := s.manager.GetKeyspaceIDByName(c, keyspaceName)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
+	keyspaceID := keyspaceIDValue.GetValue()
 	group := s.manager.GetResourceGroup(keyspaceID, c.Param("name"), withStats)
 	if group == nil {
 		c.String(http.StatusNotFound, errors.New("resource group not found").Error())
@@ -190,15 +189,17 @@ func (s *Service) getResourceGroup(c *gin.Context) {
 //	@Success	200	{string}	json	format	of	[]rmserver.ResourceGroup
 //	@Failure	404	{string}	error
 //	@Param		with_stats		query	bool	false	"whether to return statistics data."
-//	@Param		keyspace_id	query		uint32	false	"keyspace ID, if not set, it will be treated as null keyspace ID."
+//	@Param		keyspace_name		path	string	true	"Keyspace name"
 //	@Router		/config/groups [get]
 func (s *Service) getResourceGroupList(c *gin.Context) {
 	withStats := strings.EqualFold(c.Query("with_stats"), "true")
-	keyspaceID, err := getKeyspaceIDFromQuery(c)
+	keyspaceName := c.Query("keyspace_name")
+	keyspaceIDValue, err := s.manager.GetKeyspaceIDByName(c, keyspaceName)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
+	keyspaceID := keyspaceIDValue.GetValue()
 	groups := s.manager.GetResourceGroupList(keyspaceID, withStats)
 	c.IndentedJSON(http.StatusOK, groups)
 }
@@ -208,16 +209,18 @@ func (s *Service) getResourceGroupList(c *gin.Context) {
 //	@Tags		ResourceManager
 //	@Summary	delete resource group by name.
 //	@Param		name	path		string	true	"Name of the resource group to be deleted"
-//	@Param		keyspace_id	query		uint32	false	"keyspace ID, if not set, it will be treated as null keyspace ID."
+//	@Param		keyspace_name		path	string	true	"Keyspace name"
 //	@Success	200		{string}	string	"Success!"
 //	@Failure	404		{string}	error
 //	@Router		/config/group/{name} [delete]
 func (s *Service) deleteResourceGroup(c *gin.Context) {
-	keyspaceID, err := getKeyspaceIDFromQuery(c)
+	keyspaceName := c.Query("keyspace_name")
+	keyspaceIDValue, err := s.manager.GetKeyspaceIDByName(c, keyspaceName)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
+	keyspaceID := keyspaceIDValue.GetValue()
 	if err := s.manager.DeleteResourceGroup(keyspaceID, c.Param("name")); err != nil {
 		c.String(http.StatusNotFound, err.Error())
 	}
@@ -322,15 +325,3 @@ func (s *Service) getKeyspaceServiceLimit(c *gin.Context) {
 	}
 	c.IndentedJSON(http.StatusOK, limiter)
 }
-
-func getKeyspaceIDFromQuery(c *gin.Context) (uint32, error) {
-	keyspaceIDStr := c.Query("keyspace_id")
-	if keyspaceIDStr == "" {
-		return constant.NullKeyspaceID, nil
-	}
-	keyspaceID, err := strconv.ParseUint(keyspaceIDStr, 10, 32)
-	if err != nil {
-		return 0, errs.ErrStrconvParseUint.Wrap(err).GenWithStackByArgs(keyspaceIDStr)
-	}
-	return uint32(keyspaceID), nil
-}

tests/integrations/mcs/resourcemanager/api_test.go

@@ -322,7 +322,7 @@ func (suite *resourceManagerAPITestSuite) TestKeyspaceServiceLimitAPI() {
 }
 
 func (suite *resourceManagerAPITestSuite) tryToGetKeyspaceServiceLimit(re *require.Assertions, keyspaceName string) (float64, int) {
-	bodyBytes, statusCode := suite.sendRequest(re, http.MethodGet, "/config/keyspace/service-limit/"+keyspaceName, nil)
+	bodyBytes, statusCode := suite.sendRequest(re, http.MethodGet, "/config/keyspace/service-limit/"+keyspaceName, nil, nil)
 	if statusCode != http.StatusOK {
 		return 0.0, statusCode
 	}
@@ -338,6 +338,7 @@ func (suite *resourceManagerAPITestSuite) tryToSetKeyspaceServiceLimit(re *requi
 		re,
 		http.MethodPost,
 		"/config/keyspace/service-limit/"+keyspaceName,
+		nil,
 		apis.KeyspaceServiceLimitRequest{
 			ServiceLimit: limit,
 		},