-
-
Notifications
You must be signed in to change notification settings - Fork 31.7k
src: don't overwrite environment from .env file #49424
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
nodejs-github-bot
merged 8 commits into
nodejs:main
from
philnash:src-dont-overwrite-environment-from-dotenv
Sep 8, 2023
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
edaa662
src: don't overwrite environment from .env file
philnash 271bebd
src: .env file can override NODE_OPTIONS
philnash f673db5
Revert "src: .env file can override NODE_OPTIONS"
philnash 005da17
src: extra test for environment variables and .env
philnash 22dbae2
src: env file exists in test locations and overrides result
philnash e9371df
src: combine tests for overriding environment vars
philnash d91ebce
src: don't fully override environment in tests
philnash 56f0868
src: fix env var TZ test
philnash 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
A=1 | ||
B=2 |
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 |
---|---|---|
|
@@ -6,6 +6,7 @@ const { describe, it } = require('node:test'); | |
|
||
const validEnvFilePath = '../fixtures/dotenv/valid.env'; | ||
const relativePath = '../fixtures/dotenv/node-options.env'; | ||
const simpleEnvFilePath = '../fixtures/dotenv/simple.env'; | ||
|
||
describe('.env supports edge cases', () => { | ||
|
||
|
@@ -35,4 +36,29 @@ describe('.env supports edge cases', () => { | |
assert.strictEqual(child.code, 0); | ||
}); | ||
|
||
it('should not override existing environment variables', async () => { | ||
const code = ` | ||
require('assert').strictEqual(process.env.BASIC, 'existing'); | ||
`.trim(); | ||
const child = await common.spawnPromisified( | ||
process.execPath, | ||
[ `--env-file=${validEnvFilePath}`, '--eval', code ], | ||
{ cwd: __dirname, env: { BASIC: 'existing' } }, | ||
); | ||
assert.strictEqual(child.stderr, ''); | ||
assert.strictEqual(child.code, 0); | ||
}); | ||
GeoffreyBooth marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
it('should not override existing environment variables but introduce new vars', async () => { | ||
const code = ` | ||
require('assert').strictEqual(process.env.A + "," + process.env.B, '3,2'); | ||
`.trim(); | ||
const child = await common.spawnPromisified( | ||
process.execPath, | ||
[ `--env-file=${simpleEnvFilePath}`, '--eval', code ], | ||
{ cwd: __dirname, env: { A: '3' } }, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These 2 tests can be merged |
||
); | ||
assert.strictEqual(child.stderr, ''); | ||
assert.strictEqual(child.code, 0); | ||
}); | ||
}); |
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.