Skip to content

Commit 7fde4e5

Browse files
author
mikatong
committed
add retry
1 parent 98d43f2 commit 7fde4e5

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

tencentcloud/services/tco/resource_tc_identity_center_role_assignment.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,26 @@ func resourceTencentCloudIdentityCenterRoleAssignmentRead(d *schema.ResourceData
201201

202202
service := OrganizationService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
203203

204-
respData, err := service.DescribeIdentityCenterRoleAssignmentById(ctx, d.Id())
204+
var roleAssignmentsResponseParams *organization.ListRoleAssignmentsResponseParams
205+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
206+
result, e := service.DescribeIdentityCenterRoleAssignmentById(ctx, d.Id())
207+
if e != nil {
208+
return tccommon.RetryError(e)
209+
}
210+
roleAssignmentsResponseParams = result
211+
return nil
212+
})
205213
if err != nil {
206214
return err
207215
}
208216

209-
if respData == nil {
217+
if roleAssignmentsResponseParams == nil {
210218
d.SetId("")
211219
log.Printf("[WARN]%s resource `identity_center_role_assignment` [%s] not found, please check if it has been deleted.\n", logId, d.Id())
212220
return nil
213221
}
214-
if len(respData.RoleAssignments) > 0 {
215-
roleAssignment := respData.RoleAssignments[0]
222+
if len(roleAssignmentsResponseParams.RoleAssignments) > 0 {
223+
roleAssignment := roleAssignmentsResponseParams.RoleAssignments[0]
216224
if roleAssignment.RoleConfigurationId != nil {
217225
_ = d.Set("role_configuration_id", roleAssignment.RoleConfigurationId)
218226
}

tencentcloud/services/tco/service_tencentcloud_organization.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,8 +1613,15 @@ func (me *OrganizationService) AssignmentTaskStatusStateRefreshFunc(zoneId, task
16131613
return func() (interface{}, string, error) {
16141614
ctx := tccommon.ContextNil
16151615

1616-
object, err := me.GetAssignmentTaskStatus(ctx, zoneId, taskId)
1617-
1616+
var object *organization.TaskStatus
1617+
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
1618+
result, e := me.GetAssignmentTaskStatus(ctx, zoneId, taskId)
1619+
if e != nil {
1620+
return tccommon.RetryError(e)
1621+
}
1622+
object = result
1623+
return nil
1624+
})
16181625
if err != nil {
16191626
return nil, "", err
16201627
}

0 commit comments

Comments
 (0)