fix rate limit (#3301)

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

tencentcloud/services/cls/resource_tc_cls_index_test.go

@@ -2,8 +2,10 @@ package cls_test
 
 import (
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
 	tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
 )
@@ -35,6 +37,10 @@ func TestAccTencentCloudClsIndex_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_cls_index.example", "topic_id"),
 					resource.TestCheckResourceAttr("tencentcloud_cls_index.example", "status", "true"),
 					resource.TestCheckResourceAttr("tencentcloud_cls_index.example", "include_internal_fields", "true"),
+					func(s *terraform.State) error {
+						time.Sleep(1 * time.Minute)
+						return nil
+					},
 				),
 			},
 		},

tencentcloud/services/cls/service_tencentcloud_cls.go

@@ -45,42 +45,50 @@ func (me *ClsService) DescribeClsLogset(ctx context.Context, logsetId string) (l
 			Values: []*string{&logsetId},
 		},
 	)
-	ratelimit.Check(request.GetAction())
 
 	var offset int64 = 0
 	var pageSize int64 = 100
 	instances := make([]*cls.LogsetInfo, 0)
 	var iacExtInfo connectivity.IacExtInfo
 	iacExtInfo.InstanceId = logsetId
 
-	for {
-		request.Offset = &offset
-		request.Limit = &pageSize
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
-		response, err := me.client.UseClsClient(iacExtInfo).DescribeLogsets(request)
-		if err != nil {
-			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
-				logId, request.GetAction(), request.ToJsonString(), err.Error())
-			errRet = err
-			return
-		}
-		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-			logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+		for {
+			request.Offset = &offset
+			request.Limit = &pageSize
+			ratelimit.Check(request.GetAction())
+			response, e := me.client.UseClsClient(iacExtInfo).DescribeLogsets(request)
+			if e != nil {
+				log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+					logId, request.GetAction(), request.ToJsonString(), e.Error())
+				errRet = e
+				return tccommon.RetryError(e)
+			}
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
-		if response == nil || len(response.Response.Logsets) < 1 {
-			break
+			if response == nil || len(response.Response.Logsets) < 1 {
+				break
+			}
+			instances = append(instances, response.Response.Logsets...)
+			if len(response.Response.Logsets) < int(pageSize) {
+				break
+			}
+			offset += pageSize
 		}
-		instances = append(instances, response.Response.Logsets...)
-		if len(response.Response.Logsets) < int(pageSize) {
-			break
+
+		if len(instances) < 1 {
+			return nil
 		}
-		offset += pageSize
-	}
+		logset = instances[0]
+		return nil
+	})
 
-	if len(instances) < 1 {
+	if err != nil {
+		errRet = err
 		return
 	}
-	logset = instances[0]
 
 	return
 
@@ -294,14 +302,22 @@ func (me *ClsService) DeleteClsTopic(ctx context.Context, id string) (errRet err
 		}
 	}()
 
-	ratelimit.Check(request.GetAction())
-	response, err := me.client.UseClsClient().DeleteTopic(request)
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		response, e := me.client.UseClsClient().DeleteTopic(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+		}
+
+		return nil
+	})
+
 	if err != nil {
-		errRet = err
 		return err
 	}
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
 	return
 }
@@ -774,14 +790,22 @@ func (me *ClsService) DeleteClsIndex(ctx context.Context, id string) (errRet err
 		}
 	}()
 
-	ratelimit.Check(request.GetAction())
-	response, err := me.client.UseClsClient().DeleteIndex(request)
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		response, e := me.client.UseClsClient().DeleteIndex(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+		}
+
+		return nil
+	})
+
 	if err != nil {
-		errRet = err
 		return err
 	}
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
 	return
 }