Skip to content

Commit

Permalink
Merge pull request #11678 from snakeb1t/iam_instance_profile_availcheck
Browse files Browse the repository at this point in the history
provider/aws: fix instance profile creation false negative
  • Loading branch information
catsby authored Feb 6, 2017
2 parents 1efd5ff + bd5fc5d commit 2e0b30e
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions builtin/providers/aws/resource_aws_iam_instance_profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,17 @@ func resourceAwsIamInstanceProfileCreate(d *schema.ResourceData, meta interface{
return fmt.Errorf("Error creating IAM instance profile %s: %s", name, err)
}

waiterRequest := &iam.GetInstanceProfileInput{
InstanceProfileName: aws.String(name),
}
// don't return until the IAM service reports that the instance profile is ready.
// this ensures that terraform resources which rely on the instance profile will 'see'
// that the instance profile exists.
err = iamconn.WaitUntilInstanceProfileExists(waiterRequest)
if err != nil {
return fmt.Errorf("Timed out while waiting for instance profile %s: %s", name, err)
}

return instanceProfileSetRoles(d, iamconn)
}

Expand Down

0 comments on commit 2e0b30e

Please sign in to comment.