Skip to content

Commit 5f7648d

Browse files
SevenEarthSevenEarth
authored
fix(rum): [117999806] rum_project add read retry operate (#2718)
* add * add * add * add * add * add * add
1 parent 7510103 commit 5f7648d

11 files changed

+246
-117
lines changed

‎.changelog/2718.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_rum_project: add retry operator
3+
```
4+
5+
```release-note:enhancement
6+
resource/tencentcloud_monitor_tmp_alert_group: add retry operator
7+
```

‎tencentcloud/services/rum/resource_tc_rum_project.go‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717

1818
func ResourceTencentCloudRumProject() *schema.Resource {
1919
return &schema.Resource{
20-
Read: resourceTencentCloudRumProjectRead,
2120
Create: resourceTencentCloudRumProjectCreate,
21+
Read: resourceTencentCloudRumProjectRead,
2222
Update: resourceTencentCloudRumProjectUpdate,
2323
Delete: resourceTencentCloudRumProjectDelete,
2424
Importer: &schema.ResourceImporter{
@@ -68,9 +68,9 @@ func ResourceTencentCloudRumProject() *schema.Resource {
6868
},
6969

7070
"desc": {
71-
Type: schema.TypeString,
72-
Optional: true,
73-
Description: " Description of the created project (optional and up to 1,000 characters).",
71+
Type: schema.TypeString,
72+
Optional: true,
73+
Description: "Description of the created project (optional and up to 1,000 characters).",
7474
},
7575

7676
"creator": {
@@ -82,7 +82,7 @@ func ResourceTencentCloudRumProject() *schema.Resource {
8282
"create_time": {
8383
Type: schema.TypeString,
8484
Computed: true,
85-
Description: "Creata Time.",
85+
Description: "Create Time.",
8686
},
8787

8888
"key": {
@@ -122,9 +122,8 @@ func resourceTencentCloudRumProjectCreate(d *schema.ResourceData, meta interface
122122
defer tccommon.LogElapsed("resource.tencentcloud_rum_project.create")()
123123
defer tccommon.InconsistentCheck(d, meta)()
124124

125-
logId := tccommon.GetLogId(tccommon.ContextNil)
126-
127125
var (
126+
logId = tccommon.GetLogId(tccommon.ContextNil)
128127
request = rum.NewCreateProjectRequest()
129128
response *rum.CreateProjectResponse
130129
id uint64
@@ -170,6 +169,7 @@ func resourceTencentCloudRumProjectCreate(d *schema.ResourceData, meta interface
170169
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
171170
logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
172171
}
172+
173173
response = result
174174
return nil
175175
})
@@ -180,7 +180,6 @@ func resourceTencentCloudRumProjectCreate(d *schema.ResourceData, meta interface
180180
}
181181

182182
id = *response.Response.ID
183-
184183
d.SetId(strconv.Itoa(int(id)))
185184
return resourceTencentCloudRumProjectRead(d, meta)
186185
}
@@ -189,15 +188,14 @@ func resourceTencentCloudRumProjectRead(d *schema.ResourceData, meta interface{}
189188
defer tccommon.LogElapsed("resource.tencentcloud_rum_project.read")()
190189
defer tccommon.InconsistentCheck(d, meta)()
191190

192-
logId := tccommon.GetLogId(tccommon.ContextNil)
193-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
194-
195-
service := RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
196-
197-
projectId := d.Id()
191+
var (
192+
logId = tccommon.GetLogId(tccommon.ContextNil)
193+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
194+
service = RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
195+
projectId = d.Id()
196+
)
198197

199198
project, err := service.DescribeRumProject(ctx, projectId)
200-
201199
if err != nil {
202200
return err
203201
}
@@ -274,19 +272,18 @@ func resourceTencentCloudRumProjectUpdate(d *schema.ResourceData, meta interface
274272
defer tccommon.LogElapsed("resource.tencentcloud_rum_project.update")()
275273
defer tccommon.InconsistentCheck(d, meta)()
276274

277-
logId := tccommon.GetLogId(tccommon.ContextNil)
278-
279-
request := rum.NewModifyProjectRequest()
280-
281-
projectId := d.Id()
275+
var (
276+
logId = tccommon.GetLogId(tccommon.ContextNil)
277+
request = rum.NewModifyProjectRequest()
278+
projectId = d.Id()
279+
)
282280

283281
id, e := strconv.Atoi(projectId)
284282
if e != nil {
285283
return fmt.Errorf("[ERROR]%s api[%s] sting to uint64 error, err [%s]", logId, request.GetAction(), e)
286284
}
287285

288286
request.ID = helper.Uint64(uint64(id))
289-
290287
if d.HasChange("name") {
291288
if v, ok := d.GetOk("name"); ok {
292289
request.Name = helper.String(v.(string))
@@ -297,7 +294,6 @@ func resourceTencentCloudRumProjectUpdate(d *schema.ResourceData, meta interface
297294
if v, ok := d.GetOk("instance_id"); ok {
298295
request.InstanceID = helper.String(v.(string))
299296
}
300-
301297
}
302298

303299
if d.HasChange("rate") {
@@ -344,11 +340,12 @@ func resourceTencentCloudRumProjectUpdate(d *schema.ResourceData, meta interface
344340
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
345341
logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
346342
}
343+
347344
return nil
348345
})
349346

350347
if err != nil {
351-
log.Printf("[CRITAL]%s create rum project failed, reason:%+v", logId, err)
348+
log.Printf("[CRITAL]%s update rum project failed, reason:%+v", logId, err)
352349
return err
353350
}
354351

@@ -359,12 +356,12 @@ func resourceTencentCloudRumProjectDelete(d *schema.ResourceData, meta interface
359356
defer tccommon.LogElapsed("resource.tencentcloud_rum_project.delete")()
360357
defer tccommon.InconsistentCheck(d, meta)()
361358

362-
logId := tccommon.GetLogId(tccommon.ContextNil)
363-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
364-
365-
service := RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
366-
367-
projectId := d.Id()
359+
var (
360+
logId = tccommon.GetLogId(tccommon.ContextNil)
361+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
362+
service = RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
363+
projectId = d.Id()
364+
)
368365

369366
if err := service.DeleteRumProjectById(ctx, projectId); err != nil {
370367
return err

‎tencentcloud/services/rum/resource_tc_rum_project.md‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,32 @@ Provides a resource to create a rum project
33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_rum_project" "project" {
7-
name = "projectName"
8-
instance_id = "rum-pasZKEI3RLgakj"
9-
rate = "100"
10-
enable_url_group = "0"
11-
type = "web"
12-
repo = ""
13-
url = "iac-tf.com"
14-
desc = "projectDesc-1"
6+
resource "tencentcloud_rum_taw_instance" "example" {
7+
area_id = "1"
8+
charge_type = "1"
9+
data_retention_days = "30"
10+
instance_name = "tf-example"
11+
instance_desc = "desc."
12+
13+
tags = {
14+
createdBy = "terraform"
15+
}
1516
}
1617
18+
resource "tencentcloud_rum_project" "example" {
19+
name = "tf-example"
20+
instance_id = tencentcloud_rum_taw_instance.example.id
21+
rate = "100"
22+
enable_url_group = "0"
23+
type = "web"
24+
repo = "https://github.com/xxx"
25+
url = "iac-tf.com"
26+
desc = "desc."
27+
}
1728
```
1829
Import
1930

2031
rum project can be imported using the id, e.g.
2132
```
22-
$ terraform import tencentcloud_rum_project.project project_id
23-
```
33+
$ terraform import tencentcloud_rum_project.example 139422
34+
```

‎tencentcloud/services/rum/resource_tc_rum_taw_instance.go‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717

1818
func ResourceTencentCloudRumTawInstance() *schema.Resource {
1919
return &schema.Resource{
20-
Read: resourceTencentCloudRumTawInstanceRead,
2120
Create: resourceTencentCloudRumTawInstanceCreate,
21+
Read: resourceTencentCloudRumTawInstanceRead,
2222
Update: resourceTencentCloudRumTawInstanceUpdate,
2323
Delete: resourceTencentCloudRumTawInstanceDelete,
2424
Importer: &schema.ResourceImporter{
@@ -116,9 +116,8 @@ func resourceTencentCloudRumTawInstanceCreate(d *schema.ResourceData, meta inter
116116
defer tccommon.LogElapsed("resource.tencentcloud_rum_taw_instance.create")()
117117
defer tccommon.InconsistentCheck(d, meta)()
118118

119-
logId := tccommon.GetLogId(tccommon.ContextNil)
120-
121119
var (
120+
logId = tccommon.GetLogId(tccommon.ContextNil)
122121
request = rum.NewCreateTawInstanceRequest()
123122
response *rum.CreateTawInstanceResponse
124123
instanceId string
@@ -178,6 +177,7 @@ func resourceTencentCloudRumTawInstanceCreate(d *schema.ResourceData, meta inter
178177
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
179178
logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
180179
}
180+
181181
response = result
182182
return nil
183183
})
@@ -188,7 +188,6 @@ func resourceTencentCloudRumTawInstanceCreate(d *schema.ResourceData, meta inter
188188
}
189189

190190
instanceId = *response.Response.InstanceId
191-
192191
d.SetId(instanceId)
193192

194193
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
@@ -208,15 +207,14 @@ func resourceTencentCloudRumTawInstanceRead(d *schema.ResourceData, meta interfa
208207
defer tccommon.LogElapsed("resource.tencentcloud_rum_taw_instance.read")()
209208
defer tccommon.InconsistentCheck(d, meta)()
210209

211-
logId := tccommon.GetLogId(tccommon.ContextNil)
212-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
213-
214-
service := RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
215-
216-
instanceId := d.Id()
210+
var (
211+
logId = tccommon.GetLogId(tccommon.ContextNil)
212+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
213+
service = RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
214+
instanceId = d.Id()
215+
)
217216

218217
tawInstance, err := service.DescribeRumTawInstance(ctx, instanceId)
219-
220218
if err != nil {
221219
return err
222220
}
@@ -248,10 +246,12 @@ func resourceTencentCloudRumTawInstanceRead(d *schema.ResourceData, meta interfa
248246
if tags.Key != nil {
249247
tagsMap["key"] = tags.Key
250248
}
249+
251250
if tags.Value != nil {
252251
tagsMap["value"] = tags.Value
253252
}
254253
}
254+
255255
_ = d.Set("tags", tagsMap)
256256
}
257257

@@ -306,12 +306,12 @@ func resourceTencentCloudRumTawInstanceUpdate(d *schema.ResourceData, meta inter
306306
defer tccommon.LogElapsed("resource.tencentcloud_rum_taw_instance.update")()
307307
defer tccommon.InconsistentCheck(d, meta)()
308308

309-
logId := tccommon.GetLogId(tccommon.ContextNil)
310-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
311-
312-
request := rum.NewModifyInstanceRequest()
313-
314-
instanceId := d.Id()
309+
var (
310+
logId = tccommon.GetLogId(tccommon.ContextNil)
311+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
312+
request = rum.NewModifyInstanceRequest()
313+
instanceId = d.Id()
314+
)
315315

316316
request.InstanceId = &instanceId
317317

@@ -343,6 +343,7 @@ func resourceTencentCloudRumTawInstanceUpdate(d *schema.ResourceData, meta inter
343343
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
344344
logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
345345
}
346+
346347
return nil
347348
})
348349

@@ -369,12 +370,12 @@ func resourceTencentCloudRumTawInstanceDelete(d *schema.ResourceData, meta inter
369370
defer tccommon.LogElapsed("resource.tencentcloud_rum_taw_instance.delete")()
370371
defer tccommon.InconsistentCheck(d, meta)()
371372

372-
logId := tccommon.GetLogId(tccommon.ContextNil)
373-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
374-
375-
service := RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
376-
377-
instanceId := d.Id()
373+
var (
374+
logId = tccommon.GetLogId(tccommon.ContextNil)
375+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
376+
service = RumService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
377+
instanceId = d.Id()
378+
)
378379

379380
if err := service.DeleteRumTawInstanceById(ctx, instanceId); err != nil {
380381
return err

‎tencentcloud/services/rum/resource_tc_rum_taw_instance.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ Provides a resource to create a rum taw_instance
33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_rum_taw_instance" "taw_instance" {
7-
area_id = "1"
8-
charge_type = "1"
6+
resource "tencentcloud_rum_taw_instance" "example" {
7+
area_id = "1"
8+
charge_type = "1"
99
data_retention_days = "30"
10-
instance_name = "instanceName-1"
10+
instance_name = "tf-example"
11+
instance_desc = "desc."
12+
1113
tags = {
1214
createdBy = "terraform"
1315
}
14-
instance_desc = "instanceDesc-1"
1516
}
16-
1717
```
1818
Import
1919

2020
rum taw_instance can be imported using the id, e.g.
2121
```
22-
$ terraform import tencentcloud_rum_taw_instance.taw_instance tawInstance_id
23-
```
22+
$ terraform import tencentcloud_rum_taw_instance.example rum-WYsjMaiGOVXBeJ
23+
```

‎tencentcloud/services/rum/service_tencentcloud_rum.go‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
rum "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/rum/v20210622"
1111

12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1213
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
1314
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
1415
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
@@ -87,8 +88,9 @@ func (me *RumService) DeleteRumTawInstanceById(ctx context.Context, instanceId s
8788

8889
func (me *RumService) DescribeRumProject(ctx context.Context, id string) (project *rum.RumProject, errRet error) {
8990
var (
90-
logId = tccommon.GetLogId(ctx)
91-
request = rum.NewDescribeProjectsRequest()
91+
logId = tccommon.GetLogId(ctx)
92+
request = rum.NewDescribeProjectsRequest()
93+
response = rum.NewDescribeProjectsResponse()
9294
)
9395

9496
defer func() {
@@ -115,13 +117,26 @@ func (me *RumService) DescribeRumProject(ctx context.Context, id string) (projec
115117
request.Offset = &offset
116118
request.Limit = &pageSize
117119
ratelimit.Check(request.GetAction())
118-
response, err := me.client.UseRumClient().DescribeProjects(request)
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())
127+
}
128+
129+
response = result
130+
return nil
131+
})
132+
119133
if err != nil {
120134
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
121135
logId, request.GetAction(), request.ToJsonString(), err.Error())
122136
errRet = err
123137
return
124138
}
139+
125140
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
126141
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
127142

0 commit comments

Comments
 (0)