fix(tco): [119540543]tco sync problem (#2809)

* fix tco sync

* add changelog

---------

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

.changelog/2809.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/tencentcloud_identity_center_user: read add retry
+```
+
+```release-note:enhancement
+resource/tencentcloud_identity_center_role_configuration_permission_policy_attachment: support `role_policy_name`
+```

tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment.go

@@ -47,6 +47,7 @@ func ResourceTencentCloudIdentityCenterRoleConfigurationPermissionPolicyAttachme
 
 			"role_policy_name": {
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
 				Description: "Role policy name.",
 			},
@@ -111,10 +112,14 @@ func resourceTencentCloudIdentityCenterRoleConfigurationPermissionPolicyAttachme
 	request.RolePolicyType = helper.String("System")
 
 	if v, ok := d.GetOk("role_policy_id"); ok {
+		policyDetail := &organization.PolicyDetail{
+			PolicyId: helper.IntInt64(v.(int)),
+		}
+		if vv, innerOk := d.GetOk("role_policy_name"); innerOk {
+			policyDetail.PolicyName = helper.String(vv.(string))
+		}
 		request.RolePolicies = []*organization.PolicyDetail{
-			{
-				PolicyId: helper.IntInt64(v.(int)),
-			},
+			policyDetail,
 		}
 	}
 

tencentcloud/services/tco/resource_tc_identity_center_role_configuration_permission_policy_attachment_test.go

@@ -20,6 +20,7 @@ func TestAccTencentCloudIdentityCenterRoleConfigurationPermissionPolicyAttachmen
 				Config: testAccIdentityCenterRoleConfigurationPermissionPolicyAttachment,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_policy_attachment.identity_center_role_configuration_permission_policy_attachment", "id"),
+					resource.TestCheckResourceAttrSet("tencentcloud_identity_center_role_configuration_permission_policy_attachment.identity_center_role_configuration_permission_policy_attachment", "role_policy_name"),
 				),
 			},
 			{
@@ -42,5 +43,6 @@ resource "tencentcloud_identity_center_role_configuration_permission_policy_atta
     zone_id = "z-s64jh54hbcra"
     role_configuration_id = tencentcloud_identity_center_role_configuration.identity_center_role_configuration.role_configuration_id
     role_policy_id = 186457
+	role_policy_name = "QcloudVPCReadOnlyAccess"
 }
 `

tencentcloud/services/tco/service_tencentcloud_organization.go

@@ -1287,21 +1287,30 @@ func (me *OrganizationService) DescribeIdentityCenterUserById(ctx context.Contex
 	request := organization.NewGetUserRequest()
 	request.UserId = helper.String(userId)
 	request.ZoneId = helper.String(zoneId)
+	response := organization.NewGetUserResponse()
 
 	defer func() {
 		if errRet != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
 		}
 	}()
 
-	ratelimit.Check(request.GetAction())
-
-	response, err := me.client.UseOrganizationClient().GetUser(request)
+	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		result, e := me.client.UseOrganizationClient().GetUser(request)
+		if e != nil {
+			return tccommon.RetryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		response = result
+		return nil
+	})
 	if err != nil {
 		errRet = err
+		log.Printf("[CRITAL]%s update identity center user failed, reason:%+v", logId, err)
 		return
 	}
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
 	if response.Response == nil {
 		return

website/docs/r/identity_center_role_configuration_permission_policy_attachment.html.markdown

@@ -28,6 +28,7 @@ The following arguments are supported:
 * `role_configuration_id` - (Required, String, ForceNew) Permission configuration ID.
 * `role_policy_id` - (Required, Int, ForceNew) Role policy id.
 * `zone_id` - (Required, String, ForceNew) Space ID.
+* `role_policy_name` - (Optional, String) Role policy name.
 
 ## Attributes Reference
 
@@ -36,7 +37,6 @@ In addition to all arguments above, the following attributes are exported:
 * `id` - ID of the resource.
 * `add_time` - Role policy add time.
 * `role_policy_document` - Role policy document.
-* `role_policy_name` - Role policy name.
 * `role_policy_type` - Role policy type.