fix(manager/terraform/lockfile): use registryURL defined in lockfile #28886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rarkins
approved these changes
May 7, 2024
viceice
reviewed
May 7, 2024
| @@ -191,6 +187,10 @@ export async function updateArtifacts({ | |||
| continue; | |||
| } | |||
| } | |||
|
|
|||
| // use registryURL defined in the update and fall back to the one defined in the lockfile | |||
| const registryUrl = registryUrls?.[0] ?? updateLock.registryUrl; | |||
There was a problem hiding this comment.
we should read it on extract, so no user intervention is required .
the datasource is always filling registry url, so you fallback will probably never used at runtime
There was a problem hiding this comment.
I agree we should detect Terraform vs OpenTofu during extract, though this is not possible if there is no lock file. At least I'm not aware there is a reliable way.
This is picked up as expected, I have tested / debugged it against a real repo.
|
🎉 This PR is included in version 37.347.3 🎉 The release is available on: Your semantic-release bot 📦🚀 |
6 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Prefer the registryURL of locks defined in
.terraform.lock.hcl.This allows to use OpenTofu without explicitly defining it with registryUrls.
Context
Solves #28818
Documentation (please check one with an [x])
How I've tested my work (please select one)
I have verified these changes via: