Fix external secrets serialization
Signed-off-by: Joffrey F <joffrey@docker.com>
Joffrey F
7 years ago
| 50 | 50 |
del vol_conf['external_name']
|
| 51 | 51 |
|
| 52 | 52 |
if config.version in (V3_1, V3_2):
|
| 53 | |
result['secrets'] = config.secrets
|
|
53 |
result['secrets'] = config.secrets.copy()
|
|
54 |
for secret_name, secret_conf in result['secrets'].items():
|
|
55 |
if 'external_name' in secret_conf:
|
|
56 |
del secret_conf['external_name']
|
| 54 | 57 |
return result
|
| 55 | 58 |
|
| 56 | 59 |
|
| 3824 | 3824 |
}
|
| 3825 | 3825 |
secrets_dict = {
|
| 3826 | 3826 |
'one': {'file': '/one.txt'},
|
| 3827 | |
'source': {'file': '/source.pem'}
|
|
3827 |
'source': {'file': '/source.pem'},
|
|
3828 |
'two': {'external': True},
|
| 3828 | 3829 |
}
|
| 3829 | 3830 |
config_dict = config.load(build_config_details({
|
| 3830 | 3831 |
'version': '3.1',
|
|
| 3836 | 3837 |
serialized_service = serialized_config['services']['web']
|
| 3837 | 3838 |
assert secret_sort(serialized_service['secrets']) == secret_sort(service_dict['secrets'])
|
| 3838 | 3839 |
assert 'secrets' in serialized_config
|
|
3840 |
assert serialized_config['secrets']['two'] == secrets_dict['two']
|
| 3839 | 3841 |
|
| 3840 | 3842 |
def test_serialize_ports(self):
|
| 3841 | 3843 |
config_dict = config.Config(version='2.0', services=[
|