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.

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

Add retry for "conflicting operation" when creating/updating multiple aws_cloudwatch_log_subscription_filter resources #24148

Merged
merged 2 commits into from
Apr 12, 2022

Conversation

onematchfox
Copy link
Contributor

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #24063

Changes proposed in this pull request:

  • Add retry for error OperationAbortedException: [.*] Please try again. (rather than ensuring creation is serial as originally described in issue)

Output from acceptance testing:

$ make testacc TESTS=TestAccCloudWatchLogsSubscriptionFilter_many PKG=cloudwatchlogs
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cloudwatchlogs/... -v -count 1 -parallel 20 -run='TestAccCloudWatchLogsSubscriptionFilter_many'  -timeout 180m
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_many
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_many
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_many
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_many (35.90s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cloudwatchlogs	35.949s

@github-actions github-actions bot added needs-triage Waiting for first response or review from a maintainer. size/M Managed by automation to categorize the size of a PR. service/cloudwatchlogs tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Apr 8, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welcome @onematchfox 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTING guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

… `aws_cloudwatch_log_subscription_filter` resources
@justinretzolk justinretzolk added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Apr 8, 2022
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀.

% make testacc TESTS=TestAccCloudWatchLogsSubscriptionFilter_ PKG=cloudwatchlogs ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cloudwatchlogs/... -v -count 1 -parallel 3 -run='TestAccCloudWatchLogsSubscriptionFilter_'  -timeout 180m
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_basic
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_basic
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_many
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_many
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_disappears
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_disappears
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_Disappears_logGroup
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_Disappears_logGroup
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisDataFirehose
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisDataFirehose
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisStream
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisStream
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_distribution
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_distribution
=== RUN   TestAccCloudWatchLogsSubscriptionFilter_roleARN
=== PAUSE TestAccCloudWatchLogsSubscriptionFilter_roleARN
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_basic
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisDataFirehose
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_distribution
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_basic (35.93s)
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_roleARN
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_distribution (57.83s)
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisStream
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisStream (59.35s)
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_Disappears_logGroup
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_roleARN (82.49s)
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_many
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_DestinationARN_kinesisDataFirehose (127.69s)
=== CONT  TestAccCloudWatchLogsSubscriptionFilter_disappears
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_Disappears_logGroup (30.83s)
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_many (43.71s)
--- PASS: TestAccCloudWatchLogsSubscriptionFilter_disappears (37.72s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cloudwatchlogs	171.182s

@ewbankkit
Copy link
Contributor

@onematchfox Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit b1592af into hashicorp:main Apr 12, 2022
@github-actions github-actions bot added this to the v4.10.0 milestone Apr 12, 2022
@github-actions
Copy link

This functionality has been released in v4.10.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. Thank you!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. size/M Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws_cloudwatch_log_subscription_filter needs to be made serial
3 participants