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

Jump to bottom

aws_cloudformation_stack: use retry logic on IAM role error #22840

Merged
merged 4 commits into from
Jan 31, 2022
Merged

aws_cloudformation_stack: use retry logic on IAM role error #22840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc1b809
aws_cloudformation_stack: use retry logic on IAM role error
thatderek Jan 30, 2022
7830a70
Update 22840.txt
ewbankkit Jan 31, 2022
8841f77
Use 'tfresource.RetryWhen'.
ewbankkit Jan 31, 2022
16c1121
Merge branch 'cloudformation-stack-iam-fix' of https://github.com/tha…
ewbankkit Jan 31, 2022
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
3 changes: 3 additions & 0 deletions .changelog/22840.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_cloudformation_stack: Retry resource Create and Update for IAM eventual consistency
```
43 changes: 32 additions & 11 deletions internal/service/cloudformation/stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/flex"
tfiam "github.com/hashicorp/terraform-provider-aws/internal/service/iam"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
)

Expand Down Expand Up @@ -181,13 +183,24 @@ func resourceStackCreate(d *schema.ResourceData, meta interface{}) error {
}

log.Printf("[DEBUG] Creating CloudFormation Stack: %s", input)
output, err := conn.CreateStack(input)
outputRaw, err := tfresource.RetryWhen(tfiam.PropagationTimeout,
func() (interface{}, error) {
return conn.CreateStack(input)
},
func(err error) (bool, error) {
if tfawserr.ErrMessageContains(err, "ValidationError", "is invalid or cannot be assumed") {
return true, err
}

return false, err
},
)

if err != nil {
return fmt.Errorf("error creating CloudFormation Stack (%s): %w", name, err)
}

d.SetId(aws.StringValue(output.StackId))
d.SetId(aws.StringValue(outputRaw.(*cloudformation.CreateStackOutput).StackId))

if _, err := WaitStackCreated(conn, d.Id(), requestToken, d.Timeout(schema.TimeoutCreate)); err != nil {
return fmt.Errorf("error waiting for CloudFormation Stack (%s) create: %w", d.Id(), err)
Expand Down Expand Up @@ -358,21 +371,29 @@ func resourceStackUpdate(d *schema.ResourceData, meta interface{}) error {
input.RoleARN = aws.String(d.Get("iam_role_arn").(string))
}

log.Printf("[DEBUG] Updating CloudFormation stack: %s", input)
_, err := conn.UpdateStack(input)
if tfawserr.ErrMessageContains(err, "ValidationError", "No updates are to be performed.") {
log.Printf("[DEBUG] Current CloudFormation stack has no updates")
} else if err != nil {
return fmt.Errorf("error updating CloudFormation stack (%s): %w", d.Id(), err)
log.Printf("[DEBUG] Updating CloudFormation Stack: %s", input)
_, err := tfresource.RetryWhen(tfiam.PropagationTimeout,
func() (interface{}, error) {
return conn.UpdateStack(input)
},
func(err error) (bool, error) {
if tfawserr.ErrMessageContains(err, "ValidationError", "is invalid or cannot be assumed") {
return true, err
}

return false, err
},
)

if err != nil {
return fmt.Errorf("error updating CloudFormation Stack (%s): %w", d.Id(), err)
}

_, err = WaitStackUpdated(conn, d.Id(), requestToken, d.Timeout(schema.TimeoutUpdate))
if err != nil {
return fmt.Errorf("error waiting for CloudFormation Stack update: %w", err)
return fmt.Errorf("error waiting for CloudFormation Stack (%s) update: %w", d.Id(), err)
}

log.Printf("[INFO] CloudFormation stack (%s) updated", d.Id())

return resourceStackRead(d, meta)
}

Expand Down