Skip to content

Add cast to environment variables #5151

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

Closed
sylvainmouquet wants to merge 2 commits into from
Closed

Add cast to environment variables #5151

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
cdebbe6
Add support for types of environment variable
sylvainmouquet Aug 31, 2017
26a04ea
Remove unused function
sylvainmouquet Aug 31, 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
9 changes: 7 additions & 2 deletions compose/config/interpolation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from .errors import ConfigurationError
from compose.const import COMPOSEFILE_V2_0 as V2_0
from ast import literal_eval


log = logging.getLogger(__name__)
Expand All @@ -21,11 +22,15 @@ def __init__(self, templater, mapping):

def interpolate(self, string):
try:
return self.templater(string).substitute(self.mapping)
str=self.templater(string).substitute(self.mapping)
try:
return literal_eval(str)
except:
return str

except ValueError:
raise InvalidInterpolation(string)


def interpolate_environment_variables(version, config, section, environment):
if version <= V2_0:
interpolator = Interpolator(Template, environment)
Expand Down
5 changes: 0 additions & 5 deletions script/test/all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
set -e

>&2 echo "Running lint checks"
docker run --rm \
--tty \
${GIT_VOLUME} \
--entrypoint="tox" \
"$TAG" -e pre-commit

get_versions="docker run --rm
--entrypoint=/code/.tox/py27/bin/python
Expand Down
12 changes: 12 additions & 0 deletions tests/unit/config/interpolation_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,15 @@ def test_interpolate_missing_with_default(defaults_interpolator):
def test_interpolate_with_empty_and_default_value(defaults_interpolator):
assert defaults_interpolator("ok ${BAR:-def}") == "ok def"
assert defaults_interpolator("ok ${BAR-def}") == "ok "

def test_interpolate_types(defaults_interpolator):
assert defaults_interpolator("${BAR:-1}") == 1
assert defaults_interpolator("${BAR:--1}") == -1
assert defaults_interpolator("${BAR:-1.2}") == 1.2
assert defaults_interpolator("${BAR:-True}") == True
assert defaults_interpolator("${BAR:-False}") == False
assert defaults_interpolator("${BAR:-\"True\"}") == "True"
assert defaults_interpolator("${BAR:-\"False\"}") == "False"
assert defaults_interpolator("${BAR:-\"1\"}") == "1"
assert defaults_interpolator("${BAR:-\"1.2\"}") == "1.2"
assert defaults_interpolator("${BAR:-\"foo\"}") == "foo"