Skip to content

Commit 00e9aa6

Browse files
authored
fix cam group modify (#2232)
* fix cam group modify * add changelog
1 parent d5adba3 commit 00e9aa6

File tree

3 files changed

+33
-11
lines changed

3 files changed

+33
-11
lines changed

.changelog/2232.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/tencentcloud_cam_group: fix cam group modify error
3+
```

tencentcloud/resource_tc_cam_group.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,21 @@ func resourceTencentCloudCamGroupUpdate(d *schema.ResourceData, meta interface{}
184184
request.GroupId = &groupIdInt64
185185
changeFlag := false
186186

187-
if d.HasChange("remark") {
188-
request.Remark = helper.String(d.Get("remark").(string))
189-
changeFlag = true
187+
mutableArgs := []string{"name", "remark"}
190188

191-
}
192-
if d.HasChange("name") {
193-
request.GroupName = helper.String(d.Get("name").(string))
194-
changeFlag = true
189+
for _, v := range mutableArgs {
190+
if d.HasChange(v) {
191+
changeFlag = true
192+
break
193+
}
195194
}
196195

197196
if changeFlag {
197+
request.GroupName = helper.String(d.Get("name").(string))
198+
if v, ok := d.GetOk("remark"); ok {
199+
request.Remark = helper.String(v.(string))
200+
}
201+
198202
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
199203
response, e := meta.(*TencentCloudClient).apiV3Conn.UseCamClient().UpdateGroup(request)
200204

tencentcloud/resource_tc_cam_group_test.go

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,19 @@ func TestAccTencentCloudCamGroup_basic(t *testing.T) {
6363
resource.TestCheckResourceAttr("tencentcloud_cam_group.group_basic", "remark", "test"),
6464
),
6565
}, {
66-
Config: testAccCamGroup_update,
66+
Config: testAccCamGroup_update_name,
6767
Check: resource.ComposeTestCheckFunc(
6868
testAccCheckCamGroupExists("tencentcloud_cam_group.group_basic"),
6969
resource.TestCheckResourceAttr("tencentcloud_cam_group.group_basic", "name", "cam-group-test2"),
70-
resource.TestCheckResourceAttr("tencentcloud_cam_group.group_basic", "remark", "test-update"),
70+
resource.TestCheckResourceAttr("tencentcloud_cam_group.group_basic", "remark", "test"),
71+
),
72+
},
73+
{
74+
Config: testAccCamGroup_update_all,
75+
Check: resource.ComposeTestCheckFunc(
76+
testAccCheckCamGroupExists("tencentcloud_cam_group.group_basic"),
77+
resource.TestCheckResourceAttr("tencentcloud_cam_group.group_basic", "name", "cam-group-test3"),
78+
resource.TestCheckResourceAttr("tencentcloud_cam_group.group_basic", "remark", "test3"),
7179
),
7280
},
7381
{
@@ -133,9 +141,16 @@ resource "tencentcloud_cam_group" "group_basic" {
133141
}
134142
`
135143

136-
const testAccCamGroup_update = `
144+
const testAccCamGroup_update_name = `
137145
resource "tencentcloud_cam_group" "group_basic" {
138146
name = "cam-group-test2"
139-
remark = "test-update"
147+
remark = "test"
148+
}
149+
`
150+
151+
const testAccCamGroup_update_all = `
152+
resource "tencentcloud_cam_group" "group_basic" {
153+
name = "cam-group-test3"
154+
remark = "test3"
140155
}
141156
`

0 commit comments

Comments
 (0)