feat: mysql account supports max_user_connections (#1874)

* feat: mysql account supports max_user_connections

* feat: add changelog

* fix: modify account

---------

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

Author: gitmkn

.changelog/1874.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_mysql_account: support the `max_user_connections` field.
+```

tencentcloud/resource_tc_mysql_account.go

@@ -5,10 +5,11 @@ Example Usage
 
 ```hcl
 resource "tencentcloud_mysql_account" "default" {
-  mysql_id    = "terraform-test-local-database"
-  name        = "tf_account"
-  password    = "********"
-  description = "My test account"
+  mysql_id             = "terraform-test-local-database"
+  name                 = "tf_test"
+  password             = "********"
+  description          = "My test account"
+  max_user_connections = 10
 }
 ```
 
@@ -76,6 +77,12 @@ func resourceTencentCloudMysqlAccount() *schema.Resource {
 				ValidateFunc: validateStringLengthInRange(1, 200),
 				Description:  "Database description.",
 			},
+			"max_user_connections": {
+				Optional:    true,
+				Computed:    true,
+				Type:        schema.TypeInt,
+				Description: "The maximum number of available connections for a new account, the default value is 10240, and the maximum value that can be set is 10240.",
+			},
 		},
 	}
 }
@@ -94,9 +101,10 @@ func resourceTencentCloudMysqlAccountCreate(d *schema.ResourceData, meta interfa
 		accountHost        = d.Get("host").(string)
 		accountPassword    = d.Get("password").(string)
 		accountDescription = d.Get("description").(string)
+		maxUserConnections = int64(d.Get("max_user_connections").(int))
 	)
 
-	asyncRequestId, err := mysqlService.CreateAccount(ctx, mysqlId, accountName, accountHost, accountPassword, accountDescription)
+	asyncRequestId, err := mysqlService.CreateAccount(ctx, mysqlId, accountName, accountHost, accountPassword, accountDescription, maxUserConnections)
 	if err != nil {
 		return err
 	}
@@ -191,6 +199,8 @@ func resourceTencentCloudMysqlAccountRead(d *schema.ResourceData, meta interface
 	_ = d.Set("mysql_id", mysqlId)
 	_ = d.Set("host", *accountInfo.Host)
 	_ = d.Set("name", *accountInfo.User)
+	_ = d.Set("max_user_connections", *accountInfo.MaxUserConnections)
+
 	return nil
 }
 func resourceTencentCloudMysqlAccountUpdate(d *schema.ResourceData, meta interface{}) error {
@@ -274,6 +284,38 @@ func resourceTencentCloudMysqlAccountUpdate(d *schema.ResourceData, meta interfa
 
 	}
 
+	if d.HasChange("max_user_connections") {
+		var maxUserConnections int64
+		if v, ok := d.GetOkExists("max_user_connections"); ok {
+			maxUserConnections = int64(v.(int))
+		}
+		asyncRequestId, err := mysqlService.ModifyAccountMaxUserConnections(ctx, mysqlId, accountName, accountHost, maxUserConnections)
+		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 mysql account maxUserConnections %s task  status is %s", mysqlId, accountName, taskStatus))
+			}
+			err = fmt.Errorf("modify mysql account maxUserConnections 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 maxUserConnections fail, reason:%s\n ", logId, err.Error())
+			return err
+		}
+
+	}
+
 	d.Partial(false)
 
 	return nil

tencentcloud/resource_tc_mysql_account_test.go

@@ -77,6 +77,7 @@ func init() {
 	})
 }
 
+// go test -i; go test -test.run TestAccTencentCloudMysqlAccountResource_basic -v
 func TestAccTencentCloudMysqlAccountResource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -91,6 +92,7 @@ func TestAccTencentCloudMysqlAccountResource_basic(t *testing.T) {
 					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", "description", "test from terraform"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_account.mysql_account", "max_user_connections", "10"),
 				),
 			},
 			{
@@ -206,6 +208,7 @@ resource "tencentcloud_mysql_account" "mysql_account" {
     host = "192.168.0.%%"
 	password = "Test@123456#"
 	description = "test from terraform"
+	max_user_connections = 10
 }
 	`, CommonPresetMysql)
 }

tencentcloud/service_tencentcloud_mysql.go

@@ -302,7 +302,7 @@ func (me *MysqlService) DescribeCaresParameters(ctx context.Context, instanceId
 }
 
 func (me *MysqlService) CreateAccount(ctx context.Context, mysqlId string,
-	accountName, accountHost, accountPassword, accountDescription string) (asyncRequestId string, errRet error) {
+	accountName, accountHost, accountPassword, accountDescription string, maxUserConnections int64) (asyncRequestId string, errRet error) {
 
 	logId := getLogId(ctx)
 
@@ -315,6 +315,7 @@ func (me *MysqlService) CreateAccount(ctx context.Context, mysqlId string,
 	request.Password = &accountPassword
 	request.Accounts = accountInfos
 	request.Description = &accountDescription
+	request.MaxUserConnections = &maxUserConnections
 
 	defer func() {
 		if errRet != nil {
@@ -362,6 +363,35 @@ func (me *MysqlService) ModifyAccountPassword(ctx context.Context, mysqlId strin
 	return
 }
 
+func (me *MysqlService) ModifyAccountMaxUserConnections(ctx context.Context, mysqlId, accountName, accountHost string, maxUserConnections int64) (asyncRequestId string, errRet error) {
+
+	logId := getLogId(ctx)
+
+	request := cdb.NewModifyAccountMaxUserConnectionsRequest()
+
+	var accountInfo = cdb.Account{User: &accountName, Host: &accountHost}
+	var accountInfos = []*cdb.Account{&accountInfo}
+
+	request.InstanceId = &mysqlId
+	request.Accounts = accountInfos
+	request.MaxUserConnections = &maxUserConnections
+
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), errRet.Error())
+		}
+	}()
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseMysqlClient().ModifyAccountMaxUserConnections(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	asyncRequestId = *response.Response.AsyncRequestId
+	return
+}
+
 func (me *MysqlService) ModifyAccountDescription(ctx context.Context, mysqlId string,
 	accountName, accountHost, accountDescription string) (asyncRequestId string, errRet error) {
 

website/docs/r/mysql_account.html.markdown

@@ -15,10 +15,11 @@ Provides a MySQL account resource for database management. A MySQL instance supp
 
 ```hcl
 resource "tencentcloud_mysql_account" "default" {
-  mysql_id    = "terraform-test-local-database"
-  name        = "tf_account"
-  password    = "********"
-  description = "My test account"
+  mysql_id             = "terraform-test-local-database"
+  name                 = "tf_test"
+  password             = "********"
+  description          = "My test account"
+  max_user_connections = 10
 }
 ```
 
@@ -31,6 +32,7 @@ The following arguments are supported:
 * `password` - (Required, String) Operation password.
 * `description` - (Optional, String) Database description.
 * `host` - (Optional, String, ForceNew) Account host, default is `%`.
+* `max_user_connections` - (Optional, Int) The maximum number of available connections for a new account, the default value is 10240, and the maximum value that can be set is 10240.
 
 ## Attributes Reference