Skip to content

Commit 02e1875

Browse files
author
mikatong
committed
fix gaap error page problem
1 parent 764e18f commit 02e1875

File tree

3 files changed

+35
-2
lines changed

3 files changed

+35
-2
lines changed

tencentcloud/common/common.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ var retryableErrorCode = []string{
8686
"OperationDenied.InstanceStatusLimitError",
8787
// apigw
8888
"UnsupportedOperation.UnsupportedDeleteService",
89+
// gaap
90+
"FailedOperation.ListenerHasTask",
8991
}
9092

9193
// retryableCosErrorCode is retryable error code for COS/CI SDK

tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func dataSourceTencentCloudGaapProxyGroupsRead(d *schema.ResourceData, meta inte
239239
}
240240
tmpSet = append(tmpSet, &filter)
241241
}
242-
paramMap["filters"] = tmpSet
242+
paramMap["Filters"] = tmpSet
243243
}
244244

245245
if v, ok := d.GetOk("tag_set"); ok {
@@ -258,7 +258,7 @@ func dataSourceTencentCloudGaapProxyGroupsRead(d *schema.ResourceData, meta inte
258258
}
259259
tmpSet = append(tmpSet, &tagPair)
260260
}
261-
paramMap["tag_set"] = tmpSet
261+
paramMap["TagSet"] = tmpSet
262262
}
263263

264264
service := GaapService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}

tencentcloud/services/gaap/service_tencentcloud_gaap.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3208,6 +3208,22 @@ func (me *GaapService) CreateDomainErrorPageInfo(ctx context.Context,
32083208
}); err != nil {
32093209
return "", helper.WrapErrorf(err, "", "", "create gaap domain error page info failed")
32103210
}
3211+
describeRequest := gaap.NewDescribeDomainErrorPageInfoByIdsRequest()
3212+
describeRequest.ErrorPageIds = []*string{&id}
3213+
if err := resource.Retry(3*tccommon.ReadRetryTimeout, func() *resource.RetryError {
3214+
describeResponse, err := client.DescribeDomainErrorPageInfoByIds(describeRequest)
3215+
if err != nil {
3216+
return tccommon.RetryError(err)
3217+
}
3218+
3219+
if describeResponse.Response != nil && len(describeResponse.Response.ErrorPageSet) == 0 {
3220+
return resource.RetryableError(fmt.Errorf("creating error page"))
3221+
}
3222+
return nil
3223+
3224+
}); err != nil {
3225+
return "", err
3226+
}
32113227

32123228
return
32133229
}
@@ -3292,6 +3308,21 @@ func (me *GaapService) DeleteDomainErrorPageInfo(ctx context.Context, id string)
32923308
}); err != nil {
32933309
return helper.WrapErrorf(err, id, "", "delete domain error page info failed")
32943310
}
3311+
describeRequest := gaap.NewDescribeDomainErrorPageInfoByIdsRequest()
3312+
describeRequest.ErrorPageIds = []*string{&id}
3313+
if err := resource.Retry(3*tccommon.ReadRetryTimeout, func() *resource.RetryError {
3314+
describeResponse, err := client.DescribeDomainErrorPageInfoByIds(describeRequest)
3315+
if err != nil {
3316+
return tccommon.RetryError(err)
3317+
}
3318+
3319+
if describeResponse.Response != nil && len(describeResponse.Response.ErrorPageSet) > 0 {
3320+
return resource.RetryableError(fmt.Errorf("deleting error page"))
3321+
}
3322+
return nil
3323+
}); err != nil {
3324+
return err
3325+
}
32953326

32963327
return nil
32973328
}

0 commit comments

Comments
 (0)