yqutil: fix to preserve line breaks #2625
Merged
Conversation
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
`yamlfmt` works by replacing line breaks with place holder strings to avoid their loss when using `gopkg.in/yaml.v3`. By replacing line breaks with place holder strings before `yqlib` uses `gopkg.in/yaml.v3`, we can ultimately prevent the loss of line breaks through `yamlfmt`. Signed-off-by: Norio Nomura <[email protected]>
…nothing)'`
`find examples -name '*.yaml' -exec limactl edit --set 'del(.nothing)' {} \;`
Signed-off-by: Norio Nomura <[email protected]>
Signed-off-by: Norio Nomura <[email protected]>
jandubois
reviewed
Sep 17, 2024
jandubois
requested changes
Sep 18, 2024
| contentModified, err := replaceLineBreaksWithMagicString(content) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| tmpYAMLFile, err := os.CreateTemp("", "lima-yq-*.yaml") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| tmpYAMLPath := tmpYAMLFile.Name() | ||
| defer os.RemoveAll(tmpYAMLPath) |
There was a problem hiding this comment.
I know this is not part of this PR, but why is this calling os.RemoveAll() instead of os.Remove() given that tmpYAMLPath is a file and not a directory.
@afbjorklund Do you remember why you choose RemoveAll?
Signed-off-by: Norio Nomura <[email protected]>
Signed-off-by: Norio Nomura <[email protected]>
norio-nomura
force-pushed
the
yqutil-fix-preserve-line-breaks
branch
from
7884213 to
f2d6a55
Compare
|
I rewrote it to avoid relying on |
|
Thanks! 🙏🏻 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
yamlfmtworks by replacing line breaks with place holder strings to avoid their loss when usinggopkg.in/yaml.v3. By replacing line breaks with place holder strings beforeyqlibusesgopkg.in/yaml.v3, we can ultimately prevent the loss of line breaks throughyamlfmt.#2593 (comment)