Skip to content
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.

Sign up for GitHub

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

Jump to bottom

allow '.' (dot) in environment variable name #271

Merged
merged 1 commit into from Jun 22, 2022
Merged

allow '.' (dot) in environment variable name #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dotenv/parser.go
View file
Open in desktop
Expand Up @@ -105,9 +105,9 @@ loop:
offset = i + 1
inherited = char == '\n'
break loop
case '_':
case '_', '.':
default:
// variable name should match [A-Za-z0-9_]
// variable name should match [A-Za-z0-9_.]
if unicode.IsLetter(rchar) || unicode.IsNumber(rchar) {
continue
}
Expand Down
2 changes: 2 additions & 0 deletions loader/example1.env
View file
Open in desktop
@@ -1,5 +1,7 @@
# passed through
FOO=foo_from_env_file
ENV.WITH.DOT=ok
glours marked this conversation as resolved.
Show resolved Hide resolved
ENV_WITH_UNDERSCORE=ok

# overridden in example2.env
BAR=bar_from_env_file
Expand Down
14 changes: 10 additions & 4 deletions loader/full-struct_test.go
View file
Open in desktop
Expand Up @@ -164,10 +164,12 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
DomainName: "foo.com",
Entrypoint: []string{"/code/entrypoint.sh", "-p", "3000"},
Environment: map[string]*string{
"FOO": strPtr("foo_from_env_file"),
"BAR": strPtr("this is a secret"),
"BAZ": strPtr("baz_from_service_def"),
"QUX": strPtr("qux_from_environment"),
"FOO": strPtr("foo_from_env_file"),
"BAR": strPtr("this is a secret"),
"BAZ": strPtr("baz_from_service_def"),
"QUX": strPtr("qux_from_environment"),
"ENV.WITH.DOT": strPtr("ok"),
"ENV_WITH_UNDERSCORE": strPtr("ok"),
},
EnvFile: []string{
"./example1.env",
Expand Down Expand Up @@ -691,6 +693,8 @@ services:
environment:
BAR: this is a secret
BAZ: baz_from_service_def
ENV.WITH.DOT: ok
ENV_WITH_UNDERSCORE: ok
FOO: foo_from_env_file
QUX: qux_from_environment
env_file:
Expand Down Expand Up @@ -1261,6 +1265,8 @@ func fullExampleJSON(workingDir, homeDir string) string {
"environment": {
"BAR": "this is a secret",
"BAZ": "baz_from_service_def",
"ENV.WITH.DOT": "ok",
"ENV_WITH_UNDERSCORE": "ok",
"FOO": "foo_from_env_file",
"QUX": "qux_from_environment"
},
Expand Down
10 changes: 6 additions & 4 deletions loader/loader_test.go
View file
Open in desktop
Expand Up @@ -766,10 +766,12 @@ func TestDiscardEnvFileOption(t *testing.T) {
- example2.env
`
expectedEnvironmentMap := types.MappingWithEquals{
"FOO": strPtr("foo_from_env_file"),
"BAZ": strPtr("baz_from_env_file"),
"BAR": strPtr("bar_from_env_file_2"), // Original value is overwritten by example2.env
"QUX": strPtr("quz_from_env_file_2"),
"FOO": strPtr("foo_from_env_file"),
"BAZ": strPtr("baz_from_env_file"),
"BAR": strPtr("bar_from_env_file_2"), // Original value is overwritten by example2.env
"QUX": strPtr("quz_from_env_file_2"),
"ENV.WITH.DOT": strPtr("ok"),
"ENV_WITH_UNDERSCORE": strPtr("ok"),
}
configDetails := buildConfigDetails(dict, nil)

Expand Down