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

r/networkfirewall_resource_policy: add error handling during delete for possible RAM related error #22402

Merged
merged 2 commits into from
Jan 4, 2022
Merged

r/networkfirewall_resource_policy: add error handling during delete for possible RAM related error #22402

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
53a36cf
feat: add error handling during delete
anGie44 Jan 4, 2022
44eb1af
Update CHANGELOG for #22402
anGie44 Jan 4, 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/22402.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_networkfirewall_resource_policy: Handle delete-after-create eventual consistency
```
21 changes: 17 additions & 4 deletions internal/service/networkfirewall/resource_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
)

Expand Down Expand Up @@ -117,12 +118,24 @@ func resourceResourcePolicyDelete(ctx context.Context, d *schema.ResourceData, m
ResourceArn: aws.String(d.Id()),
}

_, err := conn.DeleteResourcePolicyWithContext(ctx, input)
_, err := tfresource.RetryWhenContext(ctx, resourcePolicyDeleteTimeout,
func() (interface{}, error) {
return conn.DeleteResourcePolicyWithContext(ctx, input)
},
func(err error) (bool, error) {
// RAM managed permissions eventual consistency
if tfawserr.ErrMessageContains(err, networkfirewall.ErrCodeInvalidResourcePolicyException, "The supplied policy does not match RAM managed permissions") {
return true, err
}
return false, err
},
)

if tfawserr.ErrCodeEquals(err, networkfirewall.ErrCodeResourceNotFoundException) {
return nil
}

if err != nil {
if tfawserr.ErrCodeEquals(err, networkfirewall.ErrCodeResourceNotFoundException) {
return nil
}
return diag.FromErr(fmt.Errorf("error deleting NetworkFirewall Resource Policy (for resource: %s): %w", d.Id(), err))
}

Expand Down
2 changes: 2 additions & 0 deletions internal/service/networkfirewall/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const (
firewallTimeout = 20 * time.Minute
// Maximum amount of time to wait for a Firewall Policy to be deleted
firewallPolicyTimeout = 10 * time.Minute
// Maximum amount of time to wait for a Resource Policy to be deleted
resourcePolicyDeleteTimeout = 2 * time.Minute
// Maximum amount of time to wait for a Rule Group to be deleted
ruleGroupDeleteTimeout = 10 * time.Minute
)
Expand Down