service/waf: Only wrap errors returned by GetChangeToken in RetryWithToken #10242
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Token usage Reference: #9826 Wrapping the errors of the passed in WAF API functions breaks downstream error checking, e.g. `isAWSErr()` Previously (failure based on eventual consistency): ``` --- FAIL: TestAccAWSWafWebAcl_Rules (31.87s) testing.go:569: Step 2 error: errors during apply: Error: Error deleting WAF Rule: Error getting WAF change token: WAFReferencedItemException: This entity is still referenced by other entities. ``` Output from acceptance testing: ```console $ TF_ACC=1 go test ./aws -v -count=10 -timeout 120m -parallel 20 -run='TestAccAWSWafWebAcl_Rules' ... --- PASS: TestAccAWSWafWebAcl_Rules (36.99s) --- PASS: TestAccAWSWafWebAcl_Rules (34.34s) --- PASS: TestAccAWSWafWebAcl_Rules (34.90s) --- PASS: TestAccAWSWafWebAcl_Rules (35.58s) --- PASS: TestAccAWSWafWebAcl_Rules (36.87s) --- PASS: TestAccAWSWafWebAcl_Rules (33.99s) --- PASS: TestAccAWSWafWebAcl_Rules (35.01s) --- PASS: TestAccAWSWafWebAcl_Rules (33.60s) --- PASS: TestAccAWSWafWebAcl_Rules (33.70s) --- PASS: TestAccAWSWafWebAcl_Rules (35.82s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 353.338s ``` Also verified by running the stuck sweeper: ```console $ go test ./aws -v -sweep=us-east-1,us-west-2 -sweep-run=aws_wafregional_web_acl -timeout 10h ... 2019/09/25 11:50:25 [INFO] Deleting WAF Regional Web ACL: dc595176-6e50-488d-a9b0-35df984b672f ... 2019/09/25 11:50:26 [INFO] Removing Rules from WAF Regional Web ACL: dc595176-6e50-488d-a9b0-35df984b672f ... 2019/09/25 11:50:27 [INFO] Deleting WAF Regional Web ACL: dc595176-6e50-488d-a9b0-35df984b672f ... 2019/09/25 11:50:28 Sweeper Tests ran: - aws_wafregional_web_acl ok github.com/terraform-providers/terraform-provider-aws/aws 8.119s ```
bflad
added
bug
aeschright
approved these changes
Sep 27, 2019
|
This has been released in version 2.31.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks! |
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks! |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Community Note
Reference: #9826
Release note for CHANGELOG:
Wrapping the errors of the passed in WAF API functions breaks downstream error checking, e.g.
isAWSErr()Previously (failure based on eventual consistency):
Output from acceptance testing:
Also verified by running the stuck sweeper: