core - variable interpolate fallback on keyerror (#2845)

cloud-custodian · Sep 5, 2018 · 49b6af2 · 49b6af2
1 parent 503ebcd
commit 49b6af2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/c7n/utils.py b/c7n/utils.py
@@ -481,7 +481,7 @@ def set_value_from_jmespath(source, expression, value, is_first=True):
     source[current_key] = value
 
 
-def format_string_values(obj, err_fallback=(IndexError,), *args, **kwargs):
+def format_string_values(obj, err_fallback=(IndexError, KeyError), *args, **kwargs):
     """
     Format all string values in an object.
     Return the updated object

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -395,3 +395,10 @@ def test_format_string_values(self):
             utils.format_string_values(
                 {'k': '{1}'}),
             {'k': '{1}'})
+
+        self.assertEqual(
+            utils.format_string_values(
+                {'k': '{limit}',
+                 'b': '{account_id}'}, account_id=21),
+            {'k': '{limit}',
+             'b': '21'})