From 02e18752a8a652e8d894e85304c5cbb9d5c50141 Mon Sep 17 00:00:00 2001
From: mikatong <mikatong@tencent.com>
Date: Mon, 15 Jul 2024 14:27:49 +0800
Subject: [PATCH] fix gaap error page problem

---
 tencentcloud/common/common.go                 |  2 ++
 .../gaap/data_source_tc_gaap_proxy_groups.go  |  4 +--
 .../gaap/service_tencentcloud_gaap.go         | 31 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/tencentcloud/common/common.go b/tencentcloud/common/common.go
index f9f5d6726f..019337d5ee 100644
--- a/tencentcloud/common/common.go
+++ b/tencentcloud/common/common.go
@@ -86,6 +86,8 @@ var retryableErrorCode = []string{
 	"OperationDenied.InstanceStatusLimitError",
 	// apigw
 	"UnsupportedOperation.UnsupportedDeleteService",
+	// gaap
+	"FailedOperation.ListenerHasTask",
 }
 
 // retryableCosErrorCode is retryable error code for COS/CI SDK
diff --git a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.go b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.go
index ee4e433961..5d46dd28ea 100644
--- a/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.go
+++ b/tencentcloud/services/gaap/data_source_tc_gaap_proxy_groups.go
@@ -239,7 +239,7 @@ func dataSourceTencentCloudGaapProxyGroupsRead(d *schema.ResourceData, meta inte
 			}
 			tmpSet = append(tmpSet, &filter)
 		}
-		paramMap["filters"] = tmpSet
+		paramMap["Filters"] = tmpSet
 	}
 
 	if v, ok := d.GetOk("tag_set"); ok {
@@ -258,7 +258,7 @@ func dataSourceTencentCloudGaapProxyGroupsRead(d *schema.ResourceData, meta inte
 			}
 			tmpSet = append(tmpSet, &tagPair)
 		}
-		paramMap["tag_set"] = tmpSet
+		paramMap["TagSet"] = tmpSet
 	}
 
 	service := GaapService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
diff --git a/tencentcloud/services/gaap/service_tencentcloud_gaap.go b/tencentcloud/services/gaap/service_tencentcloud_gaap.go
index d4a5478257..21e202f98f 100644
--- a/tencentcloud/services/gaap/service_tencentcloud_gaap.go
+++ b/tencentcloud/services/gaap/service_tencentcloud_gaap.go
@@ -3208,6 +3208,22 @@ func (me *GaapService) CreateDomainErrorPageInfo(ctx context.Context,
 	}); err != nil {
 		return "", helper.WrapErrorf(err, "", "", "create gaap domain error page info failed")
 	}
+	describeRequest := gaap.NewDescribeDomainErrorPageInfoByIdsRequest()
+	describeRequest.ErrorPageIds = []*string{&id}
+	if err := resource.Retry(3*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+		describeResponse, err := client.DescribeDomainErrorPageInfoByIds(describeRequest)
+		if err != nil {
+			return tccommon.RetryError(err)
+		}
+
+		if describeResponse.Response != nil && len(describeResponse.Response.ErrorPageSet) == 0 {
+			return resource.RetryableError(fmt.Errorf("creating error page"))
+		}
+		return nil
+
+	}); err != nil {
+		return "", err
+	}
 
 	return
 }
@@ -3292,6 +3308,21 @@ func (me *GaapService) DeleteDomainErrorPageInfo(ctx context.Context, id string)
 	}); err != nil {
 		return helper.WrapErrorf(err, id, "", "delete domain error page info failed")
 	}
+	describeRequest := gaap.NewDescribeDomainErrorPageInfoByIdsRequest()
+	describeRequest.ErrorPageIds = []*string{&id}
+	if err := resource.Retry(3*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+		describeResponse, err := client.DescribeDomainErrorPageInfoByIds(describeRequest)
+		if err != nil {
+			return tccommon.RetryError(err)
+		}
+
+		if describeResponse.Response != nil && len(describeResponse.Response.ErrorPageSet) > 0 {
+			return resource.RetryableError(fmt.Errorf("deleting error page"))
+		}
+		return nil
+	}); err != nil {
+		return err
+	}
 
 	return nil
 }