add cls resource (#1817)

* add cls resource

* add changelog

Author: hellertang

.changelog/1817.txt

@@ -0,0 +1,15 @@
+```release-note:new-resource
+tencentcloud_cls_ckafka_consumer
+```
+
+```release-note:new-resource
+tencentcloud_cls_cos_recharge
+```
+
+```release-note:new-resource
+tencentcloud_cls_export
+```
+
+```release-note:new-data-source
+tencentcloud_cls_shipper_tasks
+```

go.mod

@@ -37,8 +37,8 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.634
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.599
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.658
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.662
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.663
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.663
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.572

go.sum

@@ -0,0 +1,206 @@
+/*
+Use this data source to query detailed information of cls shipper_tasks
+
+Example Usage
+
+```hcl
+data "tencentcloud_cls_shipper_tasks" "shipper_tasks" {
+  shipper_id = "dbde3c9b-ea16-4032-bc2a-d8fa65567a8e"
+  start_time = 160749910700
+  end_time = 160749910800
+}
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func dataSourceTencentCloudClsShipperTasks() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudClsShipperTasksRead,
+		Schema: map[string]*schema.Schema{
+			"shipper_id": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "shipper id.",
+			},
+
+			"start_time": {
+				Required:    true,
+				Type:        schema.TypeInt,
+				Description: "start time(ms).",
+			},
+
+			"end_time": {
+				Required:    true,
+				Type:        schema.TypeInt,
+				Description: "end time(ms).",
+			},
+
+			"tasks": {
+				Computed:    true,
+				Type:        schema.TypeList,
+				Description: ".",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"task_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "task id.",
+						},
+						"shipper_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "shipper id.",
+						},
+						"topic_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "topic id.",
+						},
+						"range_start": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "start time of current task (ms).",
+						},
+						"range_end": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "end time of current task (ms).",
+						},
+						"start_time": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "start time(ms).",
+						},
+						"end_time": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "end time(ms).",
+						},
+						"status": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "status of current shipper task.",
+						},
+						"message": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "detail info.",
+						},
+					},
+				},
+			},
+
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudClsShipperTasksRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_cls_shipper_tasks.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	paramMap := make(map[string]interface{})
+	if v, ok := d.GetOk("shipper_id"); ok {
+		paramMap["ShipperId"] = helper.String(v.(string))
+	}
+
+	if v, _ := d.GetOk("start_time"); v != nil {
+		paramMap["StartTime"] = helper.IntInt64(v.(int))
+	}
+
+	if v, _ := d.GetOk("end_time"); v != nil {
+		paramMap["EndTime"] = helper.IntInt64(v.(int))
+	}
+
+	service := ClsService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	var tasks []*cls.ShipperTaskInfo
+
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		result, e := service.DescribeClsShipperTasksByFilter(ctx, paramMap)
+		if e != nil {
+			return retryError(e)
+		}
+		tasks = result
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	ids := make([]string, 0, len(tasks))
+	tmpList := make([]map[string]interface{}, 0, len(tasks))
+
+	if tasks != nil {
+		for _, shipperTaskInfo := range tasks {
+			shipperTaskInfoMap := map[string]interface{}{}
+
+			if shipperTaskInfo.TaskId != nil {
+				shipperTaskInfoMap["task_id"] = shipperTaskInfo.TaskId
+			}
+
+			if shipperTaskInfo.ShipperId != nil {
+				shipperTaskInfoMap["shipper_id"] = shipperTaskInfo.ShipperId
+			}
+
+			if shipperTaskInfo.TopicId != nil {
+				shipperTaskInfoMap["topic_id"] = shipperTaskInfo.TopicId
+			}
+
+			if shipperTaskInfo.RangeStart != nil {
+				shipperTaskInfoMap["range_start"] = shipperTaskInfo.RangeStart
+			}
+
+			if shipperTaskInfo.RangeEnd != nil {
+				shipperTaskInfoMap["range_end"] = shipperTaskInfo.RangeEnd
+			}
+
+			if shipperTaskInfo.StartTime != nil {
+				shipperTaskInfoMap["start_time"] = shipperTaskInfo.StartTime
+			}
+
+			if shipperTaskInfo.EndTime != nil {
+				shipperTaskInfoMap["end_time"] = shipperTaskInfo.EndTime
+			}
+
+			if shipperTaskInfo.Status != nil {
+				shipperTaskInfoMap["status"] = shipperTaskInfo.Status
+			}
+
+			if shipperTaskInfo.Message != nil {
+				shipperTaskInfoMap["message"] = shipperTaskInfo.Message
+			}
+
+			ids = append(ids, *shipperTaskInfo.ShipperId)
+			tmpList = append(tmpList, shipperTaskInfoMap)
+		}
+
+		_ = d.Set("tasks", tmpList)
+	}
+
+	d.SetId(helper.DataResourceIdsHash(ids))
+	output, ok := d.GetOk("result_output_file")
+	if ok && output.(string) != "" {
+		if e := writeToFile(output.(string), tmpList); e != nil {
+			return e
+		}
+	}
+	return nil
+}

tencentcloud/data_source_tc_cls_shipper_tasks.go

@@ -0,0 +1,33 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccTencentCloudNeedFixClsShipperTasksDataSource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClsShipperTasksDataSource,
+				Check:  resource.ComposeTestCheckFunc(testAccCheckTencentCloudDataSourceID("data.tencentcloud_cls_shipper_tasks.shipper_tasks")),
+			},
+		},
+	})
+}
+
+const testAccClsShipperTasksDataSource = `
+
+data "tencentcloud_cls_shipper_tasks" "shipper_tasks" {
+  shipper_id = "dbde3c9b-ea16-4032-bc2a-d8fa65567a8e"
+  start_time = 160749910700
+  end_time = 160749910800
+}
+
+`

tencentcloud/data_source_tc_cls_shipper_tasks_test.go

@@ -862,6 +862,12 @@ Cloud Log Service(CLS)
 	tencentcloud_cls_index
 	tencentcloud_cls_alarm
 	tencentcloud_cls_alarm_notice
+	tencentcloud_cls_ckafka_consumer
+	tencentcloud_cls_cos_recharge
+	tencentcloud_cls_export
+
+  Data Source
+	tencentcloud_cls_shipper_tasks
 
 TencentCloud Lighthouse(Lighthouse)
   Resource
@@ -1724,6 +1730,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_lighthouse_instance_disk_num":              dataSourceTencentCloudLighthouseInstanceDiskNum(),
 			"tencentcloud_lighthouse_instance_blueprint":             dataSourceTencentCloudLighthouseInstanceBlueprint(),
 			"tencentcloud_lighthouse_disk_config":                    dataSourceTencentCloudLighthouseDiskConfig(),
+			"tencentcloud_cls_shipper_tasks":                         dataSourceTencentCloudClsShipperTasks(),
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
@@ -2064,6 +2071,9 @@ func Provider() *schema.Provider {
 			"tencentcloud_cls_index":                                     resourceTencentCloudClsIndex(),
 			"tencentcloud_cls_alarm":                                     resourceTencentCloudClsAlarm(),
 			"tencentcloud_cls_alarm_notice":                              resourceTencentCloudClsAlarmNotice(),
+			"tencentcloud_cls_ckafka_consumer":                           resourceTencentCloudClsCkafkaConsumer(),
+			"tencentcloud_cls_cos_recharge":                              resourceTencentCloudClsCosRecharge(),
+			"tencentcloud_cls_export":                                    resourceTencentCloudClsExport(),
 			"tencentcloud_lighthouse_instance":                           resourceTencentCloudLighthouseInstance(),
 			"tencentcloud_tem_environment":                               resourceTencentCloudTemEnvironment(),
 			"tencentcloud_tem_application":                               resourceTencentCloudTemApplication(),