Repository navigation
src: fix dotenv empty values and indented comments - #66685
Open
christianaurichzm wants to merge 1 commit into
Open
christianaurichzm wants to merge 1 commit into
christianaurichzm wants to merge 1 commit into
Conversation
An empty value was stored before the key was normalized, and the check for it ran before the spaces after `=` were skipped. Only the path for unquoted values trimmed the start of the next line, so every branch that ended in `continue` left it untrimmed. As a result: - `KEY= ` followed by a newline consumed the newline while trimming, so the next line was stored as the value of `KEY` and its own variable was lost. - `export KEY=` was stored as `export KEY` instead of `KEY`. - `=` followed by a newline was stored under an empty key, while `=value` is skipped. - A comment indented with spaces after an empty value, a quoted value or another comment was stored as a variable named `# ...`. Skip empty keys and strip the `export` prefix first, skip only spaces and tabs after `=` before checking for an empty value, and trim the start of each line in the loop increment, which also runs after `continue`. Signed-off-by: Christian Aurich Zanettini Martins <[email protected]>
Collaborator
|
Review requested:
|
nodejs-github-bot
added
c++
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #66685 +/- ##
==========================================
- Coverage 92.82% 90.46% -2.36%
==========================================
Files 422 791 +369
Lines 194189 277086 +82897
Branches 30027 53275 +23248
==========================================
+ Hits 180249 250674 +70425
- Misses 13614 16813 +3199
- Partials 326 9599 +9273
🚀 New features to boost your workflow:
|
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
2 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.
parseEnv(),loadEnvFile()and--env-filemishandle empty values and indented comments:The empty-value check added in #56983 runs before the key is normalized, and with spaces after
=it misses andtrim_spaces()eats the newline. Separately, the start of each line is only trimmed at the end of the loop body, which the branches ending incontinueskip.This normalizes the key first, skips only spaces and tabs after
=, and moves the line trim into theforincrement so it also runs aftercontinue. The new test cases fail onmainand pass with this change.