MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-21 09:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: cant parse comment without '=' in environment file (#15130)

Browse Source
This commit is contained in:
sota 2022-06-22 02:37:15 +09:00 committed by GitHub
parent cd7a0a9757
commit e2e5bd6f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/common-main.go
View File

@ -490,6 +490,12 @@ func parsEnvEntry(envEntry string) (envKV, error) {
Skip: true, Skip: true,
}, nil }, nil
} }
if strings.HasPrefix(envEntry, "#") {
// Skip commented lines
return envKV{
Skip: true,
}, nil
}
const envSeparator = "=" const envSeparator = "="
envTokens := strings.SplitN(strings.TrimSpace(strings.TrimPrefix(envEntry, "export")), envSeparator, 2) envTokens := strings.SplitN(strings.TrimSpace(strings.TrimPrefix(envEntry, "export")), envSeparator, 2)
if len(envTokens) != 2 { if len(envTokens) != 2 {
@ -499,13 +505,6 @@ func parsEnvEntry(envEntry string) (envKV, error) {
key := envTokens[0] key := envTokens[0]
val := envTokens[1] val := envTokens[1]
if strings.HasPrefix(key, "#") {
// Skip commented lines
return envKV{
Skip: true,
}, nil
}
// Remove quotes from the value if found // Remove quotes from the value if found
if len(val) >= 2 { if len(val) >= 2 {
quote := val[0] quote := val[0]

1
cmd/common-main_test.go
View File

@ -136,6 +136,7 @@ export MINIO_ROOT_PASSWORD=minio123`,
}, },
{ {
` `
# simple comment
# MINIO_ROOT_USER=minioadmin # MINIO_ROOT_USER=minioadmin
# MINIO_ROOT_PASSWORD=minioadmin # MINIO_ROOT_PASSWORD=minioadmin
MINIO_ROOT_USER=minio MINIO_ROOT_USER=minio