Add default expansion. #39

vantreeseba · 2020-03-10T21:41:01Z

Allow expansion to occur, but replace non existing with default if
given.

fixes #11

Example: ${MACHINE-localhost}

Should resolve to $MACHINE expansion, and if not set, then expands to
localhost.

Allow expansion to occur, but replace non existing with default if given. Example: ${MACHINE-localhost} Should resolve to $MACHINE expansion, and if not set, then expands to localhost.

vantreeseba · 2020-03-10T21:53:21Z

There are a few more test conditions I'm adding to ensure no issues occur.

…mpleted

vantreeseba · 2020-03-10T22:54:31Z

This should be good to, let me know if there is anything else you feel like should be tested / etc.

snyamathi · 2020-04-09T20:08:51Z

Would using :- make more sense to mimic the shell syntax?

${parameter:-word}
Use Default Values. If parameter is unset or null, the expansion of word shall be substituted; otherwise, the value of parameter shall be substituted.

https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02

vantreeseba · 2020-04-09T20:51:46Z

Would using :- make more sense to mimic the shell syntax?
${parameter:-word}
Use Default Values. If parameter is unset or null, the expansion of word shall be substituted; otherwise, the value of parameter shall be substituted.
https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_06_02

Yeah, that makes more sense, I guess I missed that somehow, and in bash (at least 4.4.20) it works without the ":", so ${non_existing-default} will return default.

I'll look into changing it.

paulrostorp · 2020-12-29T10:00:43Z

any updates on this ?

vantreeseba · 2020-12-29T17:07:58Z

Hey sorry, I honestly completely forgot about this, I will try to look into it this week.

…ursive with only :

vantreeseba · 2021-02-02T16:07:56Z

With those two latest commits, this should be good to go.
Tests all are passing, let me know if there is anything else you would like.

elie-g · 2021-05-24T18:21:01Z

Any updates?

FezVrasta · 2021-12-16T17:04:18Z

Anything holding back on this PR?

motdotla · 2022-01-17T06:36:21Z

Great feature. Thank you. Merging and this will be a major upgrade release shortly.

motdotla · 2022-01-17T08:12:20Z

Thank you 💛. This has been released: https://github.com/motdotla/dotenv-expand/blob/master/CHANGELOG.md#600-2022-01-17

We currently use `dotenv-expand@5` in `@next/env`, which does not support default expansion. It was added in v6 (motdotla/dotenv-expand#39). Upgrading to the latest version of `dotenv-expand` and fixing an import, the added test passed. Fixes #34718 ## Bug - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Errors have helpful link attached, see `contributing.md` ## Feature - [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. - [ ] Related issues linked using `fixes #number` - [ ] Integration tests added - [ ] Documentation added - [ ] Telemetry added. In case of a feature if it's used or not. - [ ] Errors have helpful link attached, see `contributing.md` ## Documentation / Examples - [ ] Make sure the linting passes by running `yarn lint`

FezVrasta · 2022-03-30T08:23:27Z

test/.env

+UNDEFINED_EXPAND_WITH_DEFINED_NESTED=${UNDEFINED_ENV_KEY:-${MACHINE:-default}}
+UNDEFINED_EXPAND_WITH_DEFAULT=${UNDEFINED_ENV_KEY:-default}
+UNDEFINED_EXPAND_WITH_DEFAULT_NESTED=${UNDEFINED_ENV_KEY:-${UNDEFINED_ENV_KEY_2:-default}}
+UNDEFINED_EXPAND_WITH_DEFAULT_NESTED_TWICE=${UNDEFINED_ENV_KEY:-${UNDEFINED_ENV_KEY_2${UNDEFINED_ENV_KEY_3:-default}}}


@vantreeseba may you help me understand how is this supposed to work? Why are UNDEFINED_ENV_KEY2 and ${UNDEFINED_ENV_KEY_3:-default} being concatenated?

Should ${MACHINE${MACHINE}} resolve to machinemachine?

This syntax doesn't seem to work on Bash, I get bad substitution. The correct one should be this I think:

UNDEFINED_EXPAND_WITH_DEFAULT_NESTED_TWICE=${UNDEFINED_ENV_KEY:-${UNDEFINED_ENV_KEY_2}${UNDEFINED_ENV_KEY_3:-default}}

That actually looks like my test was missing a :-

So it should look like

UNDEFINED_EXPAND_WITH_DEFAULT_NESTED_TWICE=${UNDEFINED_ENV_KEY:-${UNDEFINED_ENV_KEY_2:-${UNDEFINED_ENV_KEY_3:-default}}}

Idea being, it's a n, n+1,n+2 test to do a "proof by induction".

I can fix it, or if you want to fix it in your branch is fine, whichever everyone thinks will be easier/better.

It passed due to the empty env vars being resolved to empty strings, so it probably should have more test cases like the previous defined/nested undefined ones.

Fixed in my branch, thanks for confirming!

@vantreeseba

@vantreeseba confirmed the test case had a typo in it. motdotla#39 (comment)

vantreeseba added 2 commits March 10, 2020 16:39

Add default expansion.

97bf22d

Allow expansion to occur, but replace non existing with default if given. Example: ${MACHINE-localhost} Should resolve to $MACHINE expansion, and if not set, then expands to localhost.

Add recursive ability to replace / expand / set defaults.

c66e075

vantreeseba mentioned this pull request Mar 10, 2020

Setting default values if not present in environment #11

Closed

Fix issue with nested defaults when one was found before expansion co…

eab83b0

…mpleted

vantreeseba added 2 commits February 2, 2021 00:46

Start on change to :- instead of - for default, still need to fix rec…

c223a06

…ursive with only :

fix: Cleanup and correct regex again to work for :-

bf334da

refactor: Remove commented code, fix whitespace.

d4ebec2

motdotla merged commit 0ec06b8 into motdotla:master Jan 17, 2022

raxityo mentioned this pull request Jan 18, 2022

Add --override flag to override any existing environment variables entropitor/dotenv-cli#63

Closed

vantreeseba deleted the add_default_expansion branch January 19, 2022 00:41

balazsorban44 mentioned this pull request Feb 24, 2022

feat: allow dotenv default expansion vercel/next.js#34765

Merged

10 tasks

FezVrasta reviewed Mar 30, 2022

View reviewed changes

FezVrasta added a commit to FezVrasta/dotenv-expand that referenced this pull request Apr 5, 2022

fix test case

70c8a03

@vantreeseba confirmed the test case had a typo in it. motdotla#39 (comment)

FezVrasta mentioned this pull request Apr 5, 2022

fix: support special characters in default expansion #74

Merged

hovsater mentioned this pull request Nov 4, 2022

Add support for default expansion of environment variables by bumping dotenv-expand dependency facebook/create-react-app#12824

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add default expansion. #39

Add default expansion. #39

vantreeseba commented Mar 10, 2020 •

edited

vantreeseba commented Mar 10, 2020 •

edited

vantreeseba commented Mar 10, 2020

snyamathi commented Apr 9, 2020

vantreeseba commented Apr 9, 2020

paulrostorp commented Dec 29, 2020

vantreeseba commented Dec 29, 2020

vantreeseba commented Feb 2, 2021

elie-g commented May 24, 2021

FezVrasta commented Dec 16, 2021

motdotla commented Jan 17, 2022

motdotla commented Jan 17, 2022

FezVrasta Mar 30, 2022 •

edited

vantreeseba Apr 5, 2022 •

edited

FezVrasta Apr 5, 2022

Add default expansion. #39

Add default expansion. #39

Conversation

vantreeseba commented Mar 10, 2020 • edited

vantreeseba commented Mar 10, 2020 • edited

vantreeseba commented Mar 10, 2020

snyamathi commented Apr 9, 2020

vantreeseba commented Apr 9, 2020

paulrostorp commented Dec 29, 2020

vantreeseba commented Dec 29, 2020

vantreeseba commented Feb 2, 2021

elie-g commented May 24, 2021

FezVrasta commented Dec 16, 2021

motdotla commented Jan 17, 2022

motdotla commented Jan 17, 2022

FezVrasta Mar 30, 2022 • edited

Choose a reason for hiding this comment

vantreeseba Apr 5, 2022 • edited

Choose a reason for hiding this comment

FezVrasta Apr 5, 2022

Choose a reason for hiding this comment

vantreeseba commented Mar 10, 2020 •

edited

vantreeseba commented Mar 10, 2020 •

edited

FezVrasta Mar 30, 2022 •

edited

vantreeseba Apr 5, 2022 •

edited