fix: Fix fromJson template function deserializing non-objects #3380
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
halostatue
approved these changes
Dec 1, 2023
halostatue
reviewed
Dec 1, 2023
| if err := chezmoi.FormatJSONC.Unmarshal([]byte(s), &value); err != nil { | ||
| panic(err) | ||
| } | ||
| return value | ||
| } | ||
|
|
||
| func (c *Config) fromTomlTemplateFunc(s string) any { | ||
| var value map[string]any | ||
| var value any |
There was a problem hiding this comment.
I don't think that TOML allows anything but a dictionary at the root, so this is probably fine as it was.
| if err := chezmoi.FormatTOML.Unmarshal([]byte(s), &value); err != nil { | ||
| panic(err) | ||
| } | ||
| return value | ||
| } | ||
|
|
||
| func (c *Config) fromYamlTemplateFunc(s string) any { | ||
| var value map[string]any | ||
| var value any |
There was a problem hiding this comment.
This is probably a good thing as
- 1
- 2
- 3is a thing.
|
This does fix the test case. |
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.
Fixes #3379.