-
Notifications
You must be signed in to change notification settings - Fork 358
fix(shell): skip env vars with invalid names instead of breaking the shell #2883
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
2d762fd
fix(shell): skip env vars with invalid names instead of breaking the …
mikeland73 e76730b
Merge remote-tracking branch 'origin/main' into mikeland73/devbox-she…
mikeland73 01ae962
fix(shell): plumb stderr writer into exportify, clarify warning text
mikeland73 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Copyright 2024 Jetify Inc. and contributors. All rights reserved. | ||
| // Use of this source code is governed by the license in the LICENSE file. | ||
|
|
||
| package devbox | ||
|
|
||
| import ( | ||
| "io" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestIsValidEnvName(t *testing.T) { | ||
| valid := []string{"FOO", "_foo", "foo_BAR_123", "a", "_"} | ||
| for _, name := range valid { | ||
| if !isValidEnvName(name) { | ||
| t.Errorf("isValidEnvName(%q) = false, want true", name) | ||
| } | ||
| } | ||
|
|
||
| invalid := []string{"//", "//ccache", "bad.name", "1leading", "with space", "with-dash", ""} | ||
| for _, name := range invalid { | ||
| if isValidEnvName(name) { | ||
| t.Errorf("isValidEnvName(%q) = true, want false", name) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // TestExportifySkipsInvalidNames ensures that env vars whose names aren't valid | ||
| // shell identifiers (e.g. a "//" comment key in devbox.json) are dropped instead | ||
| // of producing invalid shell that breaks the whole shell. | ||
| func TestExportifySkipsInvalidNames(t *testing.T) { | ||
| got := exportify(io.Discard, map[string]string{ | ||
| "GOOD": "value", | ||
| "//": "comment-as-json-hack", | ||
| "//ccache": "another comment", | ||
| "bad.name": "dotted", | ||
| "1leading": "starts with digit", | ||
| }) | ||
|
|
||
| if !strings.Contains(got, `export GOOD="value";`) { | ||
| t.Errorf("expected valid var to be exported, got:\n%s", got) | ||
| } | ||
| for _, bad := range []string{"//", "//ccache", "bad.name", "1leading"} { | ||
| if strings.Contains(got, bad) { | ||
| t.Errorf("expected invalid name %q to be skipped, got:\n%s", bad, got) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestExportifyNushellSkipsInvalidNames(t *testing.T) { | ||
| got := exportifyNushell(io.Discard, map[string]string{ | ||
| "GOOD": "value", | ||
| "//": "comment", | ||
| }) | ||
|
|
||
| if !strings.Contains(got, `$env.GOOD = "value"`) { | ||
| t.Errorf("expected valid var to be exported, got:\n%s", got) | ||
| } | ||
| if strings.Contains(got, "//") { | ||
| t.Errorf("expected invalid name to be skipped, got:\n%s", got) | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.