add validation for missing Queue or Stream

samtranslator/model/eventsources/pull.py

@@ -3,6 +3,7 @@
 
 from samtranslator.model.lambda_ import LambdaEventSourceMapping
 from samtranslator.translator.arn_generator import ArnGenerator
+from samtranslator.model.exceptions import InvalidEventException
 
 
 class PullEventSource(ResourceMacro):
@@ -48,6 +49,10 @@ def to_cloudformation(self, **kwargs):
         except NotImplementedError:
             function_name_or_arn = function.get_runtime_attr("arn")
 
+        if not self.Stream and not self.Queue:
+            raise InvalidEventException(
+                self.relative_id, "No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided.")
+
         lambda_eventsourcemapping.FunctionName = function_name_or_arn
         lambda_eventsourcemapping.EventSourceArn = self.Stream or self.Queue
         lambda_eventsourcemapping.StartingPosition = self.StartingPosition

tests/translator/input/error_missing_queue.yaml

@@ -0,0 +1,17 @@
+# File: sam.yml
+# Version: 0.9
+
+AWSTemplateFormatVersion: '2010-09-09'
+Parameters: {}
+Resources:
+  SQSFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/queues.zip
+      Handler: queue.sqs_handler
+      Runtime: python2.7
+      Events:
+        MySqsQueue:
+          Type: SQS
+          Properties:
+            BatchSize: 10

tests/translator/input/error_missing_stream.yaml

@@ -0,0 +1,15 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Parameters: {}
+Resources:
+  DynamoDBFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      CodeUri: s3://sam-demo-bucket/streams.zip
+      Handler: stream.ddb_handler
+      Runtime: python2.7
+      Events:
+        MyDDBStream:
+          Type: DynamoDB
+          Properties:
+            BatchSize: 200
+            StartingPosition: LATEST

tests/translator/output/aws-cn/error_missing_queue.json

@@ -0,0 +1,6 @@
+{
+  "errors": [{
+    "errorMessage": "Resource with id [SQSFunction] is invalid. Event with id [MySqsQueue] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+  }],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [SQSFunction] is invalid. Event with id [MySqsQueue] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+}

tests/translator/output/aws-cn/error_missing_stream.json

@@ -0,0 +1,6 @@
+{
+  "errors": [{
+    "errorMessage": "Resource with id [DynamoDBFunction] is invalid. Event with id [MyDDBStream] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+  }],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [DynamoDBFunction] is invalid. Event with id [MyDDBStream] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+}

tests/translator/output/aws-us-gov/error_missing_queue.json

@@ -0,0 +1,6 @@
+{
+  "errors": [{
+    "errorMessage": "Resource with id [SQSFunction] is invalid. Event with id [MySqsQueue] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+  }],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [SQSFunction] is invalid. Event with id [MySqsQueue] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+}

tests/translator/output/aws-us-gov/error_missing_stream.json

@@ -0,0 +1,6 @@
+{
+  "errors": [{
+    "errorMessage": "Resource with id [DynamoDBFunction] is invalid. Event with id [MyDDBStream] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+  }],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [DynamoDBFunction] is invalid. Event with id [MyDDBStream] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+}

tests/translator/output/error_missing_queue.json

@@ -0,0 +1,6 @@
+{
+  "errors": [{
+    "errorMessage": "Resource with id [SQSFunction] is invalid. Event with id [MySqsQueue] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+  }],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [SQSFunction] is invalid. Event with id [MySqsQueue] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+}

tests/translator/output/error_missing_stream.json

@@ -0,0 +1,6 @@
+{
+  "errors": [{
+    "errorMessage": "Resource with id [DynamoDBFunction] is invalid. Event with id [MyDDBStream] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+  }],
+  "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. Resource with id [DynamoDBFunction] is invalid. Event with id [MyDDBStream] is invalid. No Queue (for SQS) or Stream (for Kinesis or DynamoDB) provided."
+}

tests/translator/test_translator.py

@@ -157,6 +157,8 @@ def test_transform_success(self, testcase, partition_with_region):
     'error_function_with_deployment_preference_missing_alias',
     'error_function_with_invalid_deployment_preference_hook_property',
     'error_invalid_logical_id',
+    'error_missing_queue',
+    'error_missing_stream',
     'error_multiple_resource_errors',
     'error_s3_not_in_template',
     'error_table_invalid_attributetype',