[fix some format and add cluster_id filter for datasource instance]

1. fix some format issue
2. add cluster_id filter for datasource instance

Author: brickzzhang

examples/tencentcloud-cynosdb/main.tf

@@ -13,7 +13,7 @@ resource "tencentcloud_cynosdb_cluster" "foo" {
   password                     = "cynos@123"
   instance_maintain_duration   = 7200
   instance_maintain_start_time = 10800
-  instance_maintain_weekdays = [
+  instance_maintain_weekdays   = [
     "Fri",
     "Mon",
     "Sat",
@@ -49,7 +49,7 @@ resource "tencentcloud_cynosdb_readonly_instance" "foo" {
 
   instance_maintain_duration   = 3600
   instance_maintain_start_time = 10800
-  instance_maintain_weekdays = [
+  instance_maintain_weekdays   = [
     "Fri",
     "Mon",
     "Sat",

tencentcloud/data_source_tc_cynosdb_clusters.go

@@ -5,9 +5,9 @@ Example Usage
 
 ```hcl
 data "tencentcloud_cynosdb_clusters" "foo" {
-  cluster_id         = "cynosdbmysql-dzj5l8gz"
-  project_id = 0
-  db_type = "MYSQL"
+  cluster_id   = "cynosdbmysql-dzj5l8gz"
+  project_id   = 0
+  db_type      = "MYSQL"
   cluster_name = "test"
 }
 ```

tencentcloud/data_source_tc_cynosdb_clusters_test.go

@@ -39,9 +39,9 @@ func TestAccTencentCloudCynosdbClustersDataSource_full(t *testing.T) {
 func testAccCynosdbClusterstDataSource_full() string {
 	return testAccCynosdbCluster + `
 data "tencentcloud_cynosdb_clusters" "cluster_full" {
-  cluster_id         = tencentcloud_cynosdb_cluster.foo.id
-  project_id = 0
-  db_type = "MYSQL"
+  cluster_id   = tencentcloud_cynosdb_cluster.foo.id
+  project_id   = 0
+  db_type      = "MYSQL"
   cluster_name = "tf-cynosdb"
 }`
 }

tencentcloud/data_source_tc_cynosdb_instances.go

@@ -5,9 +5,9 @@ Example Usage
 
 ```hcl
 data "tencentcloud_cynosdb_instances" "foo" {
-  instance_id         = "cynosdbmysql-ins-0wln9u6w"
-  project_id = 0
-  db_type = "MYSQL"
+  instance_id   = "cynosdbmysql-ins-0wln9u6w"
+  project_id    = 0
+  db_type       = "MYSQL"
   instance_name = "test"
 }
 ```
@@ -34,6 +34,11 @@ func dataSourceTencentCloudCynosdbInstances() *schema.Resource {
 				Optional:    true,
 				Description: "Type of CynosDB, and available values include `MYSQL`, `POSTGRESQL`.",
 			},
+			"cluster_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "ID of the cluster.",
+			},
 			"instance_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -128,6 +133,10 @@ func dataSourceTencentCloudCynosdbInstancesRead(d *schema.ResourceData, meta int
 	if v, ok := d.GetOkExists("project_id"); ok {
 		params["ProjectId"] = fmt.Sprintf("%d", v.(int))
 	}
+	var clusterId string
+	if v, ok := d.GetOk("cluster_id"); ok {
+		clusterId = v.(string)
+	}
 
 	cynosdbService := CynosdbService{
 		client: meta.(*TencentCloudClient).apiV3Conn,
@@ -141,6 +150,10 @@ func dataSourceTencentCloudCynosdbInstancesRead(d *schema.ResourceData, meta int
 		ids := make([]string, 0, len(instances))
 		instanceList := make([]map[string]interface{}, 0, len(instances))
 		for _, instance := range instances {
+			if clusterId != "" && *instance.ClusterId != clusterId {
+				continue
+			}
+
 			mapping := map[string]interface{}{
 				"cluster_id":            instance.ClusterId,
 				"instance_id":           instance.InstanceId,

tencentcloud/data_source_tc_cynosdb_instances_test.go

@@ -34,9 +34,10 @@ func TestAccTencentCloudCynosdbInstancesDataSource_full(t *testing.T) {
 func testAccCynosdbInstancestDataSource_full() string {
 	return testAccCynosdbReadonlyInstance + `
 data "tencentcloud_cynosdb_instances" "instances" {
-  instance_id         = tencentcloud_cynosdb_readonly_instance.foo.id
-  project_id = 0
-  db_type = "MYSQL"
+  instance_id   = tencentcloud_cynosdb_readonly_instance.foo.id
+  project_id    = 0
+  db_type       = "MYSQL"
+  cluster_id    = tencentcloud_cynosdb_readonly_instance.foo.cluster_id
   instance_name = "tf-cynosdb-readonly-instance"
 }`
 }

website/docs/d/cynosdb_instances.html.markdown

@@ -26,6 +26,7 @@ data "tencentcloud_cynosdb_instances" "foo" {
 
 The following arguments are supported:
 
+* `cluster_id` - (Optional) ID of the cluster.
 * `db_type` - (Optional) Type of CynosDB, and available values include `MYSQL`, `POSTGRESQL`.
 * `instance_id` - (Optional) ID of the Cynosdb instance to be queried.
 * `instance_name` - (Optional) Name of the Cynosdb instance to be queried.