beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format

Browse source 
docker stack deploy interpolation format error due to not escaping $ now includes a hint
This commit is contained in:
Anusha Ragunathan 2017-03-14 17:14:09 -07:00 committed by GitHub
commit 95b46ff68f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/compose/interpolation/interpolation.go
View file

@ -39,7 +39,7 @@ func interpolateSectionItem(
interpolatedValue, err := recursiveInterpolate(value, mapping)
if err != nil {
return nil, fmt.Errorf(
"Invalid interpolation format for %#v option in %s %#v: %#v",
"Invalid interpolation format for %#v option in %s %#v: %#v. You may need to escape any $ with another $.",
key, section, name, err.Template,
)
}

2
cli/compose/interpolation/interpolation_test.go
View file

@ -55,5 +55,5 @@ func TestInvalidInterpolation(t *testing.T) {
},
}
_, err := Interpolate(services, "service", defaultMapping)
assert.EqualError(t, err, `Invalid interpolation format for "image" option in service "servicea": "${"`)
assert.EqualError(t, err, `Invalid interpolation format for "image" option in service "servicea": "${". You may need to escape any $ with another $.`)
}