Inherit variables from environment #149
Conversation
This adds mirror functions to resolve inherited variables with a lookup function. Signed-off-by: Ulysses Souza <[email protected]>
ulyssessouza
force-pushed
the
inherited-variables
branch
from
8b190c3 to
d3051d5
Compare
Signed-off-by: Ulysses Souza <[email protected]>
go.mod
Outdated
| @@ -1,3 +1,3 @@ | |||
| module github.com/joho/godotenv | |||
| module github.com/ulyssessouza/godotenv | |||
There was a problem hiding this comment.
This probably shouldn’t be in this PR, right?
godotenv.go
Outdated
| // | ||
| // It's important to note that it WILL NOT OVERRIDE an env variable that already exists - consider the .env file to set dev vars or sensible defaults | ||
| func Load(filenames ...string) (err error) { | ||
| return LoadWithLookupFn(func(string) (string, bool){ |
There was a problem hiding this comment.
Should this one have used noLookupFn as well?
But perhaps instead of a dummy function, pass nil as lookup-function, then where it's executed, check if it's nil and if so, skip executing?
Signed-off-by: Ulysses Souza <[email protected]>
ulyssessouza
force-pushed
the
inherited-variables
branch
from
d85e4c1 to
3fd862f
Compare
Signed-off-by: Ulysses Souza <[email protected]>
Signed-off-by: Ulysses Souza <[email protected]>
ulyssessouza
force-pushed
the
inherited-variables
branch
from
3fd862f to
6f27d4e
Compare
| if len(line) == 0 { | ||
| err = errors.New("zero length string") | ||
| return | ||
| } | ||
| if lookupFn == nil { | ||
| lookupFn = noLookupFn | ||
| } | ||
|
|
||
| // ditch the comments (but keep quoted hashes) | ||
| if strings.Contains(line, "#") { |
There was a problem hiding this comment.
This was already there, but looks tricky (thinking of things like ${FOO##something}) https://pubs.opengroup.org/onlinepubs/009604499/utilities/xcu_chap02.html
|
|
||
| key = exportRegex.ReplaceAllString(splitString[0], "$1") | ||
| if len(splitString) != 2 { | ||
| err = errors.New("Can't separate key from value") |
There was a problem hiding this comment.
errors should not start with a capital; perhaps change "Can't" to "failed to"
|
|
||
| // Parse the value | ||
| value = parseValue(splitString[1], envMap) | ||
| return | ||
| } | ||
|
|
||
| func validateVariableName(key string) error { |
There was a problem hiding this comment.
Did we actually need a validation for this? Note that there's no strict rules for variable names; this regex would also exclude Windows %VARIABLE%.
We made this mistake in the Docker Engine, and had to revert; moby/moby#16608
Generally, I would consider the variable name to be:
- "anything" before the
=(if present) - except when starting with
#(comment) - and white space stripped
To be a "valid" variable.
Code that consumes this library can decide what to do with those (if anything); eg for docker we pass any variable to the runtime, and have the kernel/shell decide if it's accepted.
This adds mirror functions to resolve inherited variables
with a lookup function.