Merge pull request #43 from totem/develop

0.3.8 Release

Author: sukrit007

orchestrator/__init__.py

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

orchestrator/jinja/filters.py

@@ -0,0 +1,45 @@
+from future.builtins import (  # noqa
+    bytes, dict, int, list, object, range, str,
+    ascii, chr, hex, input, next, oct, open,
+    pow, round, filter, map, zip)
+
+import re
+
+__author__ = 'sukrit'
+
+"""
+Package that includes custom filters required for totem config processing
+"""
+
+USE_FILTERS = ('replace_regex', )
+
+
+def replace_regex(input_str, find, replace):
+    """
+    Regex replace filter that replaces all occurrences of given regex match
+    in a given string
+
+    :param input_str: Input string on which replacement is to be performed
+    :type input_str: str
+    :param find: Regular expression string that needs to be used for
+        find/replacement
+    :type find: str
+    :param replace: Regex replacement string
+    :type replace: str
+    :return: Regex replaced string
+    :rtype: str
+    """
+    return re.sub(find, replace, input_str)
+
+
+def apply_filters(env):
+    """
+    Applies filters on jinja env.
+
+    :param env: Jinja environment
+    :return:
+    """
+
+    for name in USE_FILTERS:
+        env.filters[name] = globals()[name]
+    return env

orchestrator/services/config.py

@@ -19,7 +19,7 @@
 from orchestrator.cluster_config.etcd import EtcdConfigProvider
 from orchestrator.cluster_config.github import GithubConfigProvider
 from orchestrator.cluster_config.s3 import S3ConfigProvider
-from orchestrator.jinja import conditions
+from orchestrator.jinja import conditions, filters
 from orchestrator.services.errors import ConfigProviderNotFound
 from orchestrator.services.exceptions import ConfigValueError, \
     ConfigValidationError, ConfigParseError
@@ -237,7 +237,8 @@ def _get_jinja_environment():
     """
     env = get_spontaneous_environment()
     env.line_statement_prefix = '#'
-    return conditions.apply_conditions(env)
+
+    return filters.apply_filters(conditions.apply_conditions(env))
 
 
 def evaluate_template(template_value, variables={}):

tests/integration/orchestrator/jinja/test_filters.py

@@ -0,0 +1,21 @@
+from jinja2 import environment
+from nose.tools import eq_
+from orchestrator.jinja import filters
+
+
+class TestJinjaFilters:
+
+    def setup(self):
+        self.env = environment.get_spontaneous_environment()
+        filters.apply_filters(self.env)
+
+    def test_regex_replace(self):
+        # Given: Jinja template using starting_with
+        template = \
+            '{{ "mock_a$b$c%d^host" | replace_regex("[^A-Za-z0-9-]","-") }}'
+
+        # When: I render template
+        ret_value = self.env.from_string(template).render()
+
+        # Then: Template is rendered as expected
+        eq_(ret_value, 'mock-a-b-c-d-host')