@@ -4,14 +4,12 @@ import (
4
4
"context"
5
5
"log"
6
6
"strconv"
7
- "time"
8
-
9
- sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
10
7
11
8
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
12
9
13
10
rum "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum/v20210622"
14
11
12
+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
15
13
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
16
14
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
17
15
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
@@ -90,8 +88,9 @@ func (me *RumService) DeleteRumTawInstanceById(ctx context.Context, instanceId s
90
88
91
89
func (me * RumService ) DescribeRumProject (ctx context.Context , id string ) (project * rum.RumProject , errRet error ) {
92
90
var (
93
- logId = tccommon .GetLogId (ctx )
94
- request = rum .NewDescribeProjectsRequest ()
91
+ logId = tccommon .GetLogId (ctx )
92
+ request = rum .NewDescribeProjectsRequest ()
93
+ response = rum .NewDescribeProjectsResponse ()
95
94
)
96
95
97
96
defer func () {
@@ -118,20 +117,24 @@ func (me *RumService) DescribeRumProject(ctx context.Context, id string) (projec
118
117
request .Offset = & offset
119
118
request .Limit = & pageSize
120
119
ratelimit .Check (request .GetAction ())
121
- ReTryDescribe:
122
- response , err := me .client .UseRumClient ().DescribeProjects (request )
123
- if err != nil {
124
- // Exceeded request frequency limit
125
- if err .( * sdkErrors. TencentCloudSDKError ). Code == "RequestLimitExceeded" {
126
- time . Sleep ( time . Second * 1 )
127
- goto ReTryDescribe
120
+ err := resource . Retry ( tccommon . ReadRetryTimeout , func () * resource. RetryError {
121
+ result , e := me .client .UseRumClient ().DescribeProjects (request )
122
+ if e != nil {
123
+ return tccommon . RetryError ( e )
124
+ } else {
125
+ log . Printf ( "[DEBUG]%s api[%s] success, request body [%s], response body [%s] \n " ,
126
+ logId , request . GetAction (), request . ToJsonString (), result . ToJsonString ())
128
127
}
129
128
130
- log .Printf ("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n " ,
131
- logId , request .GetAction (), request .ToJsonString (), err .Error ())
129
+ response = result
130
+ return nil
131
+ })
132
+
133
+ if err != nil {
132
134
errRet = err
133
135
return
134
136
}
137
+
135
138
log .Printf ("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n " ,
136
139
logId , request .GetAction (), request .ToJsonString (), response .ToJsonString ())
137
140
0 commit comments