Skip to content

Commit

Permalink
provider/aws: fix instance profile creation false negative
Browse files Browse the repository at this point in the history
fixes hashicorp#9474

discussion of approach in hashicorp#11634
  • Loading branch information
Paul Tittle authored and arcadiatea committed Feb 7, 2017
1 parent bb173ac commit bb9a397
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 bb9a397

Please sign in to comment.