fix(action): block scalar support for contiguous separators#31978
Open
brandtkeller wants to merge 1 commit intohelm:mainfrom
Open
fix(action): block scalar support for contiguous separators#31978brandtkeller wants to merge 1 commit intohelm:mainfrom
brandtkeller wants to merge 1 commit intohelm:mainfrom
Conversation
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a regression in Helm’s post-renderer manifest processing where fixDocSeparators could mis-handle long contiguous dash sequences (e.g., within YAML block scalars), incorrectly inserting newlines and producing invalid multi-doc YAML during annotateAndMerge.
Changes:
- Update
fixDocSeparatorsto skip over contiguous-runs when a found---is not at a line start, preventing re-detection inside the same dash sequence. - Add a unit test covering long dash sequences inside an indented block scalar line.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| pkg/action/action.go | Adjusts separator-scanning logic to consume contiguous dash runs when rejecting non-separator --- matches. |
| pkg/action/action_test.go | Adds regression test ensuring long dash sequences in block scalars are preserved unchanged. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
closes #31977
What this PR does / why we need it:
I believe this is a bit of a regression in behavior given the context of the issue and possibly introduced as part of #31868. I was looking through #31941 which proposes the removal of
fixDocSeparatorsand for which the associated test case here may be relevant and otherwise this PR could be closed.Special notes for your reviewer:
If applicable:
docs neededlabel should be applied if so)