Skip to content

Conversation

@github-actions
Copy link
Contributor

Backport

This PR is auto-generated from #37851 to be assessed for backporting due to the inclusion of the label 1.14-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.


This PR updates the providers lock command so that it also includes providers embedded in Terraform test modules. This makes providers lock match the behaviour of init in terms of provider discovery, and makes sense to me in terms of discovering provider requirements.

I've marked this as a backport into 1.14.1 as I do think it is fixing a bug, but it does also necessarily introduce a new flag to providers lock so maybe that's enough to mean this should be delayed to 1.15.0. I'm happy to take that feedback if people think so.

Fixes #37841

Target Release

1.14.1

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

@hashicorp-cla-app
Copy link

hashicorp-cla-app bot commented Nov 17, 2025

CLA assistant check
All committers have signed the CLA.

@dsa0x dsa0x force-pushed the backport/liamcervante/37841/virtually-allowing-insect branch from d3f8c83 to 4bfb3ab Compare November 17, 2025 07:39
@dsa0x
Copy link
Member

dsa0x commented Nov 17, 2025

🚨🚨🚨 Not to be merged until next week

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