feat: support first_slave_zone can be modified (#1873)

* feat: support first_slave_zone can be modified

* fix: fmt

* fix: add change log

* fix: modify test

* fix: modify second_slave_zone

---------

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

Author: gitmkn

.changelog/1873.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mysql_instance: Support modifying field `slave_deploy_mode`, `first_slave_zone`, `second_slave_zone`, `slave_sync_mode`.
+```

tencentcloud/resource_tc_mysql_instance.go

@@ -190,6 +190,7 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 		"device_type": {
 			Type:        schema.TypeString,
 			Optional:    true,
+			Computed:    true,
 			Description: "Specify device type, available values: `UNIVERSAL` (default), `EXCLUSIVE`, `BASIC`.",
 		},
 		"tags": {
@@ -281,6 +282,7 @@ func resourceTencentCloudMysqlInstance() *schema.Resource {
 		"first_slave_zone": {
 			Type:        schema.TypeString,
 			Optional:    true,
+			Computed:    true,
 			Description: "Zone information about first slave instance.",
 		},
 		"second_slave_zone": {
@@ -797,11 +799,7 @@ func tencentMsyqlBasicInfoRead(ctx context.Context, d *schema.ResourceData, meta
 	_ = d.Set("volume_size", mysqlInfo.Volume)
 	_ = d.Set("vpc_id", mysqlInfo.UniqVpcId)
 	_ = d.Set("subnet_id", mysqlInfo.UniqSubnetId)
-
-	isUniversal := mysqlInfo.DeviceType != nil && *mysqlInfo.DeviceType == "UNIVERSAL"
-	if _, ok := d.GetOk("device_type"); ok || !isUniversal {
-		_ = d.Set("device_type", mysqlInfo.DeviceType)
-	}
+	_ = d.Set("device_type", mysqlInfo.DeviceType)
 
 	securityGroups, err := mysqlService.DescribeDBSecurityGroups(ctx, d.Id())
 	if err != nil {
@@ -942,14 +940,10 @@ func resourceTencentCloudMysqlInstanceRead(d *schema.ResourceData, meta interfac
 		_ = d.Set("slave_sync_mode", int(*backConfig.Response.ProtectMode))
 		_ = d.Set("slave_deploy_mode", int(*backConfig.Response.DeployMode))
 		if backConfig.Response.SlaveConfig != nil && *backConfig.Response.SlaveConfig.Zone != "" {
-			if _, ok := d.GetOk("first_slave_zone"); ok {
-				_ = d.Set("first_slave_zone", *backConfig.Response.SlaveConfig.Zone)
-			}
+			_ = d.Set("first_slave_zone", *backConfig.Response.SlaveConfig.Zone)
 		}
 		if backConfig.Response.BackupConfig != nil && *backConfig.Response.BackupConfig.Zone != "" {
-			if _, ok := d.GetOk("second_slave_zone"); ok {
-				_ = d.Set("second_slave_zone", *backConfig.Response.BackupConfig.Zone)
-			}
+			_ = d.Set("second_slave_zone", *backConfig.Response.BackupConfig.Zone)
 		}
 		return nil
 	})
@@ -999,12 +993,16 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		}
 	}
 
-	if d.HasChange("mem_size") || d.HasChange("cpu") || d.HasChange("volume_size") || d.HasChange("device_type") {
+	if d.HasChange("mem_size") || d.HasChange("cpu") || d.HasChange("volume_size") || d.HasChange("device_type") || d.HasChange("slave_deploy_mode") || d.HasChange("first_slave_zone") || d.HasChange("second_slave_zone") || d.HasChange("slave_sync_mode") {
 
 		memSize := int64(d.Get("mem_size").(int))
 		cpu := int64(d.Get("cpu").(int))
 		volumeSize := int64(d.Get("volume_size").(int))
+		slaveDeployMode := int64(d.Get("slave_deploy_mode").(int))
+		slaveSyncMode := int64(d.Get("slave_sync_mode").(int))
 		deviceType := ""
+		firstSlaveZone := ""
+		secondSlaveZone := ""
 
 		fastUpgrade := int64(0)
 		if v, ok := d.GetOk("fast_upgrade"); ok {
@@ -1014,7 +1012,15 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 			deviceType = v.(string)
 		}
 
-		asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade, deviceType)
+		if v, ok := d.GetOk("first_slave_zone"); ok {
+			firstSlaveZone = v.(string)
+		}
+
+		if v, ok := d.GetOk("second_slave_zone"); ok {
+			secondSlaveZone = v.(string)
+		}
+
+		asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade, deviceType, slaveDeployMode, slaveSyncMode, firstSlaveZone, secondSlaveZone)
 
 		if err != nil {
 			return err
@@ -1327,16 +1333,6 @@ func resourceTencentCloudMysqlInstanceUpdate(d *schema.ResourceData, meta interf
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
-	immutableArgs := []string{
-		"slave_deploy_mode", "first_slave_zone", "second_slave_zone", "slave_sync_mode",
-	}
-
-	for _, v := range immutableArgs {
-		if d.HasChange(v) {
-			return fmt.Errorf("argument `%s` cannot be changed", v)
-		}
-	}
-
 	payType := getPayType(d).(int)
 
 	d.Partial(true)

tencentcloud/resource_tc_mysql_instance_test.go

@@ -14,6 +14,7 @@ import (
 )
 
 const TestAccTencentCloudMysqlMasterInstance_availability_zone = "ap-guangzhou-3"
+const TestAccTencentCloudMysqlMasterInstance_availability_zone_4 = "ap-guangzhou-4"
 const TestAccTencentCloudMysqlInstanceName = "testAccMysql"
 
 func init() {
@@ -110,18 +111,20 @@ func TestAccTencentCloudMysqlInstanceResource_prepaid(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.prepaid", "charge_type", "PREPAID"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.prepaid", "vpc_id"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.prepaid", "subnet_id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.prepaid", "first_slave_zone"),
 				),
 			},
 			{
 				ResourceName:            "tencentcloud_mysql_instance.prepaid",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "first_slave_zone", "force_delete", "param_template_id", "fast_upgrade"},
+				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "force_delete", "param_template_id", "fast_upgrade"},
 			},
 		},
 	})
 }
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlInstanceResource_DeviceType -v
 func TestAccTencentCloudMysqlInstanceResource_DeviceType(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -133,13 +136,14 @@ func TestAccTencentCloudMysqlInstanceResource_DeviceType(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckMysqlMasterInstanceExists("tencentcloud_mysql_instance.mysql_exclusive"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_exclusive", "device_type", "EXCLUSIVE"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_instance.mysql_exclusive", "first_slave_zone"),
 				),
 			},
 			{
 				ResourceName:            "tencentcloud_mysql_instance.mysql_exclusive",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "first_slave_zone", "force_delete", "param_template_id", "fast_upgrade"},
+				ImportStateVerifyIgnore: []string{"root_password", "prepaid_period", "force_delete", "param_template_id", "fast_upgrade"},
 			},
 			{
 				Config: testAccMySQLDeviceTypeUpdate,
@@ -152,6 +156,7 @@ func TestAccTencentCloudMysqlInstanceResource_DeviceType(t *testing.T) {
 	})
 }
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlInstanceResource_MasterInstance_fullslave -v
 func TestAccTencentCloudMysqlInstanceResource_MasterInstance_fullslave(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -170,6 +175,18 @@ func TestAccTencentCloudMysqlInstanceResource_MasterInstance_fullslave(t *testin
 					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "second_slave_zone", TestAccTencentCloudMysqlMasterInstance_availability_zone),
 				),
 			},
+			{
+				Config: testAccMysqlMasterInstanceUp_fullslave(),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckMysqlMasterInstanceExists("tencentcloud_mysql_instance.mysql_master"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "instance_name", TestAccTencentCloudMysqlInstanceName),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "slave_deploy_mode", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "slave_sync_mode", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "availability_zone", TestAccTencentCloudMysqlMasterInstance_availability_zone),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "first_slave_zone", TestAccTencentCloudMysqlMasterInstance_availability_zone_4),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_instance.mysql_master", "second_slave_zone", TestAccTencentCloudMysqlMasterInstance_availability_zone_4),
+				),
+			},
 		},
 	})
 }
@@ -408,7 +425,7 @@ resource "tencentcloud_mysql_instance" "prepaid" {
 
 const testAccMySQLDeviceType = `
 variable "temporary_param_tmpl_id" {
-	default = 16954
+	default = 19656
 }
 
 resource "tencentcloud_mysql_instance" "mysql_exclusive" {
@@ -430,7 +447,7 @@ resource "tencentcloud_mysql_instance" "mysql_exclusive" {
 
 const testAccMySQLDeviceTypeUpdate = `
 variable "temporary_param_tmpl_id" {
-	default = 16954
+	default = 19656
 }
 
 resource "tencentcloud_mysql_instance" "mysql_exclusive" {
@@ -486,6 +503,25 @@ resource "tencentcloud_mysql_instance" "mysql_master" {
 }`
 }
 
+func testAccMysqlMasterInstanceUp_fullslave() string {
+	return `
+resource "tencentcloud_mysql_instance" "mysql_master" {
+  charge_type       = "POSTPAID"
+  mem_size          = 1000
+  volume_size       = 50
+  instance_name     = "testAccMysql"
+  engine_version    = "5.7"
+  root_password     = "test1234"
+  intranet_port     = 3360
+  availability_zone = "ap-guangzhou-3"
+  slave_deploy_mode = 1
+  first_slave_zone  = "ap-guangzhou-4"
+  second_slave_zone = "ap-guangzhou-4"
+  slave_sync_mode   = 1
+  force_delete      = true
+}`
+}
+
 func testAccMysqlMasterInstance_internet_service(open bool) string {
 	tag := "0"
 	if open {

tencentcloud/resource_tc_mysql_password_complexity.go

@@ -87,7 +87,7 @@ func resourceTencentCloudMysqlPasswordComplexityCreate(d *schema.ResourceData, m
 
 	d.SetId(instanceId)
 
-	return resourceTencentCloudMysqlPasswordComplexityRead(d, meta)
+	return resourceTencentCloudMysqlPasswordComplexityUpdate(d, meta)
 }
 
 func resourceTencentCloudMysqlPasswordComplexityRead(d *schema.ResourceData, meta interface{}) error {

tencentcloud/service_tencentcloud_mysql.go

@@ -1141,7 +1141,8 @@ 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) (asyncRequestId string, errRet error) {
+	memSize, cpu, volumeSize, fastUpgrade int64, deviceType string, slaveDeployMode, slaveSyncMode int64,
+	firstSlaveZone, secondSlaveZone string) (asyncRequestId string, errRet error) {
 
 	logId := getLogId(ctx)
 
@@ -1154,6 +1155,10 @@ func (me *MysqlService) UpgradeDBInstance(ctx context.Context, mysqlId string,
 	request.Volume = &volumeSize
 	request.WaitSwitch = &waitSwitch
 	request.FastUpgrade = &fastUpgrade
+	request.DeployMode = &slaveDeployMode
+	request.SlaveZone = &firstSlaveZone
+	request.BackupZone = &secondSlaveZone
+	request.ProtectMode = &slaveSyncMode
 	if deviceType != "" {
 		request.DeviceType = &deviceType
 	}