When attempting to use an array that contains variables a `maximum re…

…cursion depth exceeded` error would be raised from Jinja. This commit fixes that bug and extends the unit test to cover lists with variables.
ddevalco · Jun 22, 2016 · eeffafa · eeffafa
1 parent b5891d4
commit eeffafa
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/st2common/st2common/util/param.py b/st2common/st2common/util/param.py
@@ -145,7 +145,15 @@ def _resolve_dependencies(G):
     for name in nx.topological_sort(G):
         node = G.node[name]
         try:
-            context[name] = _render(node, context)
+            if 'template' in node and isinstance(node.get('template', None), list):
+                rendered_list = list()
+                for template in G.node[name]['template']:
+                    rendered_list.append(
+                        _render(dict(template=template), context)
+                    )
+                context[name] = rendered_list
+            else:
+                context[name] = _render(node, context)
         except Exception as e:
             LOG.debug('Failed to render %s: %s', name, e, exc_info=True)
             msg = 'Failed to render parameter "%s": %s' % (name, str(e))

diff --git a/st2common/tests/unit/test_param_utils.py b/st2common/tests/unit/test_param_utils.py
@@ -358,14 +358,32 @@ def test_get_finalized_params_with_list(self):
             'r1': '{{r2}}',
             'r2': ['1', '2'],
             'a1': True,
-            'a2': '{{a1}}'
+            'a2': 'Test',
+            'a3': 'Test2',
+            'a4': '{{a1}}',
+            'a5': ['{{a2}}', '{{a3}}']
         }
         runner_param_info = {'r1': {'type': 'array'}, 'r2': {'type': 'array'}}
-        action_param_info = {'a1': {'type': 'boolean'}, 'a2': {'type': 'boolean'}}
+        action_param_info = {
+            'a1': {'type': 'boolean'},
+            'a2': {'type': 'string'},
+            'a3': {'type': 'string'},
+            'a4': {'type': 'boolean'},
+            'a5': {'type': 'array'}
+        }
         r_runner_params, r_action_params = param_utils.get_finalized_params(
             runner_param_info, action_param_info, params, {})
         self.assertEqual(r_runner_params, {'r1': ['1', '2'], 'r2': ['1', '2']})
-        self.assertEqual(r_action_params, {'a1': True, 'a2': True})
+        self.assertEqual(
+            r_action_params,
+            {
+                'a1': True,
+                'a2': 'Test',
+                'a3': 'Test2',
+                'a4': True,
+                'a5': ['Test', 'Test2']
+            }
+        )
 
     def test_get_finalized_params_with_cyclic_dependency(self):
         params = {'r1': '{{r2}}', 'r2': '{{r1}}'}