Merge pull request #494 from crab21/fix

remove parameter and optimize cdn data source.

Author: gailwang

CHANGELOG.md

@@ -10,6 +10,10 @@ FEATURES:
 * **New Data Source**: `tencentcloud_sqlserver_instance`
 * **New Data Source**: `tencentcloud_sqlserver_readonly_groups`
 
+DEPRECATED:
+
+* Data Source: `tencentcloud_cdn_domains` optional argument `offset` is no longer supported.
+
 ## 1.40.3 (August 11, 2020)
 
 ENHANCEMENTS:

tencentcloud/data_source_tc_cdn_domains.go

@@ -19,7 +19,6 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -57,13 +56,6 @@ func dataSourceTencentCloudCdnDomains() *schema.Resource {
 				ValidateFunc: validateAllowedStringValue(CDN_HTTPS_SWITCH),
 				Description:  "HTTPS configuration. The available value include `on`, `off` and `processing`.",
 			},
-			"offset": {
-				Type:         schema.TypeInt,
-				Optional:     true,
-				Default:      10,
-				ValidateFunc: validateIntegerInRange(1, 10000),
-				Description:  "Record offset. Default is 10.",
-			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -224,16 +216,18 @@ func dataSourceTencentCloudCdnDomains() *schema.Resource {
 
 func dataSourceTencentCloudCdnDomainsRead(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("data_source.tencentcloud_cdn_domain.read")()
+	var (
+		logId         = getLogId(contextNil)
+		ctx           = context.WithValue(context.TODO(), logIdKey, logId)
+		domainConfigs []*cdn.DetailDomain
+		err           error
 
-	logId := getLogId(contextNil)
-	ctx := context.WithValue(context.TODO(), logIdKey, logId)
-
-	client := meta.(*TencentCloudClient).apiV3Conn
-	region := client.Region
-	cdnService := CdnService{client: client}
-	tagService := TagService{client: client}
+		client     = meta.(*TencentCloudClient).apiV3Conn
+		region     = client.Region
+		cdnService = CdnService{client: client}
+		tagService = TagService{client: client}
+	)
 
-	offset, _ := d.Get("offset").(int)
 	var domainFilterMap = make(map[string]interface{}, 5)
 	if v, ok := d.GetOk("domain"); ok {
 		domainFilterMap["domain"] = v.(string)
@@ -258,18 +252,9 @@ func dataSourceTencentCloudCdnDomainsRead(d *schema.ResourceData, meta interface
 		domainFilterMap["fullUrlCache"] = value
 	}
 
-	var domainConfigs []*cdn.DetailDomain
-	var errRet error
-	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		domainConfigs, errRet = cdnService.DescribeDomainsConfigByFilters(ctx, domainFilterMap, int64(offset))
-		if errRet != nil {
-			return retryError(errRet, InternalError)
-		}
-		return nil
-	})
-
+	domainConfigs, err = cdnService.DescribeDomainsConfigByFilters(ctx, domainFilterMap)
 	if err != nil {
-		log.Printf("[CRITAL]%s describeDomainsConfigByFilters fail, reason:%s\n ", logId, err.Error())
+		log.Printf("[CRITAL]%s describeDomainsConfigByFilters fail, reason:%v ", logId, err)
 		return err
 	}
 
@@ -332,7 +317,7 @@ func dataSourceTencentCloudCdnDomainsRead(d *schema.ResourceData, meta interface
 	d.SetId(helper.DataResourceIdsHash(ids))
 	err = d.Set("domain_list", cdnDomainList)
 	if err != nil {
-		log.Printf("[CRITAL]%s provider set cdn domain list fail, reason:%s\n ", logId, err.Error())
+		log.Printf("[CRITAL]%s provider set cdn domain list fail, reason:%v ", logId, err)
 		return err
 	}
 	output, ok := d.GetOk("result_output_file")

tencentcloud/service_tencentcloud_cdn.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud/connectivity"
@@ -90,11 +91,16 @@ func (me *CdnService) StartDomain(ctx context.Context, domain string) error {
 }
 
 func (me *CdnService) DescribeDomainsConfigByFilters(ctx context.Context,
-	filterMap map[string]interface{},
-	leftNumber int64) (domainConfig []*cdn.DetailDomain, errRet error) {
+	filterMap map[string]interface{}) (domainConfig []*cdn.DetailDomain, errRet error) {
+
+	var (
+		logId         = getLogId(ctx)
+		request       = cdn.NewDescribeDomainsConfigRequest()
+		err           error
+		offset, limit int64 = 0, 100
+		response      *cdn.DescribeDomainsConfigResponse
+	)
 
-	logId := getLogId(ctx)
-	request := cdn.NewDescribeDomainsConfigRequest()
 	request.Filters = make([]*cdn.DomainFilter, 0, len(filterMap))
 
 	for k, v := range filterMap {
@@ -106,42 +112,37 @@ func (me *CdnService) DescribeDomainsConfigByFilters(ctx context.Context,
 		request.Filters = append(request.Filters, filter)
 	}
 
-	var offset, limit int64 = 0, 100
-needMoreDomains:
-	if leftNumber <= 0 {
-		return
-	}
-	if leftNumber < limit {
-		limit = leftNumber
-	}
-
 	request.Limit = &limit
 	request.Offset = &offset
 
-	ratelimit.Check(request.GetAction())
-	response, err := me.client.UseCdnClient().DescribeDomainsConfig(request)
-	if err != nil {
-		if sdkErr, ok := err.(*errors.TencentCloudSDKError); ok {
-			if sdkErr.Code == CDN_HOST_NOT_FOUND {
-				return
+	for {
+		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			ratelimit.Check(request.GetAction())
+			response, err = me.client.UseCdnClient().DescribeDomainsConfig(request)
+
+			if err != nil {
+				if sdkErr, ok := err.(*errors.TencentCloudSDKError); ok {
+					if sdkErr.Code == CDN_HOST_NOT_FOUND {
+						return nil
+					}
+				}
+				return retryError(err, InternalError)
 			}
+			return nil
+		})
+
+		if err != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%v]",
+				logId, request.GetAction(), request.ToJsonString(), err)
+			errRet = err
+			return
 		}
-		log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
-			logId, request.GetAction(), request.ToJsonString(), err.Error())
-		errRet = err
-		return
-	}
 
-	totalCount := *response.Response.TotalNumber
-	leftNumber = leftNumber - limit
-	offset += limit
-
-	if len(response.Response.Domains) > 0 {
 		domainConfig = append(domainConfig, response.Response.Domains...)
-	}
-
-	if leftNumber > 0 && totalCount-offset > 0 {
-		goto needMoreDomains
+		if len(response.Response.Domains) < int(limit) {
+			break
+		}
+		offset += limit
 	}
 	return
 }

website/docs/d/cdn_domains.html.markdown

@@ -29,7 +29,6 @@ The following arguments are supported:
 * `domain` - (Optional) Acceleration domain name.
 * `full_url_cache` - (Optional) Whether to enable full-path cache.
 * `https_switch` - (Optional) HTTPS configuration. The available value include `on`, `off` and `processing`.
-* `offset` - (Optional) Record offset. Default is 10.
 * `origin_pull_protocol` - (Optional) Origin-pull protocol configuration. The available value include `http`, `https` and `follow`.
 * `result_output_file` - (Optional) Used to save results.
 * `service_type` - (Optional) Service type of acceleration domain name. The available value include `web`, `download` and `media`.