fix resource and record bug

Author: weilong.pwl

client_alert_resource_test.go

@@ -118,7 +118,7 @@ func (s *UserTestSuite) TestClient_GetUser() {
 func (s *UserTestSuite) TestClient_ListUser() {
 	err := s.createUser()
 	s.Require().Nil(err)
-	resourceRecords, total, count, err := s.client.ListResourceRecord(s.resourceName, 0, 100)
+	resourceRecords, count, total, err := s.client.ListResourceRecord(s.resourceName, 0, 100)
 	s.Require().Nil(err)
 	if total < 1 || count < 1 {
 		s.Require().Fail("list resourceRecord failed")

client_resource.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"strconv"
 )
 
 const ResourceTypeUserDefine = "userdefine"
@@ -167,10 +166,8 @@ func (c *Client) ListResource(resourceType string, resourceName string, offset,
 	h := map[string]string{
 		"x-log-bodyrawsize": "0",
 		"Content-Type":      "application/json",
-		"offset":            strconv.Itoa(offset),
-		"size":              strconv.Itoa(size),
 	}
-	uri := fmt.Sprintf("/resources?type=%s&names=%s", resourceType, resourceName)
+	uri := fmt.Sprintf("/resources?type=%s&names=%s&offset=%d&size=%d", resourceType, resourceName, offset, size)
 	r, err := c.request("", "GET", uri, h, nil)
 	if err != nil {
 		return nil, 0, 0, err

client_resource_record.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"strconv"
 )
 
 type ResourceRecord struct {
@@ -142,10 +141,8 @@ func (c *Client) ListResourceRecord(resourceName string, offset, size int) (reco
 	h := map[string]string{
 		"x-log-bodyrawsize": "0",
 		"Content-Type":      "application/json",
-		"offset":            strconv.Itoa(offset),
-		"size":              strconv.Itoa(size),
 	}
-	uri := fmt.Sprintf("/resources/%s/records", resourceName)
+	uri := fmt.Sprintf("/resources/%s/records?offset=%d&size=%d", resourceName, offset, size)
 	r, err := c.request("", "GET", uri, h, nil)
 	if err != nil {
 		return nil, 0, 0, err

client_resource_record_test.go

@@ -128,7 +128,7 @@ func (s *ResourceRecordTestSuite) TestClient_GetResourceRecord() {
 func (s *ResourceRecordTestSuite) TestClient_ListResourceRecord() {
 	err := s.createResourceRecord()
 	s.Require().Nil(err)
-	resourceRecords, total, count, err := s.client.ListResourceRecord(s.resourceName, 0, 100)
+	resourceRecords, count, total, err := s.client.ListResourceRecord(s.resourceName, 0, 100)
 	s.Require().Nil(err)
 	if total != 1 || count != 1 {
 		s.Require().Fail("list resourceRecord failed")

client_resource_test.go

@@ -124,7 +124,7 @@ func (s *ResourceTestSuite) TestClient_GetResource() {
 func (s *ResourceTestSuite) TestClient_ListResource() {
 	err := s.createResource()
 	s.Require().Nil(err)
-	resources, total, count, err := s.client.ListResource(ResourceTypeUserDefine, s.resourceName, 0, 100)
+	resources, count, total, err := s.client.ListResource(ResourceTypeUserDefine, s.resourceName, 0, 100)
 	s.Require().Nil(err)
 	if total != 1 || count != 1 {
 		s.Require().Fail("list resource failed")

token_auto_update_client.go

@@ -1284,7 +1284,7 @@ func (c *TokenAutoUpdateClient) ListScheduledSQLJobInstances(projectName, jobNam
 // ####################### Resource API ######################
 func (c *TokenAutoUpdateClient) ListResource(resourceType string, resourceName string, offset, size int) (resourceList []*Resource, count, total int, err error) {
 	for i := 0; i < c.maxTryTimes; i++ {
-		resourceList, total, count, err = c.logClient.ListResource(resourceType, resourceName, offset, size)
+		resourceList, count, total, err = c.logClient.ListResource(resourceType, resourceName, offset, size)
 		if !c.processError(err) {
 			return
 		}
@@ -1365,7 +1365,7 @@ func (c *TokenAutoUpdateClient) CreateResourceString(resourceStr string) (err er
 // ####################### Resource Record API ######################
 func (c *TokenAutoUpdateClient) ListResourceRecord(resourceName string, offset, size int) (recordList []*ResourceRecord, count, total int, err error) {
 	for i := 0; i < c.maxTryTimes; i++ {
-		recordList, total, count, err = c.logClient.ListResourceRecord(resourceName, offset, size)
+		recordList, count, total, err = c.logClient.ListResourceRecord(resourceName, offset, size)
 		if !c.processError(err) {
 			return
 		}