Skip to content

Commit 5b29b74

Browse files
tongyimingmikatong
andauthored
fix: cam unit-test (#852)
Co-authored-by: mikatong <[email protected]>
1 parent 5057d86 commit 5b29b74

5 files changed

+32
-26
lines changed

tencentcloud/data_source_tc_cam_policies_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ func TestAccTencentCloudCamPoliciesDataSource_basic(t *testing.T) {
1818
Check: resource.ComposeAggregateTestCheckFunc(
1919
testAccCheckCamPolicyExists("tencentcloud_cam_policy.policy"),
2020
resource.TestCheckResourceAttr("data.tencentcloud_cam_policies.policies", "policy_list.#", "1"),
21-
resource.TestCheckResourceAttr("data.tencentcloud_cam_policies.policies", "policy_list.0.name", "cam-policy-test5"),
21+
resource.TestCheckResourceAttr("data.tencentcloud_cam_policies.policies", "policy_list.0.name", "cam-policy-test55"),
2222
resource.TestCheckResourceAttr("data.tencentcloud_cam_policies.policies", "policy_list.0.description", "test"),
2323
resource.TestCheckResourceAttrSet("data.tencentcloud_cam_policies.policies", "policy_list.0.attachments"),
2424
resource.TestCheckResourceAttrSet("data.tencentcloud_cam_policies.policies", "policy_list.0.create_time"),
25-
resource.TestCheckResourceAttrSet("data.tencentcloud_cam_policies.policies", "policy_list.0.service_type"),
2625
resource.TestCheckResourceAttrSet("data.tencentcloud_cam_policies.policies", "policy_list.0.create_mode"),
2726
resource.TestCheckResourceAttrSet("data.tencentcloud_cam_policies.policies", "policy_list.0.policy_id"),
2827
),
@@ -33,7 +32,7 @@ func TestAccTencentCloudCamPoliciesDataSource_basic(t *testing.T) {
3332

3433
const testAccCamPoliciesDataSource_basic = `
3534
resource "tencentcloud_cam_policy" "policy" {
36-
name = "cam-policy-test5"
35+
name = "cam-policy-test55"
3736
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"resource\":[\"*\"]}]}"
3837
description = "test"
3938
}

tencentcloud/data_source_tc_cam_role_policy_attachments_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tencentcloud
22

33
import (
4+
"fmt"
45
"testing"
56

67
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -14,7 +15,7 @@ func TestAccTencentCloudCamRolePolicyAttachmentsDataSource_basic(t *testing.T) {
1415
CheckDestroy: testAccCheckCamRolePolicyAttachmentDestroy,
1516
Steps: []resource.TestStep{
1617
{
17-
Config: testAccCamRolePolicyAttachmentsDataSource_basic,
18+
Config: testAccCamRolePolicyAttachmentsDataSource_basic(ownerUin),
1819
Check: resource.ComposeAggregateTestCheckFunc(
1920
testAccCheckCamRolePolicyAttachmentExists("tencentcloud_cam_role_policy_attachment.role_policy_attachment"),
2021
resource.TestCheckResourceAttr("data.tencentcloud_cam_role_policy_attachments.role_policy_attachments", "role_policy_attachment_list.#", "1"),
@@ -28,10 +29,11 @@ func TestAccTencentCloudCamRolePolicyAttachmentsDataSource_basic(t *testing.T) {
2829
})
2930
}
3031

31-
const testAccCamRolePolicyAttachmentsDataSource_basic = `
32+
func testAccCamRolePolicyAttachmentsDataSource_basic(uin string) string {
33+
return fmt.Sprintf(`
3234
resource "tencentcloud_cam_role" "role" {
3335
name = "cam-role-test"
34-
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
36+
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/%s:uin/%s\"]}}]}"
3537
description = "test"
3638
console_login = true
3739
}
@@ -49,5 +51,5 @@ resource "tencentcloud_cam_role_policy_attachment" "role_policy_attachment" {
4951
5052
data "tencentcloud_cam_role_policy_attachments" "role_policy_attachments" {
5153
role_id = tencentcloud_cam_role_policy_attachment.role_policy_attachment.role_id
54+
}`, uin, uin)
5255
}
53-
`

tencentcloud/data_source_tc_cam_roles_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tencentcloud
22

33
import (
4+
"fmt"
45
"testing"
56

67
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -14,7 +15,7 @@ func TestAccTencentCloudCamRolesDataSource_basic(t *testing.T) {
1415
CheckDestroy: testAccCheckCamRoleDestroy,
1516
Steps: []resource.TestStep{
1617
{
17-
Config: testAccCamRolesDataSource_basic,
18+
Config: testAccCamRolesDataSource_basic(ownerUin),
1819
Check: resource.ComposeAggregateTestCheckFunc(
1920
testAccCheckCamRoleExists("tencentcloud_cam_role.role"),
2021
resource.TestCheckResourceAttr("data.tencentcloud_cam_roles.roles", "role_list.#", "1"),
@@ -31,15 +32,16 @@ func TestAccTencentCloudCamRolesDataSource_basic(t *testing.T) {
3132
})
3233
}
3334

34-
const testAccCamRolesDataSource_basic = `
35+
func testAccCamRolesDataSource_basic(uin string) string {
36+
return fmt.Sprintf(`
3537
resource "tencentcloud_cam_role" "role" {
3638
name = "cam-role-test11"
37-
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
39+
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/%s:uin/%s\"]}}]}"
3840
description = "test"
3941
console_login = true
4042
}
4143
4244
data "tencentcloud_cam_roles" "roles" {
4345
role_id = tencentcloud_cam_role.role.id
46+
}`, uin, uin)
4447
}
45-
`

tencentcloud/resource_tc_cam_role_policy_attachment_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestAccTencentCloudCamRolePolicyAttachment_basic(t *testing.T) {
1717
CheckDestroy: testAccCheckCamRolePolicyAttachmentDestroy,
1818
Steps: []resource.TestStep{
1919
{
20-
Config: testAccCamRolePolicyAttachment_basic,
20+
Config: testAccCamRolePolicyAttachment_basic(ownerUin),
2121
Check: resource.ComposeTestCheckFunc(
2222
testAccCheckCamRolePolicyAttachmentExists("tencentcloud_cam_role_policy_attachment.role_policy_attachment_basic"),
2323
resource.TestCheckResourceAttrSet("tencentcloud_cam_role_policy_attachment.role_policy_attachment_basic", "role_id"),
@@ -80,10 +80,11 @@ func testAccCheckCamRolePolicyAttachmentExists(n string) resource.TestCheckFunc
8080
}
8181

8282
//need to add policy resource definition
83-
const testAccCamRolePolicyAttachment_basic = `
83+
func testAccCamRolePolicyAttachment_basic(uin string) string {
84+
return fmt.Sprintf(`
8485
resource "tencentcloud_cam_role" "role" {
8586
name = "cam-role-test"
86-
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
87+
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/%s:uin/%s\"]}}]}"
8788
description = "test"
8889
console_login = true
8990
}
@@ -97,5 +98,5 @@ resource "tencentcloud_cam_policy" "policy" {
9798
resource "tencentcloud_cam_role_policy_attachment" "role_policy_attachment_basic" {
9899
role_id = tencentcloud_cam_role.role.id
99100
policy_id = tencentcloud_cam_policy.policy.id
101+
}`, uin, uin)
100102
}
101-
`

tencentcloud/resource_tc_cam_role_test.go

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ func TestAccTencentCloudCamRole_basic(t *testing.T) {
1717
CheckDestroy: testAccCheckCamRoleDestroy,
1818
Steps: []resource.TestStep{
1919
{
20-
Config: testAccCamRole_basic,
20+
Config: testAccCamRole_basic(ownerUin),
2121
Check: resource.ComposeTestCheckFunc(
2222
testAccCheckCamRoleExists("tencentcloud_cam_role.role_basic"),
2323
resource.TestCheckResourceAttrSet("tencentcloud_cam_role.role_basic", "name"),
2424
resource.TestCheckResourceAttrSet("tencentcloud_cam_role.role_basic", "document"),
2525
),
2626
}, {
27-
Config: testAccCamRole_update,
27+
Config: testAccCamRole_update(ownerUin),
2828
Check: resource.ComposeTestCheckFunc(
2929
testAccCheckCamRoleExists("tencentcloud_cam_role.role_basic"),
3030
resource.TestCheckResourceAttrSet("tencentcloud_cam_role.role_basic", "name"),
@@ -86,19 +86,21 @@ func testAccCheckCamRoleExists(n string) resource.TestCheckFunc {
8686
}
8787
}
8888

89-
const testAccCamRole_basic = `
89+
func testAccCamRole_basic(uin string) string {
90+
return fmt.Sprintf(`
9091
resource "tencentcloud_cam_role" "role_basic" {
91-
name = "cam-role-test1"
92-
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
93-
description = "test"
94-
console_login = true
92+
name = "cam-role-test1"
93+
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/%s:uin/%s\"]}}]}"
94+
description = "test"
95+
console_login = true
96+
}`, uin, uin)
9597
}
96-
`
9798

98-
const testAccCamRole_update = `
99+
func testAccCamRole_update(uin string) string {
100+
return fmt.Sprintf(`
99101
resource "tencentcloud_cam_role" "role_basic" {
100102
name = "cam-role-test1"
101-
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}},{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/100009461222:uin/100009461222\"]}}]}"
103+
document = "{\"version\":\"2.0\",\"statement\":[{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/%s:uin/%s\"]}},{\"action\":[\"name/sts:AssumeRole\"],\"effect\":\"allow\",\"principal\":{\"qcs\":[\"qcs::cam::uin/%s:uin/%s\"]}}]}"
102104
console_login = false
105+
}`, uin, uin, uin, uin)
103106
}
104-
`

0 commit comments

Comments
 (0)