Skip to content

fix(waf): [123804727] tencentcloud_waf_custom_rule add retry #3340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

fix(waf): [123804727] tencentcloud_waf_custom_rule add retry #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df8a2c7
add
SevenEarth Apr 29, 2025
a338f58
add
SevenEarth Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3340.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_waf_custom_rule: add read retry
```
32 changes: 24 additions & 8 deletions tencentcloud/services/waf/service_tencentcloud_waf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func (me *WafService) DescribeWafCustomRuleById(ctx context.Context, domain, rul
logId := tccommon.GetLogId(ctx)

request := waf.NewDescribeCustomRuleListRequest()
response := waf.NewDescribeCustomRuleListResponse()
request.Domain = &domain
request.Offset = common.Uint64Ptr(0)
request.Limit = common.Uint64Ptr(20)
Expand All @@ -42,16 +43,24 @@ func (me *WafService) DescribeWafCustomRuleById(ctx context.Context, domain, rul
}
}()

ratelimit.Check(request.GetAction())
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
result, e := me.client.UseWafV20180125Client().DescribeCustomRuleList(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(), result.ToJsonString())
}

response = result
return nil
})

response, err := me.client.UseWafClient().DescribeCustomRuleList(request)
if err != nil {
errRet = err
return
}

log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

if len(response.Response.RuleList) < 1 {
return
}
Expand All @@ -73,16 +82,23 @@ func (me *WafService) DeleteWafCustomRuleById(ctx context.Context, domain, ruleI
}
}()

ratelimit.Check(request.GetAction())
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
result, e := me.client.UseWafV20180125Client().DeleteCustomRule(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(), result.ToJsonString())
}

return nil
})

response, err := me.client.UseWafClient().DeleteCustomRule(request)
if err != nil {
errRet = err
return
}

log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())

return
}

Expand Down
Loading