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

internal/conns: add retry handling for InternalErrorException when calling FMS PutPolicy #23952

Merged
merged 2 commits into from
Apr 1, 2022
Merged

internal/conns: add retry handling for InternalErrorException when calling FMS PutPolicy #23952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f818ce1
internal/conns: add retry handling for InternalErrorException when ca…
anGie44 Mar 30, 2022
a21368c
Update CHANGELOG for #23952
anGie44 Mar 30, 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/23952.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_fms_policy: Retry when `InternalErrorException` errors are returned from the AWS API
```
7 changes: 7 additions & 0 deletions internal/conns/conns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,13 @@ func (c *Config) Client(ctx context.Context) (interface{}, diag.Diagnostics) {
if tfawserr.ErrMessageContains(r.Error, fms.ErrCodeInvalidOperationException, "Your AWS Organization is currently onboarding with AWS Firewall Manager and cannot be offboarded.") {
r.Retryable = aws.Bool(true)
}
// System problems can arise during FMS policy updates (maybe also creation),
// so we set the following operation as retryable.
// Reference: https://github.com/hashicorp/terraform-provider-aws/issues/23946
case "PutPolicy":
if tfawserr.ErrCodeEquals(r.Error, fms.ErrCodeInternalErrorException) {
r.Retryable = aws.Bool(true)
}
}
})

Expand Down