tencentcloud_instances support instances_ids (#1126)

* tencentcloud_instances support instances_ids

* update docs

Author: hellertang

tencentcloud/data_source_tc_instances.go

@@ -58,6 +58,16 @@ func dataSourceTencentCloudInstances() *schema.Resource {
 				Optional:    true,
 				Description: "ID of a vpc subnetwork.",
 			},
+			"instance_set_ids": {
+				Type:          schema.TypeList,
+				Optional:      true,
+				MaxItems:      100,
+				ConflictsWith: []string{"instance_id", "instance_name", "availability_zone", "project_id", "vpc_id", "subnet_id", "tags"},
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "Instance set ids, max length is 100, conflict with other field.",
+			},
 			"tags": {
 				Type:        schema.TypeMap,
 				Optional:    true,
@@ -251,6 +261,8 @@ func dataSourceTencentCloudInstancesRead(d *schema.ResourceData, meta interface{
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 
+	var instanceSetIds []*string
+
 	filter := make(map[string]string)
 	if v, ok := d.GetOk("instance_id"); ok {
 		filter["instance-id"] = v.(string)
@@ -270,6 +282,10 @@ func dataSourceTencentCloudInstancesRead(d *schema.ResourceData, meta interface{
 	if v, ok := d.GetOk("subnet_id"); ok {
 		filter["subnet-id"] = v.(string)
 	}
+	if v, ok := d.GetOk("instance_set_ids"); ok {
+		instanceSetIds = helper.InterfacesStringsPoint(v.([]interface{}))
+	}
+
 	if v, ok := d.GetOk("tags"); ok {
 		for key, value := range v.(map[string]interface{}) {
 			filter["tag:"+key] = value.(string)
@@ -279,7 +295,7 @@ func dataSourceTencentCloudInstancesRead(d *schema.ResourceData, meta interface{
 	var instances []*cvm.Instance
 	var errRet error
 	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		instances, errRet = cvmService.DescribeInstanceByFilter(ctx, filter)
+		instances, errRet = cvmService.DescribeInstanceByFilter(ctx, instanceSetIds, filter)
 		if errRet != nil {
 			return retryError(errRet, InternalError)
 		}

tencentcloud/resource_tc_instance_test.go

@@ -33,7 +33,7 @@ func testSweepCvmInstance(region string) error {
 		client: client.apiV3Conn,
 	}
 
-	instances, err := cvmService.DescribeInstanceByFilter(ctx, nil)
+	instances, err := cvmService.DescribeInstanceByFilter(ctx, nil, nil)
 	if err != nil {
 		return fmt.Errorf("get instance list error: %s", err.Error())
 	}

tencentcloud/service_tencentcloud_cvm.go

@@ -77,16 +77,20 @@ func (me *CvmService) DescribeInstanceById(ctx context.Context, instanceId strin
 	return
 }
 
-func (me *CvmService) DescribeInstanceByFilter(ctx context.Context, filters map[string]string) (instances []*cvm.Instance, errRet error) {
+func (me *CvmService) DescribeInstanceByFilter(ctx context.Context, instancesId []*string, filters map[string]string) (instances []*cvm.Instance, errRet error) {
 	logId := getLogId(ctx)
 	request := cvm.NewDescribeInstancesRequest()
-	request.Filters = make([]*cvm.Filter, 0, len(filters))
-	for k, v := range filters {
-		filter := cvm.Filter{
-			Name:   helper.String(k),
-			Values: []*string{helper.String(v)},
+	if instancesId != nil {
+		request.InstanceIds = instancesId
+	} else {
+		request.Filters = make([]*cvm.Filter, 0, len(filters))
+		for k, v := range filters {
+			filter := cvm.Filter{
+				Name:   helper.String(k),
+				Values: []*string{helper.String(v)},
+			}
+			request.Filters = append(request.Filters, &filter)
 		}
-		request.Filters = append(request.Filters, &filter)
 	}
 
 	var offset int64 = 0

website/docs/d/instances.html.markdown

@@ -26,6 +26,7 @@ The following arguments are supported:
 * `availability_zone` - (Optional) The available zone that the CVM instance locates at.
 * `instance_id` - (Optional) ID of the instances to be queried.
 * `instance_name` - (Optional) Name of the instances to be queried.
+* `instance_set_ids` - (Optional) Instance set ids, max length is 100, conflict with other field.
 * `project_id` - (Optional) The project CVM belongs to.
 * `result_output_file` - (Optional) Used to save results.
 * `subnet_id` - (Optional) ID of a vpc subnetwork.