From b51f3026a15465710792c5a25dfa17c3a17f8780 Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 24 Oct 2025 17:44:50 +0800 Subject: [PATCH 1/3] fix --- ...nfiguration_permission_custom_policy_attachment.go | 11 ++++++++++- ...role_configuration_permission_policy_attachment.go | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policy_attachment.go b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policy_attachment.go index 1e1c12fec7..62805fe959 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policy_attachment.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policy_attachment.go @@ -151,7 +151,16 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionCustomPolicyAt _ = d.Set("role_policy_name", rolePolicyName) - respData, err := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom") + var respData *organization.ListPermissionPoliciesInRoleConfigurationResponseParams + err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + result, e := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom") + if e != nil { + return tccommon.RetryError(e) + } + + respData = result + return nil + }) if err != nil { return err } diff --git a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment.go b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment.go index 036d8c6404..f5301b23c2 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment.go @@ -174,7 +174,16 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionPolicyAttachme _ = d.Set("role_policy_id", rolePolicyId) - respData, err := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "System") + var respData *organization.ListPermissionPoliciesInRoleConfigurationResponseParams + err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + result, e := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "System") + if e != nil { + return tccommon.RetryError(e) + } + + respData = result + return nil + }) if err != nil { return err } From b2eca0f79681cfa2418b8798fd9d487722acb9db Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 24 Oct 2025 18:26:58 +0800 Subject: [PATCH 2/3] update test case and doc --- ...n_permission_custom_policies_attachment.md | 19 ----------------- ...mission_custom_policies_attachment_test.go | 21 +------------------ ...n_custom_policies_attachment.html.markdown | 19 ----------------- 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.md b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.md index 2ba9d22bd7..2c9a2884da 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.md +++ b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.md @@ -6,25 +6,6 @@ Example Usage resource "tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment" "identity_center_role_configuration_permission_custom_policies_attachment" { zone_id = "z-xxxxxx" role_configuration_id = "rc-xxxxxx" - policies { - role_policy_name = "CustomPolicy2" - role_policy_document = <<-EOF -{ - "version": "2.0", - "statement": [ - { - "effect": "allow", - "action": [ - "vpc:AcceptAttachCcnInstances" - ], - "resource": [ - "*" - ] - } - ] -} -EOF - } policies { role_policy_name = "CustomPolicy1" role_policy_document = <<-EOF diff --git a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment_test.go b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment_test.go index 12b1c09d4c..2a280281d5 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment_test.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment_test.go @@ -22,7 +22,7 @@ func TestAccTencentCloudIdentityCenterRoleConfigurationPermissionCustomPoliciesA resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "id"), resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "zone_id"), resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "role_configuration_id"), - resource.TestCheckResourceAttr("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "policies.#", "2"), + resource.TestCheckResourceAttr("tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment.identity_center_role_configuration_permission_custom_policies_attachment", "policies.#", "1"), ), }, { @@ -44,25 +44,6 @@ resource "tencentcloud_identity_center_role_configuration" "identity_center_role resource "tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment" "identity_center_role_configuration_permission_custom_policies_attachment" { zone_id = "z-s64jh54hbcra" role_configuration_id = tencentcloud_identity_center_role_configuration.identity_center_role_configuration.role_configuration_id - policies { - role_policy_name = "CustomPolicy2" - role_policy_document = <<-EOF -{ - "version": "2.0", - "statement": [ - { - "effect": "allow", - "action": [ - "vpc:AcceptAttachCcnInstances" - ], - "resource": [ - "*" - ] - } - ] -} -EOF - } policies { role_policy_name = "CustomPolicy1" role_policy_document = <<-EOF diff --git a/website/docs/r/identity_center_role_configuration_permission_custom_policies_attachment.html.markdown b/website/docs/r/identity_center_role_configuration_permission_custom_policies_attachment.html.markdown index 1cc6132a0c..49304243db 100644 --- a/website/docs/r/identity_center_role_configuration_permission_custom_policies_attachment.html.markdown +++ b/website/docs/r/identity_center_role_configuration_permission_custom_policies_attachment.html.markdown @@ -17,25 +17,6 @@ Provides a resource to create a organization tencentcloud_identity_center_role_c resource "tencentcloud_identity_center_role_configuration_permission_custom_policies_attachment" "identity_center_role_configuration_permission_custom_policies_attachment" { zone_id = "z-xxxxxx" role_configuration_id = "rc-xxxxxx" - policies { - role_policy_name = "CustomPolicy2" - role_policy_document = <<-EOF -{ - "version": "2.0", - "statement": [ - { - "effect": "allow", - "action": [ - "vpc:AcceptAttachCcnInstances" - ], - "resource": [ - "*" - ] - } - ] -} -EOF - } policies { role_policy_name = "CustomPolicy1" role_policy_document = <<-EOF From 052ae7ee5b132d746c1217284d56226d0190e552 Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 24 Oct 2025 18:34:58 +0800 Subject: [PATCH 3/3] update --- .changelog/3571.txt | 11 +++++++++++ ...iguration_permission_custom_policies_attachment.go | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .changelog/3571.txt diff --git a/.changelog/3571.txt b/.changelog/3571.txt new file mode 100644 index 0000000000..cafb4750ad --- /dev/null +++ b/.changelog/3571.txt @@ -0,0 +1,11 @@ +```release-note:enhancement +resource/identity_center_role_configuration_permission_policy_attachment: read add retry +``` + +```release-note:enhancement +resource/identity_center_role_configuration_permission_custom_policy_attachment: read add retry +``` + +```release-note:enhancement +resource/identity_center_role_configuration_permission_custom_policies_attachment: read add retry +``` diff --git a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.go b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.go index e469d75927..0738fdae33 100644 --- a/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.go +++ b/tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_custom_policies_attachment.go @@ -166,7 +166,16 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionCustomPolicies _ = d.Set("zone_id", zoneId) _ = d.Set("role_configuration_id", roleConfigurationId) - respData, err := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom") + var respData *organization.ListPermissionPoliciesInRoleConfigurationResponseParams + err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + result, e := service.DescribeIdentityCenterRoleConfigurationPermissionPolicyAttachmentById(ctx, zoneId, roleConfigurationId, "Custom") + if e != nil { + return tccommon.RetryError(e) + } + + respData = result + return nil + }) if err != nil { return err }