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

Merge pull request #2225 from mnowster/2221-blank-env-vars

Browse Source 
2221 allow empty environment keys
This commit is contained in:
Daniel Nephin 2015-10-19 14:06:31 -04:00
commit 3725c3ab7e
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/fields_schema.json
View File

@ -41,7 +41,7 @@
"type": "object", "type": "object",
"patternProperties": { "patternProperties": {
"^[^-]+$": { "^[^-]+$": {
"type": ["string", "number", "boolean"], "type": ["string", "number", "boolean", "null"],
"format": "environment" "format": "environment"
} }
}, },

3
compose/config/validation.py
View File

@ -136,7 +136,7 @@ def process_errors(errors, service_name=None):
if len(validator) >= 2: if len(validator) >= 2:
first_type = anglicize_validator(validator[0]) first_type = anglicize_validator(validator[0])
last_type = anglicize_validator(validator[-1]) last_type = anglicize_validator(validator[-1])
types_from_validator = "{}{}".format(first_type, ", ".join(validator[1:-1])) types_from_validator = ", ".join([first_type] + validator[1:-1])
msg = "{} or {}".format( msg = "{} or {}".format(
types_from_validator, types_from_validator,
@ -156,7 +156,6 @@ def process_errors(errors, service_name=None):
Inspecting the context value of a ValidationError gives us information about Inspecting the context value of a ValidationError gives us information about
which sub schema failed and which kind of error it is. which sub schema failed and which kind of error it is.
""" """
required = [context for context in error.context if context.validator == 'required'] required = [context for context in error.context if context.validator == 'required']
if required: if required:
return required[0].message return required[0].message

17
tests/unit/config/config_test.py
View File

@ -449,6 +449,23 @@ class InterpolationTest(unittest.TestCase):
self.assertIn('in service "web"', cm.exception.msg) self.assertIn('in service "web"', cm.exception.msg)
self.assertIn('"${"', cm.exception.msg) self.assertIn('"${"', cm.exception.msg)
def test_empty_environment_key_allowed(self):
service_dict = config.load(
build_config_details(
{
'web': {
'build': '.',
'environment': {
'POSTGRES_PASSWORD': ''
},
},
},
'.',
None,
)
)[0]
self.assertEquals(service_dict['environment']['POSTGRES_PASSWORD'], '')
class VolumeConfigTest(unittest.TestCase): class VolumeConfigTest(unittest.TestCase):
def test_no_binding(self): def test_no_binding(self):