Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 99d7e05

Browse files
tongyimingmikatong
and
mikatong
authored
fix(tco): [128193292]policy attachment add retry (#3571)
* fix * update test case and doc * update --------- Co-authored-by: mikatong <mikatong@tencent.com>
1 parent b3377f3 commit 99d7e05

7 files changed

+42
-61
lines changed

‎.changelog/3571.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
```release-note:enhancement
2+
resource/identity_center_role_configuration_permission_policy_attachment: read add retry
3+
```
4+
5+
```release-note:enhancement
6+
resource/identity_center_role_configuration_permission_custom_policy_attachment: read add retry
7+
```
8+
9+
```release-note:enhancement
10+
resource/identity_center_role_configuration_permission_custom_policies_attachment: read add retry
11+
```

‎tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,16 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionCustomPolicies
166166
_ = d.Set("zone_id", zoneId)
167167
_ = d.Set("role_configuration_id", roleConfigurationId)
168168

169-
respData, err := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom")
169+
var respData *organization.ListPermissionPoliciesInRoleConfigurationResponseParams
170+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
171+
result, e := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom")
172+
if e != nil {
173+
return tccommon.RetryError(e)
174+
}
175+
176+
respData = result
177+
return nil
178+
})
170179
if err != nil {
171180
return err
172181
}

‎tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.md‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,6 @@ Example Usage
66
resource "tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment" "identity_center_role_configuration_permission_custom_policies_attachment" {
77
zone_id = "z-xxxxxx"
88
role_configuration_id = "rc-xxxxxx"
9-
policies {
10-
role_policy_name = "CustomPolicy2"
11-
role_policy_document = <<-EOF
12-
{
13-
"version": "2.0",
14-
"statement": [
15-
{
16-
"effect": "allow",
17-
"action": [
18-
"vpc:AcceptAttachCcnInstances"
19-
],
20-
"resource": [
21-
"*"
22-
]
23-
}
24-
]
25-
}
26-
EOF
27-
}
289
policies {
2910
role_policy_name = "CustomPolicy1"
3011
role_policy_document = <<-EOF

‎tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment_test.go‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccTencentCloudIdentityCenterRoleConfigurationPermissionCustomPoliciesA
2222
resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "id"),
2323
resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "zone_id"),
2424
resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "role_configuration_id"),
25-
resource.TestCheckResourceAttr("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "policies.#", "2"),
25+
resource.TestCheckResourceAttr("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "policies.#", "1"),
2626
),
2727
},
2828
{
@@ -44,25 +44,6 @@ resource "tencentcloud_identity_center_role_configuration" "identity_center_role
4444
resource "tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment" "identity_center_role_configuration_permission_custom_policies_attachment" {
4545
zone_id = "z-s64jh54hbcra"
4646
role_configuration_id = tencentcloud_identity_center_role_configuration.identity_center_role_configuration.role_configuration_id
47-
policies {
48-
role_policy_name = "CustomPolicy2"
49-
role_policy_document = <<-EOF
50-
{
51-
"version": "2.0",
52-
"statement": [
53-
{
54-
"effect": "allow",
55-
"action": [
56-
"vpc:AcceptAttachCcnInstances"
57-
],
58-
"resource": [
59-
"*"
60-
]
61-
}
62-
]
63-
}
64-
EOF
65-
}
6647
policies {
6748
role_policy_name = "CustomPolicy1"
6849
role_policy_document = <<-EOF

‎tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policy_attachment.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,16 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionCustomPolicyAt
151151

152152
_ = d.Set("role_policy_name", rolePolicyName)
153153

154-
respData, err := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom")
154+
var respData *organization.ListPermissionPoliciesInRoleConfigurationResponseParams
155+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
156+
result, e := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom")
157+
if e != nil {
158+
return tccommon.RetryError(e)
159+
}
160+
161+
respData = result
162+
return nil
163+
})
155164
if err != nil {
156165
return err
157166
}

‎tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,16 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionPolicyAttachme
174174

175175
_ = d.Set("role_policy_id", rolePolicyId)
176176

177-
respData, err := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "System")
177+
var respData *organization.ListPermissionPoliciesInRoleConfigurationResponseParams
178+
err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
179+
result, e := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "System")
180+
if e != nil {
181+
return tccommon.RetryError(e)
182+
}
183+
184+
respData = result
185+
return nil
186+
})
178187
if err != nil {
179188
return err
180189
}

‎website/docs/r/identity_center_role_configuration_permission_custom_policies_attachment.html.markdown‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,6 @@ Provides a resource to create a organization tencentcloud_identity_center_role_c
1717
resource "tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment" "identity_center_role_configuration_permission_custom_policies_attachment" {
1818
zone_id = "z-xxxxxx"
1919
role_configuration_id = "rc-xxxxxx"
20-
policies {
21-
role_policy_name = "CustomPolicy2"
22-
role_policy_document = <<-EOF
23-
{
24-
"version": "2.0",
25-
"statement": [
26-
{
27-
"effect": "allow",
28-
"action": [
29-
"vpc:AcceptAttachCcnInstances"
30-
],
31-
"resource": [
32-
"*"
33-
]
34-
}
35-
]
36-
}
37-
EOF
38-
}
3920
policies {
4021
role_policy_name = "CustomPolicy1"
4122
role_policy_document = <<-EOF

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /