remove redundancy code and add field

Author: crab21

tencentcloud/data_source_tc_cdn_domains.go

@@ -57,6 +57,13 @@ 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,
@@ -68,7 +75,7 @@ func dataSourceTencentCloudCdnDomains() *schema.Resource {
 				Description: "An information list of cdn domain. Each element contains the following attributes:",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"resource_id": {
+						"id": {
 							Type:        schema.TypeString,
 							Computed:    true,
 							Description: "Domain name ID.",
@@ -226,35 +233,35 @@ func dataSourceTencentCloudCdnDomainsRead(d *schema.ResourceData, meta interface
 	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)
 	}
 	if v, ok := d.GetOk("service_type"); ok {
-		domainFilterMap["service_type"] = v.(string)
+		domainFilterMap["serviceType"] = v.(string)
 	}
 	if v, ok := d.GetOk("https_switch"); ok {
-		domainFilterMap["https_switch"] = v.(string)
+		domainFilterMap["httpsSwitch"] = v.(string)
 	}
 	if v, ok := d.GetOk("origin_pull_protocol"); ok {
-		domainFilterMap["origin_pull_protocol"] = v.(string)
+		domainFilterMap["originPullProtocol"] = v.(string)
 	}
-	if v, ok := d.GetOk("full_url_cache"); ok {
+	if v, ok := d.GetOkExists("full_url_cache"); ok {
 		var value string
 		if v.(bool) {
 			value = "on"
 		} else {
 			value = "off"
 		}
 
-		domainFilterMap["full_url_cache"] = value
+		domainFilterMap["fullUrlCache"] = value
 	}
 
 	var domainConfigs []*cdn.DetailDomain
 	var errRet error
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		domainConfigs, errRet = cdnService.DescribeDomainsConfigByFilters(ctx, domainFilterMap)
+		domainConfigs, errRet = cdnService.DescribeDomainsConfigByFilters(ctx, domainFilterMap, int64(offset))
 		if errRet != nil {
 			return retryError(errRet, InternalError)
 		}
@@ -303,7 +310,7 @@ func dataSourceTencentCloudCdnDomainsRead(d *schema.ResourceData, meta interface
 		}
 
 		mapping := map[string]interface{}{
-			"resource_id":    detailDomain.ResourceId,
+			"id":             detailDomain.ResourceId,
 			"domain":         detailDomain.Domain,
 			"cname":          detailDomain.Cname,
 			"status":         detailDomain.Status,

tencentcloud/data_source_tc_cdn_domains_test.go

@@ -34,12 +34,6 @@ func TestAccTencentCloudCdnDomains(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "tags.test", "world"),
 				),
 			},
-			{
-				ResourceName:            "tencentcloud_cdn_domain.foo",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"https_config"},
-			},
 		},
 	})
 }

tencentcloud/service_tencentcloud_cdn.go

@@ -3,7 +3,6 @@ package tencentcloud
 import (
 	"context"
 	"log"
-	"strings"
 
 	cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
@@ -90,21 +89,35 @@ func (me *CdnService) StartDomain(ctx context.Context, domain string) error {
 	return nil
 }
 
-func (me *CdnService) DescribeDomainsConfigByFilters(ctx context.Context, filterMap map[string]interface{}) (domainConfig []*cdn.DetailDomain, errRet error) {
+func (me *CdnService) DescribeDomainsConfigByFilters(ctx context.Context,
+	filterMap map[string]interface{},
+	leftNumber int64) (domainConfig []*cdn.DetailDomain, errRet error) {
+
 	logId := getLogId(ctx)
 	request := cdn.NewDescribeDomainsConfigRequest()
 	request.Filters = make([]*cdn.DomainFilter, 0, len(filterMap))
 
 	for k, v := range filterMap {
 		value := v.(string)
-
 		filter := &cdn.DomainFilter{
-			Name:  helper.String(underlineToHump([]byte(k))),
+			Name:  helper.String(k),
 			Value: []*string{&value},
 		}
 		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 {
@@ -119,25 +132,16 @@ func (me *CdnService) DescribeDomainsConfigByFilters(ctx context.Context, filter
 		return
 	}
 
+	totalCount := *response.Response.TotalNumber
+	leftNumber = leftNumber - limit
+	offset += limit
+
 	if len(response.Response.Domains) > 0 {
-		domainConfig = response.Response.Domains
+		domainConfig = append(domainConfig, response.Response.Domains...)
 	}
-	return
-}
 
-func underlineToHump(underline []byte) (humpValue string) {
-	lenUnderLine := len(underline)
-	for i := 0; i < lenUnderLine; i++ {
-		if string(underline[i]) == "_" {
-			if i+1 < lenUnderLine {
-				humpValue += strings.ToUpper(string(underline[i+1]))
-				i++
-			}
-			continue
-		}
-
-		humpValue += string(underline[i])
+	if leftNumber > 0 && totalCount-offset > 0 {
+		goto needMoreDomains
 	}
-
 	return
 }

website/docs/d/cdn_domains.html.markdown

@@ -29,6 +29,7 @@ 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`.
@@ -49,6 +50,7 @@ In addition to all arguments above, the following attributes are exported:
     * `ocsp_stapling_switch` - OCSP configuration switch.
     * `spdy_switch` - Spdy configuration switch.
     * `verify_client` - Client certificate authentication feature.
+  * `id` - Domain name ID.
   * `origin` - Origin server configuration.
     * `backup_origin_list` - Backup origin server list.
     * `backup_origin_type` - Backup origin server type.
@@ -59,7 +61,6 @@ In addition to all arguments above, the following attributes are exported:
     * `origin_type` - Master origin server type.
     * `server_name` - Host header used when accessing the master origin server. If left empty, the acceleration domain name will be used by default.
   * `project_id` - The project CDN belongs to.
-  * `resource_id` - Domain name ID.
   * `service_type` - Service type of acceleration domain name.
   * `status` - Acceleration service status.
   * `tags` - Tags of cdn domain.