Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 9, 2025

Backport

This PR is auto-generated from #37564 to be assessed for backporting due to the inclusion of the label 1.13-backport.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@dsa0x
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/terraform/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Fixes #37546

This fixes a flaky bug where the cleanup nodes in the graph may not be correctly ordered. By chance, the order is fine half of the time. The reason is because Leaf cleanup nodes were only getting attached to a single path of transitive edges, instead of all paths that led to it.

Because the bug is flaky, Executing the test multiple times like go test ./internal/command -run TestTest_TeardownOrder -count 10 can reveal the failure before this fix.

Target Release

1.13.x

Rollback Plan

  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

CHANGELOG entry

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

Overview of commits

@github-actions github-actions bot requested a review from dsa0x September 9, 2025 09:21
@dsa0x dsa0x requested a review from liamcervante September 9, 2025 09:30
@dsa0x dsa0x marked this pull request as ready for review September 9, 2025 10:30
@dsa0x dsa0x requested a review from a team as a code owner September 9, 2025 10:30
@dsa0x dsa0x merged commit ff059f5 into v1.13 Sep 9, 2025
16 of 17 checks passed
@dsa0x dsa0x deleted the backport/sams/test-cleanup-edge-fix/solely-settled-collie branch September 9, 2025 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants