fix(cdb): [119349326] mysql ro instacen support ro group id

Author: gitmkn

tencentcloud/services/cdb/resource_tc_mysql_readonly_instance.go

@@ -42,6 +42,12 @@ func ResourceTencentCloudMysqlReadonlyInstance() *schema.Resource {
 			Default:      0,
 			Description:  "Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.",
 		},
+		"ro_group_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "Read only group id. If rogroupId is empty, a new ro group is created by default. If it is not empty, the existing ro group is used.",
+		},
 	}
 
 	basic := TencentMsyqlBasicInfo()
@@ -114,8 +120,14 @@ func mysqlCreateReadonlyInstancePayByMonth(ctx context.Context, d *schema.Resour
 	request.MasterInstanceId = &masterInstanceId
 
 	// readonly group is not currently supported
-	defaultRoGroupMode := "allinone"
-	request.RoGroup = &cdb.RoGroup{RoGroupMode: &defaultRoGroupMode}
+	if v, ok := d.GetOk("ro_group_id"); ok {
+		roGroupId := v.(string)
+		defaultRoGroupMode := "join"
+		request.RoGroup = &cdb.RoGroup{RoGroupMode: &defaultRoGroupMode, RoGroupId: &roGroupId}
+	} else {
+		defaultRoGroupMode := "allinone"
+		request.RoGroup = &cdb.RoGroup{RoGroupMode: &defaultRoGroupMode}
+	}
 
 	if err := mysqlAllInstanceRoleSet(ctx, request, d, meta); err != nil {
 		return err
@@ -148,8 +160,14 @@ func mysqlCreateReadonlyInstancePayByUse(ctx context.Context, d *schema.Resource
 	request.MasterInstanceId = &masterInstanceId
 
 	// readonly group is not currently supported
-	defaultRoGroupMode := "allinone"
-	request.RoGroup = &cdb.RoGroup{RoGroupMode: &defaultRoGroupMode}
+	if v, ok := d.GetOk("ro_group_id"); ok {
+		roGroupId := v.(string)
+		defaultRoGroupMode := "join"
+		request.RoGroup = &cdb.RoGroup{RoGroupMode: &defaultRoGroupMode, RoGroupId: &roGroupId}
+	} else {
+		defaultRoGroupMode := "allinone"
+		request.RoGroup = &cdb.RoGroup{RoGroupMode: &defaultRoGroupMode}
+	}
 
 	if v, ok := d.GetOk("mem_size"); ok {
 		request.Memory = helper.IntInt64(v.(int))
@@ -376,6 +394,15 @@ func resourceTencentCloudMysqlReadonlyInstanceRead(d *schema.ResourceData, meta
 	_ = d.Set("status", mysqlInfo.Status)
 	_ = d.Set("task_status", mysqlInfo.TaskStatus)
 
+	roGroup, err := mysqlService.DescribeRoGroupByIdAndRoId(ctx, *mysqlInfo.MasterInfo.InstanceId, d.Id())
+	if err != nil {
+		return err
+	}
+
+	if roGroup != nil && roGroup.RoGroupId != nil {
+		_ = d.Set("ro_group_id", *roGroup.RoGroupId)
+	}
+
 	return nil
 }
 
@@ -408,6 +435,7 @@ func resourceTencentCloudMysqlReadonlyInstanceUpdate(d *schema.ResourceData, met
 		"master_instance_id",
 		"zone",
 		"master_region",
+		"ro_group_id",
 	}
 
 	for _, f := range immutableFields {

tencentcloud/services/cdb/resource_tc_mysql_readonly_instance_test.go

@@ -33,6 +33,7 @@ func TestAccTencentCloudMysqlReadonlyInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_readonly_instance.mysql_readonly", "intranet_ip"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_readonly_instance.mysql_readonly", "status"),
 					resource.TestCheckResourceAttrSet("tencentcloud_mysql_readonly_instance.mysql_readonly", "task_status"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_readonly_instance.mysql_readonly", "ro_group_id"),
 					resource.TestCheckResourceAttr("tencentcloud_mysql_readonly_instance.mysql_readonly", "tags.test", "test-tf"),
 				),
 			},
@@ -81,6 +82,13 @@ func TestAccTencentCloudMysqlReadonlyInstanceResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_mysql_readonly_instance.mysql_readonly", "mem_size", "1000"),
 				),
 			},
+			{
+				Config: testAccMysqlReadonlyInstance_roGroup(tcacctest.CommonPresetMysql),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckMysqlInstanceExists("tencentcloud_mysql_readonly_instance.mysql_readonly_ro_group"),
+					resource.TestCheckResourceAttrSet("tencentcloud_mysql_readonly_instance.mysql_readonly_ro_group", "ro_group_id"),
+				),
+			},
 			// // update intranet_port
 			// {
 			// 	Config: testAccMysqlReadonlyInstance_update(CommonPresetMysql, "mysql-readonly-update", "3361"),
@@ -217,3 +225,23 @@ resource "tencentcloud_mysql_readonly_instance" "mysql_readonly" {
 }
 	`, mysqlTestCase)
 }
+
+func testAccMysqlReadonlyInstance_roGroup(mysqlTestCase string) string {
+	return fmt.Sprintf(`
+%s
+resource "tencentcloud_mysql_readonly_instance" "mysql_readonly_ro_group" {
+  master_instance_id = local.mysql_id
+  ro_group_id 		 = tencentcloud_mysql_readonly_instance.mysql_readonly.ro_group_id
+  mem_size           = 1000
+  cpu                = 1
+  volume_size        = 200
+  instance_name      = "mysql-readonly-test"
+  intranet_port      = 3360
+  master_region = var.region
+  zone = var.availability_zone
+  tags = {
+    test = "test-tf"
+  }
+}
+	`, mysqlTestCase)
+}

tencentcloud/services/cdb/service_tencentcloud_mysql.go

@@ -3154,6 +3154,45 @@ func (me *MysqlService) DescribeMysqlRoGroupById(ctx context.Context, instanceId
 	return
 }
 
+func (me *MysqlService) DescribeRoGroupByIdAndRoId(ctx context.Context, instanceId string, roInstanceId string) (roGroup *cdb.RoGroup, errRet error) {
+	logId := tccommon.GetLogId(ctx)
+
+	request := cdb.NewDescribeRoGroupsRequest()
+	request.InstanceId = &instanceId
+
+	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().DescribeRoGroups(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	if len(response.Response.RoGroups) < 1 {
+		return
+	}
+
+	for _, v := range response.Response.RoGroups {
+		if len(v.RoInstances) > 0 {
+			for _, ro := range v.RoInstances {
+				if *ro.InstanceId == roInstanceId {
+					roGroup = v
+					return
+				}
+			}
+		}
+	}
+
+	return
+}
+
 func (me *MysqlService) DescribeMysqlErrorLogByFilter(ctx context.Context, param map[string]interface{}) (errorLog []*cdb.ErrlogItem, errRet error) {
 	var (
 		logId   = tccommon.GetLogId(ctx)

website/docs/r/mysql_readonly_instance.html.markdown

@@ -101,6 +101,7 @@ The following arguments are supported:
 * `pay_type` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.36.0. Please use `charge_type` instead. Pay type of instance. Valid values: `0`, `1`. `0`: prepaid, `1`: postpaid.
 * `period` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.36.0. Please use `prepaid_period` instead. Period of instance. NOTES: Only supported prepaid instance.
 * `prepaid_period` - (Optional, Int) Period of instance. NOTES: Only supported prepaid instance.
+* `ro_group_id` - (Optional, String) Read only group id. If rogroupId is empty, a new ro group is created by default. If it is not empty, the existing ro group is used.
 * `security_groups` - (Optional, Set: [`String`]) Security groups to use.
 * `slave_deploy_mode` - (Optional, Int) Availability zone deployment method. Available values: 0 - Single availability zone; 1 - Multiple availability zones.
 * `subnet_id` - (Optional, String) Private network ID. If `vpc_id` is set, this value is required.