Skip to content
This repository has been archived by the owner on Jun 16, 2021. It is now read-only.

Make defaults work with nested env variables ie: ${FOO:-${HOME}/bar} #496

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make defaults work with nested env variables ie: ${FOO:-${HOME}/bar} #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc0323
Make defaults work with nested env variables ie: ${FOO:-${HOME}/bar}
vito-c Sep 29, 2017
6284982
Removing print statements & formatting
vito-c Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions config/interpolation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ func parseVariable(line string, pos int, mapping func(string) string) (string, i
return mapping(buffer.String()), pos, true
}

func parseDefaultValue(line string, pos int) (string, int, bool) {
func parseDefaultValue(line string, pos int, mapping func(string) string) (string, int, bool) {
var buffer bytes.Buffer
success := false
replaced := ""

// only skip :, :- and - at the beginning
for ; pos < len(line); pos++ {
Expand All @@ -55,12 +57,21 @@ func parseDefaultValue(line string, pos int) (string, int, bool) {
}
for ; pos < len(line); pos++ {
c := line[pos]
if c == '}' {
switch {
case c == '$':
if line[pos-1] != '\\' {
replaced, pos, success = parseInterpolationExpression(line, pos+1, mapping)
_, err := buffer.WriteString(replaced)
if success == false || err != nil {
return "", 0, false
}
}
case c == '}':
return buffer.String(), pos - 1, true
}
err := buffer.WriteByte(c)
if err != nil {
return "", pos, false
default:
if err := buffer.WriteByte(c); err != nil {
return "", pos, false
}
}
}
return "", 0, false
Expand All @@ -75,7 +86,6 @@ func parseVariableWithBraces(line string, pos int, mapping func(string) string)
switch {
case c == '}':
bufferString := buffer.String()

if bufferString == "" {
return "", 0, false
}
Expand All @@ -84,7 +94,7 @@ func parseVariableWithBraces(line string, pos int, mapping func(string) string)
buffer.WriteByte(c)
case validVariableDefault(c, line, pos):
defaultValue := ""
defaultValue, pos, _ = parseDefaultValue(line, pos)
defaultValue, pos, _ = parseDefaultValue(line, pos, mapping)
defaultValues[buffer.String()] = defaultValue
default:
return "", 0, false
Expand Down
40 changes: 33 additions & 7 deletions config/interpolation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,21 @@ func testInvalidInterpolatedLine(t *testing.T, line string) {
assert.Equal(t, false, success)
}

func testInterpolatedDefault(t *testing.T, line string, delim string, expectedVar string, expectedVal string) {
envVar, _ := parseLine(line, func(env string) string { return env })
func testInterpolatedDefault(t *testing.T, line string, delim string, expectedVar string, expectedVal string, envVariables map[string]string) {
envVar, _ := parseLine(line, func(s string) string {
if val, ok := envVariables[s]; ok {
return val
}
return s
})

pos := strings.Index(line, delim)
envDefault, _, _ := parseDefaultValue(line, pos)
envDefault, _, _ := parseDefaultValue(line, pos, func(s string) string {
if val, ok := envVariables[s]; ok {
return val
}
return s
})
assert.Equal(t, expectedVal, envDefault)
assert.Equal(t, expectedVar, envVar)
}
Expand All @@ -45,16 +56,25 @@ func TestParseLine(t *testing.T) {
"9aNumber": "WORKED",
"a9Number": "WORKED",
"defTest": "WORKED",
"test_domain": "127.0.0.1:27017",
"HOME": "/home/foo",
"test_tilde": "~/.home/test",
}

testInterpolatedDefault(t, "${defVar:-defVal}", ":-", "defVar", "defVal")
testInterpolatedDefault(t, "${defVar2-defVal2}", "-", "defVar2", "defVal2")
testInterpolatedDefault(t, "${defVar:-def:Val}", ":-", "defVar", "def:Val")
testInterpolatedDefault(t, "${defVar:-def-Val}", ":-", "defVar", "def-Val")
testInterpolatedDefault(t, "${defVar:-defVal}", ":-", "defVar", "defVal", variables)
testInterpolatedDefault(t, "${defVar2-defVal2}", "-", "defVar2", "defVal2", variables)
testInterpolatedDefault(t, "${defVar:-def:Val}", ":-", "defVar", "def:Val", variables)
testInterpolatedDefault(t, "${defVar:-def-Val}", ":-", "defVar", "def-Val", variables)
testInterpolatedDefault(t, "${defVar:-~/foo/bar}", ":-", "defVar", "~/foo/bar", variables)
testInterpolatedDefault(t, "${defVar:-${HOME}/.bar/test}", ":-", "defVar", "/home/foo/.bar/test", variables)
testInterpolatedDefault(t, "${defVar:-127.0.0.1:27017}", ":-", "defVar", "127.0.0.1:27017", variables)

testInterpolatedLine(t, "WORKED", "$lower", variables)
testInterpolatedLine(t, "WORKED", "${MiXeD}", variables)
testInterpolatedLine(t, "WORKED", "${split_VaLue}", variables)
testInterpolatedLine(t, "127.0.0.1:27017", "${test_domain}", variables)
testInterpolatedLine(t, "~/.home/test", "${test_tilde}", variables)
testInterpolatedLine(t, "~/.home/test", "${test_tilde}", variables)
// make sure variable name is parsed correctly with default value
testInterpolatedLine(t, "WORKED", "${defTest:-sometest}", variables)
testInterpolatedLine(t, "WORKED", "${defTest-sometest}", variables)
Expand Down Expand Up @@ -190,6 +210,8 @@ func TestInterpolate(t *testing.T) {
# dictionary item value
labels:
mylabel: "myvalue=="
domainlable: "127.0.0.1:27017"
tildelabel: "~/.home/test"

# unset value
hostname: "host-"
Expand All @@ -207,6 +229,8 @@ func TestInterpolate(t *testing.T) {
# dictionary item value
labels:
mylabel: "${LABEL_VALUE}"
domainlable: "${TEST_DOMAIN}"
tildelabel: "${TILDE_DIR}"

# unset value
hostname: "host-${UNSET_VALUE}"
Expand All @@ -215,6 +239,8 @@ func TestInterpolate(t *testing.T) {
command: "$${ESCAPED}"`, map[string]string{
"IMAGE": "=busybox",
"HOST_PORT": "=",
"TEST_DOMAIN": "127.0.0.1:27017",
"TILDE_DIR": "~/.home/test",
"LABEL_VALUE": "myvalue==",
})
// same as above but with default values
Expand Down