resource/aws_batch_compute_environment: Retry delete on stale JobQueue relationship

[quinnjr]

Community Note

• Please vote on this issue by adding a 👍 reaction to the original issue 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 issue followers and do not help prioritize the request

Description

When a aws_batch_compute_environment is replaced (via create_before_destroy / Pulumi deleteBeforeReplace: false), the provider correctly:

1. Creates the new compute environment
2. Updates the referencing aws_batch_job_queue to point to the new CE
3. Attempts to delete the old CE

Step 3 consistently fails with:

ClientException: Cannot delete, found existing JobQueue relationship.

This happens because AWS Batch has eventual consistency — the job queue update returns success from the API, but the old CE still shows a job queue relationship when the delete is attempted moments later.

This PR wraps the DeleteComputeEnvironment call in tfresource.Retry, retrying on the specific ClientException containing "existing JobQueue relationship". This follows the same pattern used in the EKS cluster delete path for ResourceInUseException (internal/service/eks/cluster.go).

Affected Resource(s)

• aws_batch_compute_environment

How Has This Been Tested?

• The change compiles cleanly (go build ./internal/service/batch/...)
• go vet passes
• Existing unit tests pass (go test ./internal/service/batch/... -run "TestExpand|TestFlatten")
• Existing acceptance test TestAccBatchComputeEnvironment_disappears covers the delete path
• Reproduced the original error in a production Pulumi deployment with AWS Batch (EC2 compute type with BEST_FIT_PROGRESSIVE allocation strategy and a regular service role)

AI Disclosure

AI assistance (Claude) was used to research the provider's retry patterns across other services (EKS, ECR, S3) and to draft the initial code structure. The fix was reviewed and validated by a human contributor who experienced the bug firsthand. All code has been read, understood, and verified.

References

• Fixes aws_batch_compute_environment replacement fails with "Cannot delete, found existing JobQueue relationship" despite create_before_destroy #46925
• Related: Can't destroy aws_batch_compute_environment associated with an aws_batch_job_queue: Cannot delete, found existing JobQueue relationship #13221 (same issue, closed in 2023 but still reproducible — confirmed by multiple commenters)
• Related: Cannot delete error occurs when aws_batch_compute_environment used in aws_batch_job_queue is recreated #2044, Error while updating "aws_batch_compute_environment" #11077, Cannot alter AWS Compute Environment when Job Queue is still attached #11777 (earlier reports of the same problem)

Made with Cursor

[github-actions]

Community Guidelines

This comment is added to every new Pull Request to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

• Please vote on this Pull Request by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
• Please see our prioritization guide for additional information on how the maintainers handle prioritization.
• Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Pull Request and do not help prioritize the request.

Pull Request Authors

• Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
• Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.