Merge pull request #39 from totem/develop

0.3.5 Release

Author: sukrit007

conf/appconfig.py

@@ -73,7 +73,7 @@
 
 DEFAULT_DEPLOYER_CONFIG = {
     'url': os.getenv('CLUSTER_DEPLOYER_URL', DEFAULT_DEPLOYER_URL),
-    'enabled': True,
+    'enabled': False,
     'proxy': {},
     'templates': {
         'app': {
@@ -121,7 +121,7 @@
                 }
             },
             'deployers': {
-                'default': DEFAULT_DEPLOYER_CONFIG
+                '__defaults__': DEFAULT_DEPLOYER_CONFIG
             },
             'hooks': {
                 'ci': {

orchestrator/__init__.py

@@ -2,7 +2,7 @@
 from celery.signals import setup_logging
 import orchestrator.logger
 
-__version__ = '0.3.4'
+__version__ = '0.3.5'
 __author__ = 'sukrit'
 
 orchestrator.logger.init_logging()

orchestrator/services/config.py

@@ -13,7 +13,7 @@
 from jsonschema.exceptions import SchemaError
 import repoze.lru
 from conf.appconfig import CONFIG_PROVIDERS, CONFIG_PROVIDER_LIST, \
-    BOOLEAN_TRUE_VALUES, DEFAULT_DEPLOYER_CONFIG, API_PORT, CONFIG_NAMES
+    BOOLEAN_TRUE_VALUES, API_PORT, CONFIG_NAMES
 from orchestrator.cluster_config.default import DefaultConfigProvider
 from orchestrator.cluster_config.effective import MergedConfigProvider
 from orchestrator.cluster_config.etcd import EtcdConfigProvider
@@ -317,7 +317,14 @@ def evaluate_value(value, variables={}, location='/'):
             return value
 
         else:
+            if '__defaults__' in value:
+                defaults = value.get('__defaults__')
+                del(value['__defaults__'])
+            else:
+                defaults = None
             for each_k, each_v in value.items():
+                if defaults and hasattr(each_v, 'items'):
+                    each_v = dict_merge(each_v, defaults)
                 value[each_k] = evaluate_value(each_v, variables,
                                                '%s%s/' % (location, each_k))
             return {
@@ -386,8 +393,6 @@ def evaluate_config(config, default_variables={}, var_key='variables'):
 
     for deployer_name, deployer in \
             list(updated_config.get('deployers').items()):
-        updated_config['deployers'][deployer_name] = dict_merge(
-            deployer, DEFAULT_DEPLOYER_CONFIG)
         updated_config['deployers'][deployer_name].setdefault(
             'variables', {})
         updated_config['deployers'][deployer_name]['variables']\

tests/unit/orchestrator/services/test_config.py

@@ -11,7 +11,7 @@
 from jsonschema import ValidationError
 from mock import patch
 from nose.tools import eq_, raises
-from conf.appconfig import DEFAULT_DEPLOYER_URL
+from conf.appconfig import DEFAULT_DEPLOYER_URL, DEFAULT_DEPLOYER_CONFIG
 from orchestrator.cluster_config.effective import MergedConfigProvider
 from orchestrator.cluster_config.etcd import EtcdConfigProvider
 from orchestrator.cluster_config.github import GithubConfigProvider
@@ -194,7 +194,15 @@ def test_evaluate_value_with_nested_variables():
                 'var1': {
                     'value': '{{ var1 }}-modified'
                 }
+            },
+            'nested-key-2': {},
+            '__defaults__': {
+                'default1': {
+                    'value': '{{ var1 }} ',
+                    'template': True
+                }
             }
+
         },
         'list-key': [
             'list-value1',
@@ -224,7 +232,10 @@ def test_evaluate_value_with_nested_variables():
         'str-key': '{{ var1 }}',
         'int-key': 2,
         'nested-key': {
-            'nested-key1': 'var1-value-modified'
+            'nested-key1': 'var1-value-modified',
+            'nested-key-2': {
+                'default1': 'var1-value-modified'
+            },
         },
         'list-key': [
             'list-value1',
@@ -334,7 +345,10 @@ def test_evaluate_config_with_deployers():
             'template': True
         },
         'deployers': {
-            'default': {},
+            '__defaults__': DEFAULT_DEPLOYER_CONFIG,
+            'default': {
+                'enabled': True
+            },
             'deployer2': {
                 'url': 'deployer2-url',
                 'enabled': True,
@@ -519,6 +533,7 @@ def test_load_config(m_validate_schema, m_get_provider):
         'mockkey': 'mockvalue',
         8080: 'number-key',
         'deployers': {
+            '__defaults__': DEFAULT_DEPLOYER_CONFIG,
             'deployer1': {
                 'enabled': False,
                 'variables': {}