tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7866 from luca-nardelli/improve-mandatory-variables-issues

Browse Source 
Report which variable fails interpolation when they are mandatory
This commit is contained in:
Anca Iordache 2020-12-02 20:06:25 +01:00 committed by GitHub
commit f1059d75ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/interpolation.py
View File

@ -111,12 +111,14 @@ class TemplateWithDefaults(Template):
var, _, err = braced.partition(':?') var, _, err = braced.partition(':?')
result = mapping.get(var) result = mapping.get(var)
if not result: if not result:
err = err or var
raise UnsetRequiredSubstitution(err) raise UnsetRequiredSubstitution(err)
return result return result
elif '?' == sep: elif '?' == sep:
var, _, err = braced.partition('?') var, _, err = braced.partition('?')
if var in mapping: if var in mapping:
return mapping.get(var) return mapping.get(var)
err = err or var
raise UnsetRequiredSubstitution(err) raise UnsetRequiredSubstitution(err)
# Modified from python2.7/string.py # Modified from python2.7/string.py

2
tests/unit/config/interpolation_test.py
View File

@ -416,7 +416,7 @@ def test_interpolate_mandatory_no_err_msg(defaults_interpolator):
with pytest.raises(UnsetRequiredSubstitution) as e: with pytest.raises(UnsetRequiredSubstitution) as e:
defaults_interpolator("not ok ${BAZ?}") defaults_interpolator("not ok ${BAZ?}")
assert e.value.err == '' assert e.value.err == 'BAZ'
def test_interpolate_mixed_separators(defaults_interpolator): def test_interpolate_mixed_separators(defaults_interpolator):