fix: catch improper event type errors

samtranslator/model/__init__.py

@@ -474,8 +474,8 @@ def resolve_resource_type(self, resource_dict):
         :rtype: class
         """
         if not self.can_resolve(resource_dict):
-            raise TypeError("Resource dict has missing or invalid value for key Type. Resource Dict is: " +
-                            str(resource_dict))
+            raise TypeError("Resource dict has missing or invalid value for key Type. Event Type is: {}.".format(
+                    resource_dict.get('Type')))
         if resource_dict['Type'] not in self.resource_types:
             raise TypeError("Invalid resource type {resource_type}".format(resource_type=resource_dict['Type']))
         return self.resource_types[resource_dict['Type']]

samtranslator/model/sam_resources.py

@@ -264,8 +264,11 @@ def _event_resources_to_link(self, resources):
         event_resources = {}
         if self.Events:
             for logical_id, event_dict in self.Events.items():
-                event_source = self.event_resolver.resolve_resource_type(event_dict).from_dict(
-                    self.logical_id + logical_id, event_dict, logical_id)
+                try:
+                    event_source = self.event_resolver.resolve_resource_type(event_dict).from_dict(
+                        self.logical_id + logical_id, event_dict, logical_id)
+                except TypeError as e:
+                    raise InvalidEventException(logical_id, "{}".format(e))
                 event_resources[logical_id] = event_source.resources_to_link(resources)
         return event_resources
 
@@ -286,8 +289,11 @@ def _generate_event_resources(self, lambda_function, execution_role, event_resou
         resources = []
         if self.Events:
             for logical_id, event_dict in self.Events.items():
-                eventsource = self.event_resolver.resolve_resource_type(event_dict).from_dict(
-                    lambda_function.logical_id + logical_id, event_dict, logical_id)
+                try:
+                    eventsource = self.event_resolver.resolve_resource_type(event_dict).from_dict(
+                        lambda_function.logical_id + logical_id, event_dict, logical_id)
+                except TypeError as e:
+                    raise InvalidEventException(logical_id, "{}".format(e))
 
                 kwargs = {
                     # When Alias is provided, connect all event sources to the alias and *not* the function

tests/translator/input/error_function_invalid_event_type.yaml

@@ -0,0 +1,26 @@
+Resources:
+  FunctionApiTypeError:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      Events:
+        ApiEvent:
+          Type: API
+          Properties:
+            Method: get
+            Path: /
+
+  FunctionNoEventType:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/hello.zip
+      Handler: hello.handler
+      Runtime: python2.7
+      Events:
+        MissingType:
+          Properties:
+            Method: get
+            Path: /
+

tests/translator/output/error_function_invalid_event_type.json

@@ -0,0 +1,8 @@
+{
+  "errors": [
+    {
+      "errorMessage": "Resource with id [FunctionApiTypeError] is invalid. Event with id [ApiEvent] is invalid. Resource dict has missing or invalid value for key Type. Event Type is: API. Resource with id [FunctionNoEventType] is invalid. Event with id [MissingType] is invalid. Resource dict has missing or invalid value for key Type. Event Type is: None."
+    }
+  ], 
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 2. Resource with id [FunctionApiTypeError] is invalid. Event with id [ApiEvent] is invalid. Resource dict has missing or invalid value for key Type. Event Type is: API. Resource with id [FunctionNoEventType] is invalid. Event with id [MissingType] is invalid. Resource dict has missing or invalid value for key Type. Event Type is: None."
+}

tests/translator/test_translator.py

@@ -353,6 +353,7 @@ def _generate_new_deployment_hash(self, logical_id, dict_to_hash, rest_api_to_sw
     'error_cors_credentials_true_with_wildcard_origin',
     'error_cors_credentials_true_without_explicit_origin',
     'error_function_invalid_codeuri',
+    'error_function_invalid_event_type',
     'error_function_invalid_layer',
     'error_function_no_codeuri',
     'error_function_no_handler',