Check for invalid Fn::FindInMap key

Partially Fixes Issue #111

Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 366525a85a95a0af54b04f796c71b18d2c2bfb5b..475c7fff7f6ea1096c0def140ee7e24964022984 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -175,7 +175,16 @@ class EngineManager(manager.Manager):
             msg = _("No Template provided.")
             return webob.exc.HTTPBadRequest(explanation=msg)
 
-        s = parser.Stack('validate', template, 0, params)
+        try:
+            s = parser.Stack('validate', template, 0, params)
+        except KeyError:
+            res = 'A Fn::FindInMap operation referenced a non-existent map [%s]' % sys.exc_value
+
+            response = {'ValidateTemplateResult': {
+                        'Description': 'Malformed Query Response [%s]' % (res),
+                        'Parameters': []}}
+            return response
+
         res = s.validate()
 
         return res