fix: cynosdb ro group (#1121)

* fix: cynosdb ro group

* fix: temp add ro_group_sg because no ro group auto created

* fix: check roGroupId if modidfy

Author: Kagashino

tencentcloud/resource_tc_cynosdb_cluster.go

@@ -262,12 +262,12 @@ func resourceTencentCloudCynosdbClusterCreate(d *schema.ResourceData, meta inter
 		return err
 	}
 	var rwGroupId string
-	var roGroupId string
+	var roGroupIds []string
 	for _, insGrp := range insGrps.Response.InstanceGrpInfoList {
 		if *insGrp.Type == CYNOSDB_INSGRP_HA {
 			rwGroupId = *insGrp.InstanceGrpId
 		} else if *insGrp.Type == CYNOSDB_INSGRP_RO {
-			roGroupId = *insGrp.InstanceGrpId
+			roGroupIds = append(roGroupIds, *insGrp.InstanceGrpId)
 		}
 	}
 	if v, ok := d.GetOk("rw_group_sg"); ok {
@@ -280,14 +280,16 @@ func resourceTencentCloudCynosdbClusterCreate(d *schema.ResourceData, meta inter
 			return err
 		}
 	}
-	if v, ok := d.GetOk("ro_group_sg"); ok {
-		vv := v.([]interface{})
-		vvv := make([]*string, 0, len(vv))
-		for _, item := range vv {
-			vvv = append(vvv, helper.String(item.(string)))
-		}
-		if err = cynosdbService.ModifyInsGrpSecurityGroups(ctx, roGroupId, d.Get("available_zone").(string), vvv); err != nil {
-			return err
+	if v, ok := d.GetOk("ro_group_sg"); ok && len(roGroupIds) > 0 {
+		for _, roGroupId := range roGroupIds {
+			vv := v.([]interface{})
+			vvv := make([]*string, 0, len(vv))
+			for _, item := range vv {
+				vvv = append(vvv, helper.String(item.(string)))
+			}
+			if err = cynosdbService.ModifyInsGrpSecurityGroups(ctx, roGroupId, d.Get("available_zone").(string), vvv); err != nil {
+				return err
+			}
 		}
 	}
 
@@ -596,18 +598,19 @@ func resourceTencentCloudCynosdbClusterUpdate(d *schema.ResourceData, meta inter
 		if err := cynosdbService.ModifyInsGrpSecurityGroups(ctx, d.Get("rw_group_id").(string), d.Get("available_zone").(string), vv); err != nil {
 			return err
 		}
-		d.SetPartial("rw_group_sg")
 	}
 	if d.HasChange("ro_group_sg") {
 		v := d.Get("ro_group_sg").([]interface{})
 		vv := make([]*string, 0, len(v))
 		for _, item := range v {
 			vv = append(vv, helper.String(item.(string)))
 		}
-		if err := cynosdbService.ModifyInsGrpSecurityGroups(ctx, d.Get("ro_group_id").(string), d.Get("available_zone").(string), vv); err != nil {
-			return err
+		if roGroupId := d.Get("ro_group_id").(string); roGroupId != "" {
+			err := cynosdbService.ModifyInsGrpSecurityGroups(ctx, roGroupId, d.Get("available_zone").(string), vv)
+			if err != nil {
+				return err
+			}
 		}
-		d.SetPartial("ro_group_sg")
 	}
 
 	d.Partial(false)

tencentcloud/resource_tc_cynosdb_cluster_test.go

@@ -93,7 +93,7 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster.foo", "rw_group_instances.0.instance_name"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster.foo", "rw_group_addr.0.ip"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster.foo", "rw_group_addr.0.port"),
-					resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster.foo", "ro_group_id"),
+					//resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster.foo", "ro_group_id"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.#", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.name", "character_set_server"),
 					resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster.foo", "param_items.0.current_value", "utf8"),
@@ -103,7 +103,7 @@ func TestAccTencentCloudCynosdbClusterResource(t *testing.T) {
 				ResourceName:            "tencentcloud_cynosdb_cluster.foo",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"password", "force_delete", "storage_limit", "param_items"},
+				ImportStateVerifyIgnore: []string{"password", "force_delete", "storage_limit", "param_items", "ro_group_sg"},
 			},
 			{
 				Config: testAccCynosdbCluster_update,