jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move named volumes matching to config validation phase

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-01-22 17:42:24 -08:00 • committed by Aanand Prasad
commit 3f28472ebc
5 changed files with 83 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compose/config/config.py
View file

@ -25,6 +25,7 @@ from .types import parse_extra_hosts
from .types import parse_restart_spec
from .types import VolumeFromSpec
from .types import VolumeSpec
from .validation import match_named_volumes
from .validation import validate_against_fields_schema
from .validation import validate_against_service_schema
from .validation import validate_depends_on
@ -274,6 +275,11 @@ def load(config_details):
config_details.working_dir,
main_file,
[file.get_service_dicts() for file in config_details.config_files])
if main_file.version >= 2:
for service_dict in service_dicts:
match_named_volumes(service_dict, volumes)
return Config(main_file.version, service_dicts, volumes, networks)

12
compose/config/validation.py
View file

@ -77,6 +77,18 @@ def format_boolean_in_environment(instance):
return True
def match_named_volumes(service_dict, project_volumes):
service_volumes = service_dict.get('volumes', [])
for volume_spec in service_volumes:
if volume_spec.is_named_volume and volume_spec.external not in project_volumes:
raise ConfigurationError(
'Named volume "{0}" is used in service "{1}" but no'
' declaration was found in the volumes section.'.format(
volume_spec.repr(), service_dict.get('name')
)
)
def validate_top_level_service_objects(filename, service_dicts):
"""Perform some high level validation of the service name and value.

46
compose/project.py
View file

@ -42,7 +42,7 @@ class Project(object):
self.use_networking = use_networking
self.network_driver = network_driver
self.networks = networks or []
self.volumes = volumes or []
self.volumes = volumes or {}
def labels(self, one_off=False):
return [
@ -76,13 +76,11 @@ class Project(object):
if config_data.volumes:
for vol_name, data in config_data.volumes.items():
project.volumes.append(
Volume(
client=client, project=name, name=vol_name,
driver=data.get('driver'),
driver_opts=data.get('driver_opts'),
external_name=data.get('external_name')
)
project.volumes[vol_name] = Volume(
client=client, project=name, name=vol_name,
driver=data.get('driver'),
driver_opts=data.get('driver_opts'),
external_name=data.get('external_name')
)
for service_dict in config_data.services:
@ -97,7 +95,13 @@ class Project(object):
volumes_from = get_volumes_from(project, service_dict)
if config_data.version == 2:
match_named_volumes(service_dict, project.volumes)
service_volumes = service_dict.get('volumes', [])
for volume_spec in service_volumes:
if volume_spec.is_named_volume:
declared_volume = project.volumes[volume_spec.external]
service_volumes[service_volumes.index(volume_spec)] = (
volume_spec._replace(external=declared_volume.full_name)
)
project.services.append(
Service(
@ -243,7 +247,7 @@ class Project(object):
def initialize_volumes(self):
try:
for volume in self.volumes:
for volume in self.volumes.values():
if volume.external:
log.debug(
'Volume {0} declared as external. No new '
@ -298,7 +302,7 @@ class Project(object):
network.remove()
def remove_volumes(self):
for volume in self.volumes:
for volume in self.volumes.values():
volume.remove()
def initialize_networks(self):
@ -476,26 +480,6 @@ def get_networks(service_dict, network_definitions):
return networks
def match_named_volumes(service_dict, project_volumes):
service_volumes = service_dict.get('volumes', [])
for volume_spec in service_volumes:
if volume_spec.is_named_volume:
declared_volume = next(
(v for v in project_volumes if v.name == volume_spec.external),
None
)
if not declared_volume:
raise ConfigurationError(
'Named volume "{0}" is used in service "{1}" but no'
' declaration was found in the volumes section.'.format(
volume_spec.repr(), service_dict.get('name')
)
)
service_volumes[service_volumes.index(volume_spec)] = (
volume_spec._replace(external=declared_volume.full_name)
)
def get_volumes_from(project, service_dict):
volumes_from = service_dict.pop('volumes_from', None)
if not volumes_from: