cherry-pick Vault changes to Nomad HCL1 branch#760
Merged
Conversation
…apper Add functions to replicate old HCL V1 Behavior for backwards compatability
abhijeetviswa
approved these changes
Jun 19, 2025
abhijeetviswa
left a comment
abhijeetviswa
left a comment
There was a problem hiding this comment.
Approving the cherry pick. I haven't reviewed the code itself. That's been done in #707.
tgross
added a commit
to hashicorp/nomad
that referenced
this pull request
Jun 20, 2025
For reasons of backwards compatibility, Nomad uses an older branch of HCL1 (`v1.0.1-nomad`) and HCL2 (`v2.20.2-nomad-1`) and backports a limited set of changes to those branches. But the Vault API also has their own HCL1 branch, currently tagged as `v1.0.1-vault-7`. Normally this isn't a problem because Nomad pins to our own branch and we don't call any of the Vault API package's HCL code anyways. But in Vault's branch some functions were changed that break our build unless we backport them. We've backported enough of Vault's changes to make our HCL1 branch build, and now have tags on the HCL repo so that we can pin to specific tags instead of random commits. Fixes: https://hashicorp.atlassian.net/browse/NMD-850 Fixes: #26006 Ref: hashicorp/hcl#760
tgross
added a commit
to hashicorp/nomad
that referenced
this pull request
Jun 23, 2025
For reasons of backwards compatibility, Nomad uses an older branch of HCL1 (`v1.0.1-nomad`) and HCL2 (`v2.20.2-nomad-1`) and backports a limited set of changes to those branches. But the Vault API also has their own HCL1 branch, currently tagged as `v1.0.1-vault-7`. Normally this isn't a problem because Nomad pins to our own branch and we don't call any of the Vault API package's HCL code anyways. But in Vault's branch some functions were changed that break our build unless we backport them. We've backported enough of Vault's changes to make our HCL1 branch build, and now have tags on the HCL repo so that we can pin to specific tags instead of random commits. Fixes: https://hashicorp.atlassian.net/browse/NMD-850 Fixes: #26006 Ref: hashicorp/hcl#760
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
For reasons of backwards compatibility, Nomad uses an older branch of HCL1 (
v1.0.1-nomad) and HCL2 (v2.20.2-nomad-1), and backports a limited set of changes to those branches.But the Vault API also has their own HCL1 branch, currently tagged as
v1.0.1-vault-7. Normally this isn't a problem because Nomad pins to our own branch and we don't call any of the Vault API package's HCL code anyways. But in #707 some functions were changed that break our build (ref hashicorp/nomad#26006) unless we backport them.This PR cherry-picks the Vault HCL1 changes to the Nomad HCL1 branch. I've tested this against our configuration parsing tests in Nomad and that fixes the build.