modify test (#1961)

* modify test

* fix: modify bin_log

* feat: support tencentcloud_mysql_isolate_instance

* feat: add changelog

* fix: modify bin_log

---------

Co-authored-by: anonymous <anonymous@mail.org>

Author: gitmkn

.changelog/1961.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_mysql_isolate_instance
+```

tencentcloud/data_source_tc_mysql_bin_log.go

@@ -230,7 +230,7 @@ func dataSourceTencentCloudMysqlBinLogRead(d *schema.ResourceData, meta interfac
 					remoteInfoMap := map[string]interface{}{}
 
 					if remoteInfo.SubBackupId != nil {
-						remoteInfoMap["sub_backup_id"] = remoteInfo.SubBackupId
+						remoteInfoMap["sub_backup_id"] = []interface{}{remoteInfo.SubBackupId}
 					}
 
 					if remoteInfo.Region != nil {

tencentcloud/data_source_tc_mysql_slow_log_data_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 // go test -i; go test -test.run TestAccTencentCloudMysqlSlowLogDataDataSource_basic -v
-func TestAccTencentCloudMysqlSlowLogDataDataSource_basic(t *testing.T) {
+func TestAccTencentCloudNeedFixMysqlSlowLogDataDataSource_basic(t *testing.T) {
 	t.Parallel()
 
 	startTime := time.Now().AddDate(0, 0, -29).Unix()

tencentcloud/data_source_tc_mysql_switch_record.go

@@ -73,7 +73,7 @@ func dataSourceTencentCloudMysqlSwitchRecordRead(d *schema.ResourceData, meta in
 
 	service := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
 	var items []*cdb.DBSwitchInfo
-	err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+	err := resource.Retry(5*readRetryTimeout, func() *resource.RetryError {
 		result, e := service.DescribeMysqlSwitchRecordById(ctx, instanceId)
 		if e != nil {
 			return retryError(e)

tencentcloud/provider.go

@@ -654,6 +654,7 @@ TencentDB for MySQL(cdb)
 	tencentcloud_mysql_reload_balance_proxy_node
 	tencentcloud_mysql_ro_start_replication
 	tencentcloud_mysql_ro_stop_replication
+	tencentcloud_mysql_isolate_instance
 
 Cloud Monitor(Monitor)
   Data Source

tencentcloud/resource_tc_mysql_db_import_job_operation_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlDbImportJobOperationResource_basic -v
 func TestAccTencentCloudMysqlDbImportJobOperationResource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -54,13 +55,21 @@ resource "tencentcloud_mysql_instance" "this" {
 	}
 }
 
+resource "tencentcloud_cos_bucket_object" "object_content" {
+	bucket       = "terraform-ci-1308919341"
+	key          = "/mysql/mysql.sql"
+	content      = "SELECT NOW(),SYSDATE();"
+	content_type = "binary/octet-stream"
+	acl 		 = "public-read"
+  }
+
 resource "tencentcloud_mysql_db_import_job_operation" "db_import_job" {
 	instance_id = tencentcloud_mysql_instance.this.id
 	user = "root"
 	file_name = "mysql.sql"
 	password = "password123"
 	# db_name = "t_test"
-	cos_url = "https://terraform-ci-1308919341.cos.ap-guangzhou.myqcloud.com/mysql/mysql.sql?q-sign-algorithm=sha1&q-ak=AKIDlchzcM5ppPlbSV7yhstd8narnfMtVzZRQsayiPEzHxN5pb5UDeOL2yrNqwn2Yztr&q-sign-time=1684998880;1685002480&q-key-time=1684998880;1685002480&q-header-list=host&q-url-param-list=&q-signature=b7e6165f971009fc3628eca370b9c784269cb948&x-cos-security-token=bF2h2255ZhdpmBoYFCFme0eH2h2wDJPa75147a141a51a01e7e7c49b25de5baa3r9JfJvPSQ-zrBNd5wWgKPO8slY1_PK34fw-6oxLB6EnUez5quPhZ2bPGjZ9Wmktp3st44c-0zipO4MFoQw5ZQYLuezMrpfgejRtgzcMA6xg9vAjfhYnDEmGLbAirarpWmjNotia7Xgo0sr6hVjz7pcOXhs327895IjQDQrnYMw4CcZYaekjm7sEv51XqK5V5"
-  }
+	cos_url = "https://terraform-ci-1308919341.cos.ap-guangzhou.myqcloud.com${tencentcloud_cos_bucket_object.object_content.key}"
+}
 
 `

tencentcloud/resource_tc_mysql_isolate_instance.go

@@ -5,17 +5,10 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_mysql_isolate_instance" "isolate_instance" {
-  instance_id = "cdb-c1nl9rpv"
+  instance_id = "cdb-1tru99al"
+  operate     = "recover"
 }
 ```
-
-Import
-
-mysql isolate_instance can be imported using the id, e.g.
-
-```
-terraform import tencentcloud_mysql_isolate_instance.isolate_instance isolate_instance_id
-```
 */
 package tencentcloud
 
@@ -27,17 +20,17 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	mysql "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb/v20170320"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 )
 
 func resourceTencentCloudMysqlIsolateInstance() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceTencentCloudMysqlIsolateInstanceCreate,
 		Read:   resourceTencentCloudMysqlIsolateInstanceRead,
+		Update: resourceTencentCloudMysqlIsolateInstanceUpdate,
 		Delete: resourceTencentCloudMysqlIsolateInstanceDelete,
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
+
 		Schema: map[string]*schema.Schema{
 			"instance_id": {
 				Required:    true,
@@ -46,9 +39,16 @@ func resourceTencentCloudMysqlIsolateInstance() *schema.Resource {
 				Description: "Instance ID, the format is: cdb-c1nl9rpv, which is the same as the instance ID displayed on the cloud database console page, and you can use the [query instance list] (https://cloud.tencent.com/document/api/236/15872) interface Gets the value of the field InstanceId in the output parameter.",
 			},
 
+			"operate": {
+				Required:     true,
+				Type:         schema.TypeString,
+				ValidateFunc: validateAllowedStringValue([]string{"isolate", "recover"}),
+				Description:  "Manipulate instance, `isolate` - isolate instance, `recover`- recover isolated instance.",
+			},
+
 			"status": {
 				Computed:    true,
-				Type:        schema.TypeString,
+				Type:        schema.TypeInt,
 				Description: "Instance status.",
 			},
 		},
@@ -59,74 +59,28 @@ func resourceTencentCloudMysqlIsolateInstanceCreate(d *schema.ResourceData, meta
 	defer logElapsed("resource.tencentcloud_mysql_isolate_instance.create")()
 	defer inconsistentCheck(d, meta)()
 
-	logId := getLogId(contextNil)
-	ctx := context.WithValue(context.TODO(), logIdKey, logId)
-
-	var (
-		request    = mysql.NewIsolateDBInstanceRequest()
-		response   = mysql.NewIsolateDBInstanceResponse()
-		instanceId string
-	)
+	var instanceId string
 	if v, ok := d.GetOk("instance_id"); ok {
 		instanceId = v.(string)
-		request.InstanceId = helper.String(v.(string))
-	}
-
-	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
-		result, e := meta.(*TencentCloudClient).apiV3Conn.UseMysqlClient().IsolateDBInstance(request)
-		if e != nil {
-			return retryError(e)
-		} else {
-			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
-		}
-		response = result
-		return nil
-	})
-	if err != nil {
-		log.Printf("[CRITAL]%s create mysql isolateInstance failed, reason:%+v", logId, err)
-		return err
 	}
 
 	d.SetId(instanceId)
 
-	asyncRequestId := *response.Response.AsyncRequestId
-	service := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
-	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
-		taskStatus, message, err := service.DescribeAsyncRequestInfo(ctx, asyncRequestId)
-		if err != nil {
-			return resource.NonRetryableError(err)
-		}
-		if taskStatus == MYSQL_TASK_STATUS_SUCCESS {
-			return nil
-		}
-		if taskStatus == MYSQL_TASK_STATUS_INITIAL || taskStatus == MYSQL_TASK_STATUS_RUNNING {
-			return resource.RetryableError(fmt.Errorf("%s create mysql isolateInstance status is %s", instanceId, taskStatus))
-		}
-		err = fmt.Errorf("%s create mysql isolateInstance is %s,we won't wait for it finish ,it show message:%s", instanceId, taskStatus, message)
-		return resource.NonRetryableError(err)
-	})
-
-	if err != nil {
-		log.Printf("[CRITAL]%s create mysql isolateInstance fail, reason:%s\n ", logId, err.Error())
-		return err
-	}
-
-	return resourceTencentCloudMysqlIsolateInstanceRead(d, meta)
+	return resourceTencentCloudMysqlIsolateInstanceUpdate(d, meta)
 }
 
 func resourceTencentCloudMysqlIsolateInstanceRead(d *schema.ResourceData, meta interface{}) error {
 	defer logElapsed("resource.tencentcloud_mysql_isolate_instance.read")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
-
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
 	service := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
 
 	instanceId := d.Id()
 
-	isolateInstance, err := service.DescribeIsolatedDBInstanceById(ctx, instanceId)
+	isolateInstance, err := service.DescribeDBInstanceById(ctx, instanceId)
 	if err != nil {
 		return err
 	}
@@ -148,19 +102,103 @@ func resourceTencentCloudMysqlIsolateInstanceRead(d *schema.ResourceData, meta i
 	return nil
 }
 
-func resourceTencentCloudMysqlIsolateInstanceDelete(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("resource.tencentcloud_mysql_isolate_instance.delete")()
+func resourceTencentCloudMysqlIsolateInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_mysql_isolate_instance.update")()
 	defer inconsistentCheck(d, meta)()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
-	service := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
 	instanceId := d.Id()
 
-	if err := service.DeleteMysqlIsolateInstanceById(ctx, instanceId); err != nil {
-		return err
+	var operate string
+	if v, ok := d.GetOk("operate"); ok {
+		operate = v.(string)
+	}
+
+	if operate == "isolate" {
+		request := mysql.NewIsolateDBInstanceRequest()
+		request.InstanceId = helper.String(instanceId)
+		err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			result, e := meta.(*TencentCloudClient).apiV3Conn.UseMysqlClient().IsolateDBInstance(request)
+			if e != nil {
+				return retryError(e)
+			} else {
+				log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[CRITAL]%s create mysql isolateInstance failed, reason:%+v", logId, err)
+			return err
+		}
+
+		service := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
+		err = resource.Retry(7*readRetryTimeout, func() *resource.RetryError {
+			mysqlInfo, err := service.DescribeDBInstanceById(ctx, instanceId)
+
+			if err != nil {
+				if _, ok := err.(*errors.TencentCloudSDKError); !ok {
+					return resource.RetryableError(err)
+				} else {
+					return resource.NonRetryableError(err)
+				}
+			}
+			if mysqlInfo == nil {
+				return nil
+			}
+			if *mysqlInfo.Status == MYSQL_STATUS_ISOLATING || *mysqlInfo.Status == MYSQL_STATUS_RUNNING {
+				return resource.RetryableError(fmt.Errorf("mysql isolating."))
+			}
+			if *mysqlInfo.Status == MYSQL_STATUS_ISOLATED {
+				return nil
+			}
+			return resource.NonRetryableError(fmt.Errorf("after IsolateDBInstance mysql Status is %d", *mysqlInfo.Status))
+		})
+
+		if err != nil {
+			log.Printf("[CRITAL]%s Isolate mysql isolateInstance fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
+	} else if operate == "recover" {
+		service := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
+		if err := service.DeleteMysqlIsolateInstanceById(ctx, instanceId); err != nil {
+			return err
+		}
+		err := resource.Retry(7*readRetryTimeout, func() *resource.RetryError {
+			mysqlInfo, err := service.DescribeDBInstanceById(ctx, instanceId)
+
+			if err != nil {
+				if _, ok := err.(*errors.TencentCloudSDKError); !ok {
+					return resource.RetryableError(err)
+				} else {
+					return resource.NonRetryableError(err)
+				}
+			}
+			if mysqlInfo == nil {
+				return nil
+			}
+			if *mysqlInfo.Status == MYSQL_STATUS_ISOLATED {
+				return resource.RetryableError(fmt.Errorf("mysql recovering."))
+			}
+			if *mysqlInfo.Status == MYSQL_STATUS_RUNNING {
+				return nil
+			}
+			return resource.NonRetryableError(fmt.Errorf("after ReleaseIsolatedDBInstances mysql Status is %d", *mysqlInfo.Status))
+		})
+
+		if err != nil {
+			log.Printf("[CRITAL]%s ReleaseIsolatedDBInstances mysql fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
 	}
 
+	return resourceTencentCloudMysqlIsolateInstanceRead(d, meta)
+}
+
+func resourceTencentCloudMysqlIsolateInstanceDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_mysql_isolate_instance.delete")()
+	defer inconsistentCheck(d, meta)()
+
 	return nil
 }

tencentcloud/resource_tc_mysql_isolate_instance_test.go

@@ -6,8 +6,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlIsolateInstanceResource_basic -v
 func TestAccTencentCloudMysqlIsolateInstanceResource_basic(t *testing.T) {
-	t.Parallel()
+
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -16,12 +17,17 @@ func TestAccTencentCloudMysqlIsolateInstanceResource_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccMysqlIsolateInstance,
-				Check:  resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_mysql_isolate_instance.isolate_instance", "id")),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_isolate_instance.isolate_instance", "id"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_isolate_instance.isolate_instance", "status", "5"),
+				),
 			},
 			{
-				ResourceName:      "tencentcloud_mysql_isolate_instance.isolate_instance",
-				ImportState:       true,
-				ImportStateVerify: true,
+				Config: testAccMysqlIsolateInstanceUp,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_isolate_instance.isolate_instance", "id"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_isolate_instance.isolate_instance", "status", "1"),
+				),
 			},
 		},
 	})
@@ -30,7 +36,17 @@ func TestAccTencentCloudMysqlIsolateInstanceResource_basic(t *testing.T) {
 const testAccMysqlIsolateInstance = `
 
 resource "tencentcloud_mysql_isolate_instance" "isolate_instance" {
-  instance_id = ""
+	instance_id = "cdb-fitq5t9h"
+	operate     = "isolate"
+}
+
+`
+
+const testAccMysqlIsolateInstanceUp = `
+
+resource "tencentcloud_mysql_isolate_instance" "isolate_instance" {
+	instance_id = "cdb-fitq5t9h"
+	operate     = "recover"
 }
 
 `