Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/aws_iam_role - add retry for assume role policy update #12436

Closed
wants to merge 1 commit into from
Closed

r/aws_iam_role - add retry for assume role policy update #12436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion aws/resource_aws_iam_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,21 @@ func resourceAwsIamRoleUpdate(d *schema.ResourceData, meta interface{}) error {
RoleName: aws.String(d.Id()),
PolicyDocument: aws.String(d.Get("assume_role_policy").(string)),
}
_, err := iamconn.UpdateAssumeRolePolicy(assumeRolePolicyInput)

err := resource.Retry(30*time.Second, func() *resource.RetryError {
var err error
_, err = iamconn.UpdateAssumeRolePolicy(assumeRolePolicyInput)
// IAM users (referenced in Principal field of assume policy)
// can take ~30 seconds to propagate in AWS
if isAWSErr(err, "MalformedPolicyDocument", "Invalid principal in policy") {
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
})
if isResourceTimeoutError(err) {
_, err = iamconn.UpdateAssumeRolePolicy(assumeRolePolicyInput)
}

if err != nil {
if isAWSErr(err, iam.ErrCodeNoSuchEntityException, "") {
d.SetId("")
Expand Down