Feat/support dts resource (#1845)

* update node pool import doc

* add code

* add docs

* fix typo

* update doc

Author: lyu571

.changelog/1845.txt

@@ -0,0 +1,11 @@
+```release-note:new-resource
+tencentcloud_dts_sync_config
+```
+
+```release-note:new-data-source
+tencentcloud_dts_migrate_db_instances
+```
+
+```release-note:enhancement
+resource/tencentcloud_cynosdb_cluster: adjust the delete logic
+```

tencentcloud/data_source_tc_dts_migrate_db_instances.go

@@ -0,0 +1,254 @@
+/*
+Use this data source to query detailed information of dts migrate_db_instances
+
+Example Usage
+
+```hcl
+data "tencentcloud_dts_migrate_db_instances" "migrate_db_instances" {
+  database_type = "mysql"
+  migrate_role = "src"
+  instance_id = "cdb-ffulb2sg"
+  instance_name = "cdb_test"
+  limit = 10
+  offset = 10
+  account_mode = "self"
+  tmp_secret_id = "AKIDvBDyVmna9TadcS4YzfBZmkU5TbX12345"
+  tmp_secret_key = "ZswjGWWHm24qMeiX6QUJsELDpC12345"
+  tmp_token = "JOqqCPVuWdNZvlVDLxxx"
+      }
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	dts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts/v20211206"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func dataSourceTencentCloudDtsMigrateDbInstances() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceTencentCloudDtsMigrateDbInstancesRead,
+		Schema: map[string]*schema.Schema{
+			"database_type": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "Database type.",
+			},
+
+			"migrate_role": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "Whether the instance is the migration source or destination,src(for source), dst(for destination).",
+			},
+
+			"instance_id": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "Database instance id.",
+			},
+
+			"instance_name": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "Database instance name.",
+			},
+
+			"limit": {
+				Optional:    true,
+				Type:        schema.TypeInt,
+				Description: "Limit.",
+			},
+
+			"offset": {
+				Optional:    true,
+				Type:        schema.TypeInt,
+				Description: "Offset.",
+			},
+
+			"account_mode": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "The owning account of the resource is null or self(resources in the self account), other(resources in the other account).",
+			},
+
+			"tmp_secret_id": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "temporary secret id, used across account.",
+			},
+
+			"tmp_secret_key": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "temporary secret key, used across account.",
+			},
+
+			"tmp_token": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "temporary token, used across account.",
+			},
+
+			"instances": {
+				Computed:    true,
+				Type:        schema.TypeList,
+				Description: "Instance list.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"instance_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Instance Id.",
+						},
+						"instance_name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Database instance name.",
+						},
+						"vip": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Instance vip.",
+						},
+						"vport": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Instance port.",
+						},
+						"usable": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Can used in migration, 1-yes, 0-no.",
+						},
+						"hint": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The reason of can't used in migration.",
+						},
+					},
+				},
+			},
+
+			"request_id": {
+				Computed:    true,
+				Type:        schema.TypeString,
+				Description: "Unique request id, provide this when encounter a problem.",
+			},
+
+			"result_output_file": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Used to save results.",
+			},
+		},
+	}
+}
+
+func dataSourceTencentCloudDtsMigrateDbInstancesRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_dts_migrate_db_instances.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("database_type"); ok {
+		paramMap["DatabaseType"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("migrate_role"); ok {
+		paramMap["MigrateRole"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("instance_id"); ok {
+		paramMap["InstanceId"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("instance_name"); ok {
+		paramMap["InstanceName"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("account_mode"); ok {
+		paramMap["AccountMode"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("tmp_secret_id"); ok {
+		paramMap["TmpSecretId"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("tmp_secret_key"); ok {
+		paramMap["TmpSecretKey"] = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("tmp_token"); ok {
+		paramMap["TmpToken"] = helper.String(v.(string))
+	}
+
+	service := DtsService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	var instances []*dts.MigrateDBItem
+
+	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+		result, e := service.DescribeDtsMigrateDbInstancesByFilter(ctx, paramMap)
+		if e != nil {
+			return retryError(e)
+		}
+		instances = result
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	ids := make([]string, 0, len(instances))
+	tmpList := make([]map[string]interface{}, 0, len(instances))
+
+	if instances != nil {
+		for _, migrateDBItem := range instances {
+			migrateDBItemMap := map[string]interface{}{}
+
+			if migrateDBItem.InstanceId != nil {
+				migrateDBItemMap["instance_id"] = migrateDBItem.InstanceId
+			}
+
+			if migrateDBItem.InstanceName != nil {
+				migrateDBItemMap["instance_name"] = migrateDBItem.InstanceName
+			}
+
+			if migrateDBItem.Vip != nil {
+				migrateDBItemMap["vip"] = migrateDBItem.Vip
+			}
+
+			if migrateDBItem.Vport != nil {
+				migrateDBItemMap["vport"] = migrateDBItem.Vport
+			}
+
+			if migrateDBItem.Usable != nil {
+				migrateDBItemMap["usable"] = migrateDBItem.Usable
+			}
+
+			if migrateDBItem.Hint != nil {
+				migrateDBItemMap["hint"] = migrateDBItem.Hint
+			}
+
+			ids = append(ids, *migrateDBItem.InstanceId)
+			tmpList = append(tmpList, migrateDBItemMap)
+		}
+
+		_ = d.Set("instances", 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_dts_migrate_db_instances_test.go

@@ -0,0 +1,39 @@
+package tencentcloud
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccTencentCloudDtsMigrateDbInstancesDataSource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDtsMigrateDbInstancesDataSource,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTencentCloudDataSourceID("data.tencentcloud_dts_migrate_db_instances.migrate_db_instances")),
+			},
+		},
+	})
+}
+
+const testAccDtsMigrateDbInstancesDataSource = CommonPresetMysql + `
+
+data "tencentcloud_dts_migrate_db_instances" "migrate_db_instances" {
+  database_type = "mysql"
+  migrate_role = "src"
+  instance_id = local.mysql_id
+  instance_name = "test"
+  account_mode = "self"
+  tmp_secret_id = "AKIDvBDyVmna9TadcS4YzfBZmkU5TbX12345"
+  tmp_secret_key = "ZswjGWWHm24qMeiX6QUJsELDpC12345"
+  tmp_token = "JOqqCPVuWdNZvlVDLxxx"
+}
+
+`

tencentcloud/provider.go

@@ -1194,6 +1194,7 @@ Data Transmission Service(DTS)
 	tencentcloud_dts_sync_jobs
 	tencentcloud_dts_migrate_jobs
 	tencentcloud_dts_compare_tasks
+	tencentcloud_dts_migrate_db_instances
 
   Resource
 	tencentcloud_dts_sync_job
@@ -1204,6 +1205,7 @@ Data Transmission Service(DTS)
 	tencentcloud_dts_migrate_job_resume_operation
 	tencentcloud_dts_compare_task_stop_operation
 	tencentcloud_dts_migrate_job_config
+	tencentcloud_dts_sync_config
 
 TDMQ for RocketMQ(trocket)
   Data Source
@@ -1805,6 +1807,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_dts_sync_jobs":                             dataSourceTencentCloudDtsSyncJobs(),
 			"tencentcloud_dts_compare_tasks":                         dataSourceTencentCloudDtsCompareTasks(),
 			"tencentcloud_dts_migrate_jobs":                          dataSourceTencentCloudDtsMigrateJobs(),
+			"tencentcloud_dts_migrate_db_instances":                  dataSourceTencentCloudDtsMigrateDbInstances(),
 			"tencentcloud_tdmq_rocketmq_cluster":                     dataSourceTencentCloudTdmqRocketmqCluster(),
 			"tencentcloud_tdmq_rocketmq_namespace":                   dataSourceTencentCloudTdmqRocketmqNamespace(),
 			"tencentcloud_tdmq_rocketmq_topic":                       dataSourceTencentCloudTdmqRocketmqTopic(),
@@ -2344,6 +2347,7 @@ func Provider() *schema.Provider {
 			"tencentcloud_rum_whitelist":                              resourceTencentCloudRumWhitelist(),
 			"tencentcloud_rum_offline_log_config_attachment":          resourceTencentCloudRumOfflineLogConfigAttachment(),
 			"tencentcloud_dts_sync_job":                               resourceTencentCloudDtsSyncJob(),
+			"tencentcloud_dts_sync_config":                            resourceTencentCloudDtsSyncConfig(),
 			"tencentcloud_tdmq_rocketmq_cluster":                      resourceTencentCloudTdmqRocketmqCluster(),
 			"tencentcloud_tdmq_rocketmq_namespace":                    resourceTencentCloudTdmqRocketmqNamespace(),
 			"tencentcloud_tdmq_rocketmq_role":                         resourceTencentCloudTdmqRocketmqRole(),

tencentcloud/resource_tc_cynosdb_cluster.go

@@ -64,6 +64,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"time"
 
 	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 
@@ -220,6 +221,11 @@ func resourceTencentCloudCynosdbClusterCreate(d *schema.ResourceData, meta inter
 		dealRes, err = meta.(*TencentCloudClient).apiV3Conn.UseCynosdbClient().DescribeResourcesByDealName(dealReq)
 		if err != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, reason:%s", logId, request.GetAction(), err.Error())
+			if sdkErr, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
+				if sdkErr.Code == "InvalidParameterValue.DealNameNotFound" {
+					return resource.RetryableError(fmt.Errorf("DealName[%s] Not Found, retry... reason: %s", *dealName, err.Error()))
+				}
+			}
 			return retryError(err)
 		}
 		return nil
@@ -742,10 +748,22 @@ func resourceTencentCloudCynosdbClusterDelete(d *schema.ResourceData, meta inter
 		return err
 	}
 
+	conf := BuildStateChangeConf([]string{}, []string{"isolated"}, 2*readRetryTimeout, time.Second, cynosdbService.CynosdbInstanceIsolateStateRefreshFunc(d.Id(), []string{}))
+
+	if _, e := conf.WaitForState(); e != nil {
+		return e
+	}
+
 	if forceDelete {
 		if err = cynosdbService.OfflineCluster(ctx, clusterID); err != nil {
 			return err
 		}
+
+		conf := BuildStateChangeConf([]string{}, []string{"offlined"}, 2*readRetryTimeout, time.Second, cynosdbService.CynosdbInstanceOfflineStateRefreshFunc(d.Id(), []string{}))
+
+		if _, e := conf.WaitForState(); e != nil {
+			return e
+		}
 	}
 
 	return nil