feat: mysql - support fast upgrade and param template id (#1067)

* feat: mysql - support fast upgrade and param template id

* fix: cynosdb importstate

Author: Kagashino

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.363
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.409
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.199
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.199
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.409
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.403

go.sum

@@ -462,6 +462,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.199 h1:MkIdFgE
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.199/go.mod h1:PTp058qpOV//RukBVdYQT962rZg71lIt6eHLK1zdvEc=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.199 h1:7ReZOKl95X+9SkPPtrAoUt4ZPJSIjiSxq4g/M54JmtU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.199/go.mod h1:BMLd7J4LnIxw3fSl9vo3UCudJbH1wZutP8Uo3sQGQTk=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.409 h1:fKFSxvMzS8T+z2z2qm67dgTClnkryeVTykclVkHh3qE=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.409/go.mod h1:q89YBv3T1bzENpcovtwnjxfVn9vx9pCYAssp0HPuivU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.199 h1:ji9wSYFgRYbNvlm5KD1Lxb7Uh5ldcQi3AfjktJCrygY=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.199/go.mod h1:gJDjRbA4JhsRGKkNzqwx053/vqgNMhf42ID2a7lcE0g=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.199 h1:VyOKZOlgTXW0szboWhI1N35khPsaHE4CyH9pf42o7P8=

tencentcloud/resource_tc_cynosdb_cluster_test.go

@@ -99,6 +99,12 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.current_value", "utf8"),
 				),
 			},
+			{
+				ResourceName:            "tencentcloud_cynosdb_cluster.foo",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"password", "force_delete", "storage_limit", "param_items"},
+			},
 			{
 				Config: testAccCynosdbCluster_update,
 				Check: resource.ComposeTestCheckFunc(
@@ -116,12 +122,6 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.current_value", "utf8mb4"),
 				),
 			},
-			{
-				ResourceName:            "tencentcloud_cynosdb_cluster.foo",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"password", "force_delete", "storage_limit", "param_items"},
-			},
 		},
 	})
 }

tencentcloud/resource_tc_mysql_instance.go

@@ -175,7 +175,16 @@ func TencentMsyqlBasicInfo() map[string]*schema.Schema {
 			},
 			Description: "Security groups to use.",
 		},
-
+		"param_template_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Specify parameter template id.",
+		},
+		"fast_upgrade": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Specify whether to enable fast upgrade when upgrade instance spec, available value: `1` - enabled, `0` - disabled.",
+		},
 		"tags": {
 			Type:        schema.TypeMap,
 			Optional:    true,
@@ -430,6 +439,15 @@ func mysqlAllInstanceRoleSet(ctx context.Context, requestInter interface{}, d *s
 			requestByUse.SecurityGroup = requestSecurityGroup
 		}
 	}
+
+	if v, ok := d.GetOk("param_template_id"); ok {
+		paramTemplateId := helper.IntInt64(v.(int))
+		if okByMonth {
+			requestByMonth.ParamTemplateId = paramTemplateId
+		} else {
+			requestByUse.ParamTemplateId = paramTemplateId
+		}
+	}
 	return nil
 
 }
@@ -1003,8 +1021,12 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		memSize := int64(d.Get("mem_size").(int))
 		cpu := int64(d.Get("cpu").(int))
 		volumeSize := int64(d.Get("volume_size").(int))
+		fastUpgrade := int64(0)
+		if v, ok := d.GetOk("fast_upgrade"); ok {
+			fastUpgrade = int64(v.(int))
+		}
 
-		asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize)
+		asyncRequestId, err := mysqlService.UpgradeDBInstance(ctx, d.Id(), memSize, cpu, volumeSize, fastUpgrade)
 
 		if err != nil {
 			return err
@@ -1094,6 +1116,9 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 		d.SetPartial("tags")
 	}
 
+	if d.HasChange("param_template_id") {
+		return fmt.Errorf("argument `param_template_id` cannot be modified for now")
+	}
 	return nil
 }
 

tencentcloud/resource_tc_mysql_instance_test.go

@@ -294,6 +294,10 @@ resource "tencentcloud_mysql_instance" "mysql_master" {
 
 func testAccMysqlMasterInstance_fullslave() string {
 	return `
+variable "temporary_param_tmpl_id" {
+	default = 16954
+}
+
 resource "tencentcloud_mysql_instance" "mysql_master" {
   charge_type       = "POSTPAID"
   mem_size          = 1000
@@ -307,6 +311,7 @@ resource "tencentcloud_mysql_instance" "mysql_master" {
   first_slave_zone  = "ap-guangzhou-3"
   second_slave_zone = "ap-guangzhou-3"
   slave_sync_mode   = 2
+  param_template_id = var.temporary_param_tmpl_id
   force_delete      = true
 }`
 }

tencentcloud/service_tencentcloud_mysql.go

@@ -1108,7 +1108,7 @@ func (me *MysqlService) ModifyDBInstanceVipVport(ctx context.Context, mysqlId, v
 }
 
 func (me *MysqlService) UpgradeDBInstance(ctx context.Context, mysqlId string,
-	memSize, cpu, volumeSize int64) (asyncRequestId string, errRet error) {
+	memSize, cpu, volumeSize, fastUpgrade int64) (asyncRequestId string, errRet error) {
 
 	logId := getLogId(ctx)
 
@@ -1120,6 +1120,7 @@ func (me *MysqlService) UpgradeDBInstance(ctx context.Context, mysqlId string,
 	request.Cpu = &cpu
 	request.Volume = &volumeSize
 	request.WaitSwitch = &waitSwitch
+	request.FastUpgrade = &fastUpgrade
 
 	defer func() {
 		if errRet != nil {