resource/aws_cloudformation_stack_set_instance: Prevents conflicting creation retries

[gdavison]

Description

The resource aws_cloudformation_stack_set_instance was incorrectly retrying creation operations that were already in progress. This was due to a combination of using the tfresource.RetryWhen function with a wait for completion in the nested function as well as a Retryer on the AWS service client itself.

The function tfresource.RetryWhen calls retry.StateChangeConf, which makes its calls based on a timer even if the previous call is still running. This led to subsequent calls returning an OperationInProgress error.

However, the AWS service client has a Retryer handler for OperationInProgress errors, which retries internally to the AWS client. If the CloudFormation stack takes a long time to complete, this could lead to these internally handled OperationInProgress errors to exceed the internal retry limit, leading to an error such as

Instance: operation error CloudFormation: CreateStackInstances, exceeded maximum number of attempts, 25

Relations

Closes #28675

References

Output from Acceptance Testing

In non-Organization account

% make testacc PKG=cloudformation TESTS=TestAccCloudFormationStackSetInstance_

--- PASS: TestAccCloudFormationStackSetInstance_Disappears_stackSet (83.88s)
--- PASS: TestAccCloudFormationStackSetInstance_basic (88.40s)
--- PASS: TestAccCloudFormationStackSetInstance_disappears (93.07s)
--- PASS: TestAccCloudFormationStackSetInstance_parameterOverrides (155.97s)

In Organization management account

% make testacc PKG=cloudformation TESTS=TestAccCloudFormationStackSetInstance_

--- PASS: TestAccCloudFormationStackSetInstance_Disappears_stackSet (76.12s)
--- PASS: TestAccCloudFormationStackSetInstance_basic (80.80s)
--- PASS: TestAccCloudFormationStackSetInstance_disappears (99.88s)
--- PASS: TestAccCloudFormationStackSetInstance_parameterOverrides (151.49s)
--- PASS: TestAccCloudFormationStackSetInstance_deploymentTargets (179.48s)
--- PASS: TestAccCloudFormationStackSetInstance_DeploymentTargets_emptyOU (214.29s)
--- PASS: TestAccCloudFormationStackSetInstance_concurrencyMode (241.26s)
--- PASS: TestAccCloudFormationStackSetInstance_operationPreferences (337.12s)

[github-actions]

Community Note

Voting for Prioritization

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

For Submitters

• Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
• For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
• Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

[jar-b]

LGTM 🚀

[github-actions]

This functionality has been released in v5.87.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]

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.