Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

Backport

This PR is auto-generated from #37477 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:
@liamcervante
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.


Reverts this change in 809a779 of #37205 (incorporated into yesterday's v1.13.0 release):

-	suite.Status = moduletest.Pass
+	suite.Status = moduletest.Pending

Which makes terraform test with no files return a non-zero exit code.

Fixes #37475

Target Release

1.14.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

…37477)

* terraform test: fix regression when running with no tests (#37475)

* added changelog entry

* move changelog entry from v1.14 to v1.13

* Return moduletest.Error instead of suite.Status if test operation is cancelled

* Add "terraform test" test with no tests

Yes, that's right. It's OK if you need to read it again.
@liamcervante liamcervante marked this pull request as ready for review August 26, 2025 06:42
@liamcervante liamcervante requested a review from a team as a code owner August 26, 2025 06:42
@liamcervante
Copy link
Member

I manually cherry-picked the last commit (which was the only one that failed automatically)

@liamcervante liamcervante enabled auto-merge (squash) August 26, 2025 06:49
@liamcervante liamcervante merged commit f8e7aef into v1.13 Aug 26, 2025
16 of 17 checks passed
@liamcervante liamcervante deleted the backport/fix-terraform-test/publicly-outgoing-bream branch August 26, 2025 06:55
Copy link
Contributor Author

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 contributions.
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 Sep 26, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants