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

Reduce complexity of merge_service_dicts

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-11-17 12:21:47 -05:00
parent d1adbb9b25
commit 64447879d2
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
compose/config/config.py
View File

@ -1,5 +1,6 @@
import codecs import codecs
import logging import logging
import operator
import os import os
import sys import sys
from collections import namedtuple from collections import namedtuple
@ -389,56 +390,46 @@ def merge_service_dicts_from_files(base, override):
def merge_service_dicts(base, override): def merge_service_dicts(base, override):
d = base.copy() d = {}
if 'environment' in base or 'environment' in override: def merge_field(field, merge_func, default=None):
d['environment'] = merge_environment( if field in base or field in override:
base.get('environment'), d[field] = merge_func(
override.get('environment'), base.get(field, default),
) override.get(field, default))
path_mapping_keys = ['volumes', 'devices'] merge_field('environment', merge_environment)
merge_field('labels', merge_labels)
merge_image_or_build(base, override, d)
for key in path_mapping_keys: for field in ['volumes', 'devices']:
if key in base or key in override: merge_field(field, merge_path_mappings)
d[key] = merge_path_mappings(
base.get(key),
override.get(key),
)
if 'labels' in base or 'labels' in override: for field in ['ports', 'expose', 'external_links']:
d['labels'] = merge_labels( merge_field(field, operator.add, default=[])
base.get('labels'),
override.get('labels'),
)
if 'image' in override and 'build' in d: for field in ['dns', 'dns_search']:
del d['build'] merge_field(field, merge_list_or_string)
if 'build' in override and 'image' in d: already_merged_keys = set(d) | {'image', 'build'}
del d['image'] for field in set(ALLOWED_KEYS) - already_merged_keys:
if field in base or field in override:
list_keys = ['ports', 'expose', 'external_links'] d[field] = override.get(field, base.get(field))
for key in list_keys:
if key in base or key in override:
d[key] = base.get(key, []) + override.get(key, [])
list_or_string_keys = ['dns', 'dns_search']
for key in list_or_string_keys:
if key in base or key in override:
d[key] = to_list(base.get(key)) + to_list(override.get(key))
already_merged_keys = ['environment', 'labels'] + path_mapping_keys + list_keys + list_or_string_keys
for k in set(ALLOWED_KEYS) - set(already_merged_keys):
if k in override:
d[k] = override[k]
return d return d
def merge_image_or_build(base, override, output):
if 'image' in override:
output['image'] = override['image']
elif 'build' in override:
output['build'] = override['build']
elif 'image' in base:
output['image'] = base['image']
elif 'build' in base:
output['build'] = base['build']
def merge_environment(base, override): def merge_environment(base, override):
env = parse_environment(base) env = parse_environment(base)
env.update(parse_environment(override)) env.update(parse_environment(override))
@ -604,6 +595,10 @@ def expand_path(working_dir, path):
return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path))) return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path)))
def merge_list_or_string(base, override):
return to_list(base) + to_list(override)
def to_list(value): def to_list(value):
if value is None: if value is None:
return [] return []