update (#3168)

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

schema/filter.json

@@ -52,21 +52,20 @@
                                     "required": true,
                                     "description": "域名."
                                 },
-                                "sub_domain": {
-                                    "type": "string",
+                                "sub_domains": {
+                                    "type": "set_string",
                                     "metadata": {
-                                        "filter": {
-                                            "enable": true
-                                        },
-                                        "widget": "text",
+                                        "widget": "textarea",
                                         "val_source": {
                                             "values": {}
                                         },
-                                        "description": "主机记录, 默认值为 @.",
-                                        "display_name": "主机记录"
+                                        "display_name": "主机记录",
+                                        "delimiter": "[\\s\n,;]",
+                                        "help": "多个描述以英文逗号、英文分号、空格或换行分割，最多10个，重复将去重",
+                                        "description": "主机记录列表, 默认值为 @."
                                     },
                                     "optional": true,
-                                    "description": "主机记录, 默认值为 @."
+                                    "description": "主机记录列表, 默认值为 @."
                                 },
                                 "is_exact_sub_domain": {
                                     "type": "bool",

tencentcloud/services/dnspod/data_source_tc_dnspod_record_list.go

@@ -2,6 +2,7 @@ package dnspod
 
 import (
 	"context"
+	"fmt"
 
 	tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
 
@@ -488,8 +489,7 @@ func dataSourceTencentCloudDnspodRecordListRead(d *schema.ResourceData, meta int
 
 	var recordList []*dnspod.RecordListItem
 
-	for _, subDomain := range subDomains {
-		paramMap["SubDomain"] = helper.String(subDomain)
+	if len(subDomains) == 0 {
 		err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
 			result, e := service.DescribeDnspodRecordListByFilter(ctx, paramMap)
 			if e != nil {
@@ -501,6 +501,34 @@ func dataSourceTencentCloudDnspodRecordListRead(d *schema.ResourceData, meta int
 		if err != nil {
 			return err
 		}
+	} else {
+		recordIds := map[uint64]struct{}{}
+
+		for _, subDomain := range subDomains {
+			paramMap["SubDomain"] = helper.String(subDomain)
+			err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
+				result, e := service.DescribeDnspodRecordListByFilter(ctx, paramMap)
+				if e != nil {
+					return tccommon.RetryError(e)
+				}
+				for _, resultItem := range result {
+					if resultItem.RecordId == nil {
+						return resource.NonRetryableError(fmt.Errorf("record id is nil"))
+					}
+					if _, ok := recordIds[*resultItem.RecordId]; ok {
+						continue
+					} else {
+						recordIds[*resultItem.RecordId] = struct{}{}
+						recordList = append(recordList, resultItem)
+					}
+				}
+
+				return nil
+			})
+			if err != nil {
+				return err
+			}
+		}
 	}
 
 	ids := make([]string, 0, len(recordList))

tencentcloud/services/dnspod/data_source_tc_dnspod_record_list_test.go

@@ -40,6 +40,24 @@ func TestAccTencentCloudDnspodRecordListDataSource_subDomains(t *testing.T) {
 	})
 }
 
+func TestAccTencentCloudDnspodRecordListDataSource_withoutSubDomain(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { tcacctest.AccPreCheck(t) },
+		Providers: tcacctest.AccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDnspodRecordListDataSource_withoutSubDomain,
+				Check: resource.ComposeTestCheckFunc(
+					tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_dnspod_record_list.subdomains"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_dnspod_record_list.subdomains", "record_list.#"),
+					resource.TestCheckResourceAttrSet("data.tencentcloud_dnspod_record_list.subdomains", "instance_list.#"),
+				),
+			},
+		},
+	})
+}
+
 const testAccDnspodRecordListDataSource = `
 
 data "tencentcloud_dnspod_record_list" "record_list" {
@@ -76,3 +94,10 @@ data "tencentcloud_dnspod_record_list" "subdomains" {
   sub_domains          = ["tes1029","tes103"]
 }
 `
+
+const testAccDnspodRecordListDataSource_withoutSubDomain = `
+data "tencentcloud_dnspod_record_list" "subdomains" {
+  domain              = "mikatong.xyz"
+  is_exact_sub_domain = true
+}
+`

tencentcloud/services/dnspod/service_tencentcloud_dnspod.go

@@ -527,7 +527,7 @@ func (me *DnspodService) DescribeDnspodRecordListByFilter(ctx context.Context, p
 
 	var (
 		offset uint64 = 0
-		limit  uint64 = 20
+		limit  uint64 = 1000
 	)
 	for {
 		request.Offset = &offset