fix: modify config to support window period switch (#2472)

* fix: modify config to support window period switch

* feat: add 2472 changelog

* fix: modify mysql test

* fix: modify mysql test

Author: gitmkn

.changelog/2472.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mysql_instance: Modify configuration to support window period switching
+```

tencentcloud/services/cdb/resource_tc_mysql_instance.go

@@ -1016,6 +1016,7 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 			cpu := int64(d.Get("cpu").(int))
 			volumeSize := int64(d.Get("volume_size").(int))
 			deviceType := ""
+			var waitSwitch int64 = 0
 
 			fastUpgrade := int64(0)
 			if v, ok := d.GetOk("fast_upgrade"); ok {
@@ -1025,7 +1026,11 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 				deviceType = v.(string)
 			}
 
-			asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade, deviceType, -1, -1, "", "")
+			if v, ok := d.GetOkExists("wait_switch"); ok {
+				waitSwitch = int64(v.(int))
+			}
+
+			asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade, deviceType, -1, -1, "", "", waitSwitch)
 
 			if err != nil {
 				return err
@@ -1069,6 +1074,7 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 			deviceType := ""
 			firstSlaveZone := ""
 			secondSlaveZone := ""
+			var waitSwitch int64 = 0
 
 			fastUpgrade := int64(0)
 			if v, ok := d.GetOk("fast_upgrade"); ok {
@@ -1086,7 +1092,11 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 				secondSlaveZone = v.(string)
 			}
 
-			asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade, deviceType, slaveDeployMode, slaveSyncMode, firstSlaveZone, secondSlaveZone)
+			if v, ok := d.GetOkExists("wait_switch"); ok {
+				waitSwitch = int64(v.(int))
+			}
+
+			asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade, deviceType, slaveDeployMode, slaveSyncMode, firstSlaveZone, secondSlaveZone, waitSwitch)
 
 			if err != nil {
 				return err

tencentcloud/services/cdb/resource_tc_mysql_instance_test.go

@@ -123,7 +123,7 @@ func TestAccTencentCloudMysqlInstanceResource_prepaid(t *testing.T) {
 				ResourceName:            "tencentcloud_mysql_instance.prepaid",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "force_delete", "param_template_id", "fast_upgrade"},
+				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "force_delete", "param_template_id", "fast_upgrade", "parameters"},
 			},
 		},
 	})
@@ -148,7 +148,7 @@ func TestAccTencentCloudMysqlInstanceResource_DeviceType(t *testing.T) {
 				ResourceName:            "tencentcloud_mysql_instance.mysql_exclusive",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "force_delete", "param_template_id", "fast_upgrade"},
+				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "force_delete", "param_template_id", "fast_upgrade", "parameters"},
 			},
 			{
 				Config: testAccMySQLDeviceTypeUpdate,
@@ -228,7 +228,7 @@ func TestAccTencentCloudMysqlInstanceResource_MasterInstance_basic_and_update(t
 				ResourceName:            "tencentcloud_mysql_instance.mysql_master",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "first_slave_zone", "force_delete"},
+				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "first_slave_zone", "force_delete", "parameters"},
 			},
 			// add tag
 			{
@@ -430,7 +430,7 @@ resource "tencentcloud_mysql_instance" "prepaid" {
 
 const testAccMySQLDeviceType = `
 variable "temporary_param_tmpl_id" {
-	default = 19656
+	default = 21117
 }
 
 resource "tencentcloud_mysql_instance" "mysql_exclusive" {
@@ -452,7 +452,7 @@ resource "tencentcloud_mysql_instance" "mysql_exclusive" {
 
 const testAccMySQLDeviceTypeUpdate = `
 variable "temporary_param_tmpl_id" {
-	default = 19656
+	default = 21117
 }
 
 resource "tencentcloud_mysql_instance" "mysql_exclusive" {
@@ -624,7 +624,7 @@ resource "tencentcloud_mysql_instance" "mysql8" {
 	mem_size          = 1000
 	volume_size       = 25
 	intranet_port     = 3306
-	security_groups   = ["sg-ngx2bo7j"]
+	security_groups   = ["sg-3k7vtgf7"]
   
 	tags = {
 	  createdBy = "terraform"

tencentcloud/services/cdb/service_tencentcloud_mysql.go

@@ -1217,12 +1217,10 @@ func (me *MysqlService) ModifyDBInstanceVipVport(ctx context.Context, mysqlId, v
 
 func (me *MysqlService) UpgradeDBInstance(ctx context.Context, mysqlId string,
 	memSize, cpu, volumeSize, fastUpgrade int64, deviceType string, slaveDeployMode, slaveSyncMode int64,
-	firstSlaveZone, secondSlaveZone string) (asyncRequestId string, errRet error) {
+	firstSlaveZone, secondSlaveZone string, waitSwitch int64) (asyncRequestId string, errRet error) {
 
 	logId := tccommon.GetLogId(ctx)
 
-	var waitSwitch int64 = 0 // 0- switch immediately, 1- time window switch
-
 	request := cdb.NewUpgradeDBInstanceRequest()
 	request.InstanceId = &mysqlId
 	request.Memory = &memSize