ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #6049: In Opsworks Stacks, wait for IAM changes to settle

This commit is contained in:
Martin Atkins 2016-04-16 09:54:20 -07:00
parent 2fbdeb93b1 be0ebbc22e
commit 64db0454b4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/providers/aws/resource_aws_opsworks_stack.go
View File

@ -341,7 +341,8 @@ func resourceAwsOpsworksStackCreate(d *schema.ResourceData, meta interface{}) er
// Service Role Arn: [...] is not yet propagated, please try again in a couple of minutes // Service Role Arn: [...] is not yet propagated, please try again in a couple of minutes
propErr := "not yet propagated" propErr := "not yet propagated"
trustErr := "not the necessary trust relationship" trustErr := "not the necessary trust relationship"
if opserr.Code() == "ValidationException" && (strings.Contains(opserr.Message(), trustErr) || strings.Contains(opserr.Message(), propErr)) { validateErr := "validate IAM role permission"
if opserr.Code() == "ValidationException" && (strings.Contains(opserr.Message(), trustErr) || strings.Contains(opserr.Message(), propErr) || strings.Contains(opserr.Message(), validateErr)) {
log.Printf("[INFO] Waiting for service IAM role to propagate") log.Printf("[INFO] Waiting for service IAM role to propagate")
return resource.RetryableError(cerr) return resource.RetryableError(cerr)
} }