fix: support binlog setting (#2272)

* fix: support binlog setting

* feat: add changelog

Author: gitmkn

.changelog/2272.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+tencentcloud_mysql_backup_policy: Support instance binlog setting.
+```

tencentcloud/resource_tc_mysql_backup_policy.go

@@ -56,9 +56,12 @@ resource "tencentcloud_mysql_instance" "example" {
 
 resource "tencentcloud_mysql_backup_policy" "example" {
   mysql_id         = tencentcloud_mysql_instance.example.id
-  retention_period = 7
-  backup_model     = "physical"
-  backup_time      = "01:00-05:00"
+  retention_period      = 7
+  backup_model          = "physical"
+  backup_time           = "22:00-02:00"
+  binlog_period         = 32
+  enable_binlog_standby = "off"
+  binlog_standby_days   = 31
 }
 ```
 */
@@ -89,10 +92,10 @@ func resourceTencentCloudMysqlBackupPolicy() *schema.Resource {
 			},
 			"retention_period": {
 				Type:         schema.TypeInt,
-				ValidateFunc: validateIntegerInRange(7, 732),
+				ValidateFunc: validateIntegerInRange(7, 1830),
 				Optional:     true,
 				Default:      7,
-				Description:  "Instance backup retention days. Valid value ranges: [7~730]. And default value is `7`.",
+				Description:  "The retention time of backup files, in days. The minimum value is 7 days and the maximum value is 1830 days. And default value is `7`.",
 			},
 			"backup_model": {
 				Type:         schema.TypeString,
@@ -109,11 +112,25 @@ func resourceTencentCloudMysqlBackupPolicy() *schema.Resource {
 				Description:  "Instance backup time, in the format of 'HH:mm-HH:mm'. Time setting interval is four hours. Default to `02:00-06:00`. The following value can be supported: `02:00-06:00`, `06:00-10:00`, `10:00-14:00`, `14:00-18:00`, `18:00-22:00`, and `22:00-02:00`.",
 			},
 
-			// Computed values
 			"binlog_period": {
 				Type:        schema.TypeInt,
+				Optional:    true,
 				Computed:    true,
-				Description: "Retention period for binlog in days.",
+				Description: "Binlog retention time, in days. The minimum value is 7 days and the maximum value is 1830 days. This value cannot be set greater than the backup file retention time.",
+			},
+
+			"enable_binlog_standby": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "off",
+				Description: "Whether to enable the log backup standard storage policy, `off` - close, `on` - open, the default is off.",
+			},
+
+			"binlog_standby_days": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "The standard starting number of days for log backup storage. The log backup will be converted when it reaches the standard starting number of days for storage. The minimum is 30 days and must not be greater than the number of days for log backup retention.",
 			},
 		},
 	}
@@ -159,6 +176,15 @@ func resourceTencentCloudMysqlBackupPolicyRead(d *schema.ResourceData, meta inte
 		buf.WriteString(fmt.Sprintf("%d:00", *desResponse.Response.StartTimeMax))
 		_ = d.Set("backup_time", buf.String())
 		_ = d.Set("binlog_period", int(*desResponse.Response.BinlogExpireDays))
+
+		if desResponse.Response.EnableBinlogStandby != nil {
+			_ = d.Set("enable_binlog_standby", desResponse.Response.EnableBinlogStandby)
+		}
+
+		if desResponse.Response.BinlogStandbyDays != nil {
+			_ = d.Set("binlog_standby_days", desResponse.Response.BinlogStandbyDays)
+		}
+
 		return nil
 	})
 	if err != nil {
@@ -182,17 +208,34 @@ func resourceTencentCloudMysqlBackupPolicyUpdate(d *schema.ResourceData, meta in
 		retentionPeriod = int64(d.Get("retention_period").(int))
 		backupModel     = d.Get("backup_model").(string)
 		backupTime      = d.Get("backup_time").(string)
+
+		binlogExpireDays    int64
+		enableBinlogStandby string
+		binlogStandbyDays   int64
 	)
 
-	if d.HasChange("retention_period") || d.HasChange("backup_model") || d.HasChange("backup_time") {
+	if v, ok := d.GetOkExists("binlog_period"); ok {
+		binlogExpireDays = int64(v.(int))
+	}
+
+	if v, ok := d.GetOk("enable_binlog_standby"); ok {
+		enableBinlogStandby = v.(string)
+	}
+
+	if v, ok := d.GetOkExists("binlog_standby_days"); ok {
+		binlogStandbyDays = int64(v.(int))
+	}
+
+	if d.HasChange("retention_period") || d.HasChange("backup_model") || d.HasChange("backup_time") ||
+		d.HasChange("binlog_period") || d.HasChange("enable_binlog_standby") || d.HasChange("binlog_standby_days") {
 		if backupModel != "physical" {
 			return fmt.Errorf("`backup_model` only support 'physical'")
 		}
 		isUpdate = true
 	}
 
 	if isUpdate {
-		err := mysqlService.ModifyBackupConfigByMysqlId(ctx, mysqlId, retentionPeriod, backupModel, backupTime)
+		err := mysqlService.ModifyBackupConfigByMysqlId(ctx, mysqlId, retentionPeriod, backupModel, backupTime, binlogExpireDays, enableBinlogStandby, binlogStandbyDays)
 		if err != nil {
 			return err
 		}
@@ -210,11 +253,14 @@ func resourceTencentCloudMysqlBackupPolicyDelete(d *schema.ResourceData, meta in
 	mysqlService := MysqlService{client: meta.(*TencentCloudClient).apiV3Conn}
 
 	var (
-		retentionPeriod int64 = 7
-		backupModel           = MYSQL_ALLOW_BACKUP_MODEL[1]
-		backupTime            = MYSQL_ALLOW_BACKUP_TIME[0]
+		retentionPeriod     int64 = 7
+		backupModel               = MYSQL_ALLOW_BACKUP_MODEL[1]
+		backupTime                = MYSQL_ALLOW_BACKUP_TIME[0]
+		binlogExpireDays    int64 = 7
+		enableBinlogStandby       = "off"
+		binlogStandbyDays   int64 = 180
 	)
-	err := mysqlService.ModifyBackupConfigByMysqlId(ctx, d.Id(), retentionPeriod, backupModel, backupTime)
+	err := mysqlService.ModifyBackupConfigByMysqlId(ctx, d.Id(), retentionPeriod, backupModel, backupTime, binlogExpireDays, enableBinlogStandby, binlogStandbyDays)
 	if err != nil {
 		return err
 	}

tencentcloud/resource_tc_mysql_backup_policy_test.go

@@ -26,6 +26,9 @@ func TestAccTencentCloudMysqlBackupPolicyResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "retention_period", "56"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "backup_time", "10:00-14:00"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_backup_policy.mysql_backup_policy", "binlog_period"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "binlog_period", "35"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "enable_binlog_standby", "on"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "binlog_standby_days", "33"),
 				),
 			},
 			{
@@ -36,6 +39,9 @@ func TestAccTencentCloudMysqlBackupPolicyResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "retention_period", "80"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "backup_time", "06:00-10:00"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_backup_policy.mysql_backup_policy", "binlog_period"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "binlog_period", "32"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "enable_binlog_standby", "off"),
+					resource.TestCheckResourceAttr("tencentcloud_mysql_backup_policy.mysql_backup_policy", "binlog_standby_days", "31"),
 				),
 			},
 		},
@@ -112,6 +118,9 @@ resource "tencentcloud_mysql_backup_policy" "mysql_backup_policy" {
   mysql_id         = local.mysql_id
   retention_period = 56
   backup_time      = "10:00-14:00"
+  binlog_period         = 35
+  enable_binlog_standby = "on"
+  binlog_standby_days   = 33
 }`, CommonPresetMysql)
 }
 
@@ -122,5 +131,8 @@ resource "tencentcloud_mysql_backup_policy" "mysql_backup_policy" {
   mysql_id         = local.mysql_id
   retention_period = 80
   backup_time      = "06:00-10:00"
+  binlog_period         = 32
+  enable_binlog_standby = "off"
+  binlog_standby_days   = 31
 }`, CommonPresetMysql)
 }

tencentcloud/service_tencentcloud_mysql.go

@@ -159,8 +159,8 @@ func (me *MysqlService) DescribeBackupConfigByMysqlId(ctx context.Context, mysql
 	return
 }
 
-func (me *MysqlService) ModifyBackupConfigByMysqlId(ctx context.Context, mysqlId string,
-	retentionPeriod int64, backupModel, backupTime string) (errRet error) {
+func (me *MysqlService) ModifyBackupConfigByMysqlId(ctx context.Context, mysqlId string, retentionPeriod int64, backupModel,
+	backupTime string, binlogExpireDays int64, enableBinlogStandby string, binlogStandbyDays int64) (errRet error) {
 
 	logId := getLogId(ctx)
 	request := cdb.NewModifyBackupConfigRequest()
@@ -169,6 +169,18 @@ func (me *MysqlService) ModifyBackupConfigByMysqlId(ctx context.Context, mysqlId
 	request.StartTime = &backupTime
 	request.BackupMethod = &backupModel
 
+	if binlogExpireDays > 0 {
+		request.BinlogExpireDays = &binlogExpireDays
+	}
+
+	if enableBinlogStandby != "" {
+		request.EnableBinlogStandby = &enableBinlogStandby
+	}
+
+	if binlogStandbyDays > 0 {
+		request.BinlogStandbyDays = &binlogStandbyDays
+	}
+
 	defer func() {
 		if errRet != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",

website/docs/r/mysql_backup_policy.html.markdown

@@ -65,10 +65,13 @@ resource "tencentcloud_mysql_instance" "example" {
 }
 
 resource "tencentcloud_mysql_backup_policy" "example" {
-  mysql_id         = tencentcloud_mysql_instance.example.id
-  retention_period = 7
-  backup_model     = "physical"
-  backup_time      = "01:00-05:00"
+  mysql_id              = tencentcloud_mysql_instance.example.id
+  retention_period      = 7
+  backup_model          = "physical"
+  backup_time           = "22:00-02:00"
+  binlog_period         = 32
+  enable_binlog_standby = "off"
+  binlog_standby_days   = 31
 }
 ```
 
@@ -79,13 +82,16 @@ The following arguments are supported:
 * `mysql_id` - (Required, String, ForceNew) Instance ID to which policies will be applied.
 * `backup_model` - (Optional, String) Backup method. Supported values include: `physical` - physical backup.
 * `backup_time` - (Optional, String) Instance backup time, in the format of 'HH:mm-HH:mm'. Time setting interval is four hours. Default to `02:00-06:00`. The following value can be supported: `02:00-06:00`, `06:00-10:00`, `10:00-14:00`, `14:00-18:00`, `18:00-22:00`, and `22:00-02:00`.
-* `retention_period` - (Optional, Int) Instance backup retention days. Valid value ranges: [7~730]. And default value is `7`.
+* `binlog_period` - (Optional, Int) Binlog retention time, in days. The minimum value is 7 days and the maximum value is 1830 days. This value cannot be set greater than the backup file retention time.
+* `binlog_standby_days` - (Optional, Int) The standard starting number of days for log backup storage. The log backup will be converted when it reaches the standard starting number of days for storage. The minimum is 30 days and must not be greater than the number of days for log backup retention.
+* `enable_binlog_standby` - (Optional, String) Whether to enable the log backup standard storage policy, `off` - close, `on` - open, the default is off.
+* `retention_period` - (Optional, Int) The retention time of backup files, in days. The minimum value is 7 days and the maximum value is 1830 days. And default value is `7`.
 
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - ID of the resource.
-* `binlog_period` - Retention period for binlog in days.
+