feat: support proxy (#1911)

* feat: support proxy

* fix: update sdk

* fix: fmt

* feat: cdb support proxy

* fix: cdb modify host

* feat: add changelog

* fix: modify proxy

* fix: modify changelog

---------

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

Author: gitmkn

.changelog/1911.txt

@@ -0,0 +1,27 @@
+```release-note:new-resource
+tencentcloud_mysql_proxy
+```
+
+```release-note:new-resource
+tencentcloud_mysql_reset_root_account
+```
+
+```release-note:new-resource
+tencentcloud_mysql_verify_root_account
+```
+
+```release-note:new-resource
+tencentcloud_mysql_reload_balance_proxy_node
+```
+
+```release-note:new-resource
+tencentcloud_mysql_ro_start_replication
+```
+
+```release-note:new-resource
+tencentcloud_mysql_ro_stop_replication
+```
+
+```release-note:enhancement
+resource/tencentcloud_mysql_account: support update `host`
+```

go.mod

@@ -30,15 +30,15 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.409
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.520
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.658
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.667
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.659
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.663
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.687
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.688
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.687

go.sum

@@ -786,6 +786,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591 h1:TPGLjH6
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591/go.mod h1:nCAGfVTXZkVnurkbjF3b0FM6RwGztE9t8D9Ms1unaKo=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.658 h1:9lcl2TyePN9iL0uxR6foazZmzGxmlL9VszfuQIPrTs0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.658/go.mod h1:ijeny+Q903x+L0lBzYKT+opPp9/5DSrJ2XcBDeVXuto=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688 h1:496SFS8Byk5FFBAbKgmnD7AemK5swkp21PKhOAC+HH4=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.688/go.mod h1:W9nkytcj6/fzGhil86wGtD8oZmY1Z4JuwJ3m11/mWCg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539 h1:0L6nZhT2bToTc/n1z3HOpNgdu5VX5ulmqIuPY+8UozA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539/go.mod h1:6Syk7W5fdDf0BLvX+RXL5obQ6unkt3Id4aN2QqVrV6U=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627 h1:nChNdoCUWQZciiJj3gRCWoHBO/8LituLQOdCRREIrS4=
@@ -858,6 +860,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.683 h1:HGTN
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.683/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.687 h1:Chd/UQ9pnA99epvEzAAsY8QaOuNGM37hR8ReZWk+H4A=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.687/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.688 h1:NvpmuwSOoOASDtvz/+ZI+QS7zaWQp9FBQQxBY0p5uhA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.688/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589 h1:LZihgirMH0vsaGScYexxwY0fTss9vHaSZs/YOQUVESg=

tencentcloud/data_source_tc_cynosdb_instance_slow_queries.go

@@ -56,6 +56,7 @@ package tencentcloud
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	cynosdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107"

tencentcloud/provider.go

@@ -629,6 +629,12 @@ TencentDB for MySQL(cdb)
 	tencentcloud_mysql_ro_instance_ip
 	tencentcloud_mysql_ro_group_load_operation
 	tencentcloud_mysql_switch_master_slave_operation
+	tencentcloud_mysql_proxy
+	tencentcloud_mysql_reset_root_account
+	tencentcloud_mysql_verify_root_account
+	tencentcloud_mysql_reload_balance_proxy_node
+	tencentcloud_mysql_ro_start_replication
+	tencentcloud_mysql_ro_stop_replication
 
 Cloud Monitor(Monitor)
   Data Source
@@ -2305,6 +2311,13 @@ func Provider() *schema.Provider {
 			"tencentcloud_mysql_ro_instance_ip":                           resourceTencentCloudMysqlRoInstanceIp(),
 			"tencentcloud_mysql_ro_group_load_operation":                  resourceTencentCloudMysqlRoGroupLoadOperation(),
 			"tencentcloud_mysql_switch_master_slave_operation":            resourceTencentCloudMysqlSwitchMasterSlaveOperation(),
+			"tencentcloud_mysql_proxy":                                    resourceTencentCloudMysqlProxy(),
+			"tencentcloud_mysql_reset_root_account":                       resourceTencentCloudMysqlResetRootAccount(),
+			"tencentcloud_mysql_verify_root_account":                      resourceTencentCloudMysqlVerifyRootAccount(),
+			"tencentcloud_mysql_reload_balance_proxy_node":                resourceTencentCloudMysqlReloadBalanceProxyNode(),
+			"tencentcloud_mysql_ro_start_replication":                     resourceTencentCloudMysqlRoStartReplication(),
+			"tencentcloud_mysql_ro_stop_replication":                      resourceTencentCloudMysqlRoStopReplication(),
+			"tencentcloud_mysql_switch_proxy":                             resourceTencentCloudMysqlSwitchProxy(),
 			"tencentcloud_cos_bucket":                                     resourceTencentCloudCosBucket(),
 			"tencentcloud_cos_bucket_object":                              resourceTencentCloudCosBucketObject(),
 			"tencentcloud_cos_bucket_referer":                             resourceTencentCloudCosBucketReferer(),

tencentcloud/resource_tc_mysql_account.go

@@ -59,7 +59,6 @@ func resourceTencentCloudMysqlAccount() *schema.Resource {
 			"host": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Default:     MYSQL_DEFAULT_ACCOUNT_HOST,
 				Description: "Account host, default is `%`.",
 			},
@@ -316,6 +315,42 @@ func resourceTencentCloudMysqlAccountUpdate(d *schema.ResourceData, meta interfa
 
 	}
 
+	if d.HasChange("host") {
+		oldHost, newHost := d.GetChange("host")
+		asyncRequestId, err := mysqlService.ModifyAccountHost(ctx, mysqlId, accountName, oldHost.(string), newHost.(string))
+		if err != nil {
+			return err
+		}
+
+		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			taskStatus, message, err := mysqlService.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 modify account  host %s.%s task  status is %s", mysqlId, accountName, accountHost, taskStatus))
+			}
+			err = fmt.Errorf("modify mysql account host task status is %s,we won't wait for it finish ,it show message:%s", taskStatus, message)
+			return resource.NonRetryableError(err)
+		})
+
+		if err != nil {
+			log.Printf("[CRITAL]%s modify mysql account host fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
+
+		resourceId := fmt.Sprintf("%s%s%s", mysqlId, FILED_SP, accountName)
+
+		if newHost.(string) != MYSQL_DEFAULT_ACCOUNT_HOST {
+			resourceId += FILED_SP + newHost.(string)
+		}
+
+		d.SetId(resourceId)
+	}
+
 	d.Partial(false)
 
 	return nil

tencentcloud/resource_tc_mysql_account_test.go

@@ -90,7 +90,7 @@ func TestAccTencentCloudMysqlAccountResource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckMysqlAccountExists("tencentcloud_mysql_account.mysql_account"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_account.mysql_account", "mysql_id"),
-					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "name", "keep_dbbrain"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "name", "terraform_test"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "description", "test from terraform"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "max_user_connections", "10"),
 				),
@@ -103,6 +103,16 @@ func TestAccTencentCloudMysqlAccountResource_basic(t *testing.T) {
 					"password",
 				},
 			},
+			{
+				Config: testAccMysqlAccountUp(),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckMysqlAccountExists("tencentcloud_mysql_account.mysql_account"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_account.mysql_account", "mysql_id"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "name", "terraform_test"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "description", "test from terraform"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "max_user_connections", "10"),
+				),
+			},
 		},
 	})
 }
@@ -204,11 +214,26 @@ func testAccMysqlAccount() string {
 
 resource "tencentcloud_mysql_account" "mysql_account" {
 	mysql_id = local.mysql_id
-	name    = "keep_dbbrain"
+	name    = "terraform_test"
     host = "192.168.0.%%"
 	password = "Test@123456#"
 	description = "test from terraform"
 	max_user_connections = 10
 }
 	`, CommonPresetMysql)
 }
+
+func testAccMysqlAccountUp() string {
+	return fmt.Sprintf(`
+%s
+
+resource "tencentcloud_mysql_account" "mysql_account" {
+	mysql_id = local.mysql_id
+	name    = "terraform_test"
+    host = "192.168.1.%%"
+	password = "Test@123456#"
+	description = "test from terraform"
+	max_user_connections = 10
+}
+	`, CommonPresetMysql)
+}

tencentcloud/resource_tc_mysql_instance.go

@@ -251,11 +251,20 @@ func resourceTencentCloudMysqlInstance() *schema.Resource {
 		},
 		"engine_version": {
 			Type:         schema.TypeString,
-			ForceNew:     true,
 			Optional:     true,
 			ValidateFunc: validateAllowedStringValue(MYSQL_SUPPORTS_ENGINE),
 			Default:      MYSQL_SUPPORTS_ENGINE[len(MYSQL_SUPPORTS_ENGINE)-2],
-			Description:  "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0, and default is 5.7.",
+			Description:  "The version number of the database engine to use. Supported versions include 5.5/5.6/5.7/8.0, and default is 5.7. Upgrade the instance engine version to support 5.6/5.7 and switch immediately.",
+		},
+		"upgrade_subversion": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Whether it is a kernel subversion upgrade, supported values: 1 - upgrade the kernel subversion; 0 - upgrade the database engine version. Only need to fill in when upgrading kernel subversion and engine version.",
+		},
+		"max_deay_time": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Latency threshold. Value range 1~10. Only need to fill in when upgrading kernel subversion and engine version.",
 		},
 
 		"availability_zone": {
@@ -1085,6 +1094,53 @@ func mysqlAllInstanceRoleUpdate(ctx context.Context, d *schema.ResourceData, met
 
 	}
 
+	if d.HasChange("engine_version") || d.HasChange("upgrade_subversion") || d.HasChange("max_deay_time") {
+		engineVersion := ""
+		var upgradeSubversion int64
+		var maxDelayTime int64
+		if v, ok := d.GetOk("engine_version"); ok {
+			engineVersion = v.(string)
+		}
+		if v, ok := d.GetOk("upgrade_subversion"); ok {
+			upgradeSubversion = int64(v.(int))
+		}
+		if v, ok := d.GetOk("max_deay_time"); ok {
+			maxDelayTime = int64(v.(int))
+		}
+
+		asyncRequestId, err := mysqlService.UpgradeDBInstanceEngineVersion(ctx, d.Id(), engineVersion, upgradeSubversion, maxDelayTime)
+		if err != nil {
+			return err
+		}
+
+		err = resource.Retry(6*time.Hour, func() *resource.RetryError {
+			taskStatus, message, err := mysqlService.DescribeAsyncRequestInfo(ctx, asyncRequestId)
+
+			if err != nil {
+				if _, ok := err.(*errors.TencentCloudSDKError); !ok {
+					return resource.RetryableError(err)
+				} else {
+					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("update mysql engineVersion status is %s", taskStatus))
+			}
+			err = fmt.Errorf("update mysql engineVersion task status is %s,we won't wait for it finish ,it show message:%s",
+				",", message)
+			return resource.NonRetryableError(err)
+		})
+
+		if err != nil {
+			log.Printf("[CRITAL]%s update mysql engineVersion fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
+	}
+
 	if d.HasChange("tags") {
 
 		oldValue, newValue := d.GetChange("tags")