[retry enhancement]

1. add retry func
2. unify charge_type name
3. modify description

Author: brickzzhang

tencentcloud/connectivity/client.go

@@ -2,6 +2,7 @@ package connectivity
 
 import (
 	"fmt"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/endpoints"

tencentcloud/data_source_tc_sqlserver_zone_config.go

@@ -1,5 +1,5 @@
 /*
-Use this data source to query purchasable specification configuration for each availability zone in this specific region. And a maximum of 20 requests can be initiated per second for this query.
+Use this data source to query purchasable specification configuration for each availability zone in this specific region.
 
 Example Usage
 
@@ -97,7 +97,7 @@ func dataSourceTencentSqlserverZoneConfig() *schema.Resource {
 									"charge_type": {
 										Type:        schema.TypeString,
 										Computed:    true,
-										Description: "Billing mode under this specification. POST: pay-as-you-go, PRE: pay-before-you-go, ALL: both POST and PRE.",
+										Description: "Billing mode under this specification. Invalid values are POSTPAID_BY_HOUR, PREPAID and ALL, means both POSTPAID_BY_HOUR and PREPAID.",
 									},
 								},
 							},
@@ -152,7 +152,7 @@ func dataSourceTencentSqlserverZoneConfigRead(d *schema.ResourceData, meta inter
 			specinfoConfig["min_storage_size"] = specinfoItem.MinStorage
 			specinfoConfig["max_storage_size"] = specinfoItem.MaxStorage
 			specinfoConfig["qps"] = specinfoItem.QPS
-			specinfoConfig["charge_type"] = specinfoItem.PayModeStatus
+			specinfoConfig["charge_type"] = SQLSERVER_CHARGE_TYPE_NAME[*specinfoItem.PayModeStatus]
 
 			specinfoConfigs = append(specinfoConfigs, specinfoConfig)
 		}

tencentcloud/extension_sqlserver.go

@@ -0,0 +1,12 @@
+package tencentcloud
+
+const (
+	SQLSERVER_CHARGE_TYPE_PREPAID  = "PREPAID"
+	SQLSERVER_CHARGE_TYPE_POSTPAID = "POSTPAID_BY_HOUR"
+)
+
+var SQLSERVER_CHARGE_TYPE_NAME = map[string]string{
+	"PRE":  SQLSERVER_CHARGE_TYPE_PREPAID,
+	"POST": SQLSERVER_CHARGE_TYPE_POSTPAID,
+	"ALL":  "ALL",
+}

tencentcloud/service_tencentcloud_sqlserver.go

@@ -2,6 +2,7 @@ package tencentcloud
 
 import (
 	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"log"
 
 	sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
@@ -23,8 +24,18 @@ func (me *SqlserverService) DescribeZones(ctx context.Context) (zoneInfoList []*
 				logId, request.GetAction(), request.ToJsonString(), errRet.Error())
 		}
 	}()
-	ratelimit.Check(request.GetAction())
-	response, err := me.client.UseSqlserverClient().DescribeZones(request)
+
+	var response *sqlserver.DescribeZonesResponse
+	err := resource.Retry(10*readRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		result, e := me.client.UseSqlserverClient().DescribeZones(request)
+		if e != nil {
+			log.Printf("[CRITAL]%s DescribeZones fail, reason:%s\n", logId, e.Error())
+			return retryError(e)
+		}
+		response = result
+		return nil
+	})
 	if err != nil {
 		errRet = err
 		return
@@ -46,8 +57,18 @@ func (me *SqlserverService) DescribeProductConfig(ctx context.Context, zone stri
 				logId, request.GetAction(), request.ToJsonString(), errRet.Error())
 		}
 	}()
-	ratelimit.Check(request.GetAction())
-	response, err := me.client.UseSqlserverClient().DescribeProductConfig(request)
+
+	var response *sqlserver.DescribeProductConfigResponse
+	err := resource.Retry(10*readRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		result, e := me.client.UseSqlserverClient().DescribeProductConfig(request)
+		if e != nil {
+			log.Printf("[CRITAL]%s DescribeProductConfig fail, reason:%s\n", logId, e.Error())
+			return retryError(e)
+		}
+		response = result
+		return nil
+	})
 	if err != nil {
 		errRet = err
 		return

website/docs/d/sqlserver_zone_config.html.markdown

@@ -3,12 +3,12 @@ layout: "tencentcloud"
 page_title: "TencentCloud: tencentcloud_sqlserver_zone_config"
 sidebar_current: "docs-tencentcloud-datasource-sqlserver_zone_config"
 description: |-
-  Use this data source to query purchasable specification configuration for each availability zone in this specific region. And a maximum of 20 requests can be initiated per second for this query.
+  Use this data source to query purchasable specification configuration for each availability zone in this specific region.
 ---
 
 # tencentcloud_sqlserver_zone_config
 
-Use this data source to query purchasable specification configuration for each availability zone in this specific region. And a maximum of 20 requests can be initiated per second for this query.
+Use this data source to query purchasable specification configuration for each availability zone in this specific region.
 
 ## Example Usage
 
@@ -30,7 +30,7 @@ In addition to all arguments above, the following attributes are exported:
 * `zone_list` - A list of availability zones. Each element contains the following attributes:
   * `availability_zone` - Alphabet ID of availability zone.
   * `specinfo_list` - A list of specinfo configurations for the specific availability zone. Each element contains the following attributes:
-    * `charge_type` - Billing mode under this specification. POST: pay-as-you-go, PRE: pay-before-you-go, ALL: both POST and PRE.
+    * `charge_type` - Billing mode under this specification. Invalid values are POSTPAID_BY_HOUR, PREPAID and ALL, means both POSTPAID_BY_HOUR and PREPAID.
     * `cpu` - Number of CPU cores.
     * `db_version_name` - Version name corresponding to the db_version field.
     * `db_version` - Database version information. Valid values: 2008R2 (SQL Server 2008 Enterprise), 2012SP3 (SQL Server 2012 Enterprise), 2016SP1 (SQL Server 2016 Enterprise), 201602 (SQL Server 2016 Standard), 2017 (SQL Server 2017 Enterprise).