Skip to content

fix: cynosdb ro group #1121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 29, 2022
Merged

fix: cynosdb ro group #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0a73b4
fix: cynosdb ro group
Kagashino Jun 28, 2022
1607f22
fix: temp add ro_group_sg because no ro group auto created
Kagashino Jun 29, 2022
6e7093c
fix: check roGroupId if modidfy
Kagashino Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions tencentcloud/resource_tc_cynosdb_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
}
}

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_cynosdb_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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,
Expand Down