test: Added intrinsic tests for Function SNS Event

integration/combination/test_function_with_sns.py

@@ -17,7 +17,7 @@ def test_function_with_sns_bucket_trigger(self):
         lambda_subscription = next((x for x in subscriptions if x["Protocol"] == "lambda"), None)
 
         self.assertIsNotNone(lambda_subscription)
-        self.assertTrue(lambda_function_endpoint in lambda_subscription["Endpoint"])
+        self.assertIn(lambda_function_endpoint, lambda_subscription["Endpoint"])
         self.assertEqual(lambda_subscription["Protocol"], "lambda")
         self.assertEqual(lambda_subscription["TopicArn"], sns_topic_arn)
 
@@ -26,3 +26,23 @@ def test_function_with_sns_bucket_trigger(self):
         self.assertIsNotNone(sqs_subscription)
         self.assertEqual(sqs_subscription["Protocol"], "sqs")
         self.assertEqual(sqs_subscription["TopicArn"], sns_topic_arn)
+
+    def test_function_with_sns_intrinsics(self):
+        self.create_and_verify_stack("combination/function_with_sns_intrinsics")
+
+        sns_client = self.client_provider.sns_client
+
+        sns_topic_arn = self.get_physical_id_by_type("AWS::SNS::Topic")
+
+        subscriptions = sns_client.list_subscriptions_by_topic(TopicArn=sns_topic_arn)["Subscriptions"]
+        self.assertEqual(len(subscriptions), 1)
+
+        subscription = subscriptions[0]
+
+        self.assertIsNotNone(subscription)
+        self.assertEqual(subscription["Protocol"], "sqs")
+        self.assertEqual(subscription["TopicArn"], sns_topic_arn)
+
+        subscription_arn = subscription["SubscriptionArn"]
+        subscription_attributes = sns_client.get_subscription_attributes(SubscriptionArn=subscription_arn)
+        self.assertEqual(subscription_attributes["Attributes"]["FilterPolicy"], '{"price_usd":[{"numeric":["<",100]}]}')

integration/helpers/resource.py

@@ -41,7 +41,9 @@ def verify_stack_resources(expected_file_path, stack_resources):
     parsed_resources = _sort_resources(stack_resources["StackResourceSummaries"])
 
     if len(expected_resources) != len(parsed_resources):
-        return "'{}' resources expected, '{}' found".format(len(expected_resources), len(parsed_resources))
+        return "'{}' resources expected, '{}' found: \n{}".format(
+            len(expected_resources), len(parsed_resources), json.dumps(parsed_resources, default=str)
+        )
 
     for i in range(len(expected_resources)):
         exp = expected_resources[i]
@@ -55,7 +57,7 @@ def verify_stack_resources(expected_file_path, stack_resources):
                 "ResourceType": parsed["ResourceType"],
             }
 
-            return "'{}' expected, '{}' found (Resources must appear in the same order, don't include the LogicalId random suffix)".format(
+            return "'{}' expected, '{}' found (Don't include the LogicalId random suffix)".format(
                 exp, parsed_trimed_down
             )
         if exp["ResourceType"] != parsed["ResourceType"]:
@@ -79,7 +81,8 @@ def generate_suffix():
 
 def _sort_resources(resources):
     """
-    Sorts a stack's resources by LogicalResourceId
+    Filters and sorts a stack's resources by LogicalResourceId.
+    Keeps only the LogicalResourceId and ResourceType properties
 
     Parameters
     ----------
@@ -93,7 +96,12 @@ def _sort_resources(resources):
     """
     if resources is None:
         return []
-    return sorted(resources, key=lambda d: d["LogicalResourceId"])
+
+    filtered_resources = map(
+        lambda x: {"LogicalResourceId": x["LogicalResourceId"], "ResourceType": x["ResourceType"]}, resources
+    )
+
+    return sorted(filtered_resources, key=lambda d: d["LogicalResourceId"])
 
 
 def create_bucket(bucket_name, region):

integration/resources/expected/combination/function_with_sns_intrinsics.json

@@ -0,0 +1,30 @@
+[
+  {
+    "LogicalResourceId": "MyLambdaFunction",
+    "ResourceType": "AWS::Lambda::Function"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionRole",
+    "ResourceType": "AWS::IAM::Role"
+  },
+  {
+    "LogicalResourceId": "MySnsTopic",
+    "ResourceType": "AWS::SNS::Topic"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionSNSEvent",
+    "ResourceType": "AWS::SNS::Subscription"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionSNSEventQueue",
+    "ResourceType": "AWS::SQS::Queue"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionSNSEventEventSourceMapping",
+    "ResourceType": "AWS::Lambda::EventSourceMapping"
+  },
+  {
+    "LogicalResourceId": "MyLambdaFunctionSNSEventQueuePolicy",
+    "ResourceType": "AWS::SQS::QueuePolicy"
+  }
+]

integration/resources/templates/combination/function_with_sns_intrinsics.yaml

@@ -0,0 +1,38 @@
+Conditions:
+  MyCondition:
+    Fn::Equals:
+      - true
+      - false
+
+Resources:
+  MyLambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs12.x
+      CodeUri: ${codeuri}
+      MemorySize: 128
+
+      Events:
+        SNSEvent:
+          Type: SNS
+          Properties:
+            Topic:
+              Ref: MySnsTopic
+            FilterPolicy:
+              Fn::If:
+                - MyCondition
+                - price_usd:
+                    - numeric:
+                        - ">="
+                        - 100
+                - price_usd:
+                    - numeric:
+                        - "<"
+                        - 100
+            Region:
+              Ref: AWS::Region
+            SqsSubscription: true
+
+  MySnsTopic:
+    Type: AWS::SNS::Topic

tests/translator/input/error_sns_intrinsics.yaml

@@ -0,0 +1,23 @@
+Parameters:
+  SnsSqsSubscription:
+    Type: Boolean
+    Default: false
+
+Resources:
+  SaveNotificationFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://sam-demo-bucket/notifications.zip
+      Handler: index.save_notification
+      Runtime: nodejs12.x
+      Events:
+        NotificationTopic:
+          Type: SNS
+          Properties:
+            SqsSubscription:
+              Ref: SnsSqsSubscription
+            Topic:
+              Ref: Notifications
+
+  Notifications:
+    Type: AWS::SNS::Topic

tests/translator/input/sns_intrinsics.yaml

@@ -0,0 +1,41 @@
+Parameters:
+  SnsRegion:
+    Type: String
+    Default: us-east-1
+
+Conditions:
+  MyCondition:
+    Fn::Equals:
+      - true
+      - false
+
+Resources:
+  SaveNotificationFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://sam-demo-bucket/notifications.zip
+      Handler: index.save_notification
+      Runtime: nodejs12.x
+      Events:
+        NotificationTopic:
+          Type: SNS
+          Properties:
+            FilterPolicy:
+              Fn::If:
+                - MyCondition
+                - price_usd:
+                    - numeric:
+                        - ">="
+                        - 100
+                - price_usd:
+                    - numeric:
+                        - "<"
+                        - 100
+            Region:
+              Ref: SnsRegion
+            SqsSubscription: true
+            Topic:
+              Ref: Notifications
+
+  Notifications:
+    Type: AWS::SNS::Topic

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

@@ -0,0 +1,171 @@
+{
+  "Conditions": {
+    "MyCondition": {
+      "Fn::Equals": [
+        true,
+        false
+      ]
+    }
+  },
+  "Parameters": {
+    "SnsRegion": {
+      "Default": "us-east-1",
+      "Type": "String"
+    }
+  },
+  "Resources": {
+    "Notifications": {
+      "Type": "AWS::SNS::Topic"
+    },
+    "SaveNotificationFunctionNotificationTopicQueue": {
+      "Type": "AWS::SQS::Queue",
+      "Properties": {}
+    },
+    "SaveNotificationFunctionNotificationTopicQueuePolicy": {
+      "Type": "AWS::SQS::QueuePolicy",
+      "Properties": {
+        "Queues": [
+          {
+            "Ref": "SaveNotificationFunctionNotificationTopicQueue"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": "sqs:SendMessage",
+              "Resource": {
+                "Fn::GetAtt": [
+                  "SaveNotificationFunctionNotificationTopicQueue",
+                  "Arn"
+                ]
+              },
+              "Effect": "Allow",
+              "Condition": {
+                "ArnEquals": {
+                  "aws:SourceArn": {
+                    "Ref": "Notifications"
+                  }
+                }
+              },
+              "Principal": "*"
+            }
+          ]
+        }
+      }
+    },
+    "SaveNotificationFunctionNotificationTopic": {
+      "Type": "AWS::SNS::Subscription",
+      "Properties": {
+        "FilterPolicy": {
+          "Fn::If": [
+            "MyCondition",
+            {
+              "price_usd": [
+                {
+                  "numeric": [
+                    ">=",
+                    100
+                  ]
+                }
+              ]
+            },
+            {
+              "price_usd": [
+                {
+                  "numeric": [
+                    "<",
+                    100
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        "Region": {
+          "Ref": "SnsRegion"
+        },
+        "Endpoint": {
+          "Fn::GetAtt": [
+            "SaveNotificationFunctionNotificationTopicQueue",
+            "Arn"
+          ]
+        },
+        "Protocol": "sqs",
+        "TopicArn": {
+          "Ref": "Notifications"
+        }
+      }
+    },
+    "SaveNotificationFunctionRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Action": [
+                "sts:AssumeRole"
+              ],
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [
+                  "lambda.amazonaws.com"
+                ]
+              }
+            }
+          ]
+        },
+        "ManagedPolicyArns": [
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaSQSQueueExecutionRole"
+        ],
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ]
+      }
+    },
+    "SaveNotificationFunctionNotificationTopicEventSourceMapping": {
+      "Type": "AWS::Lambda::EventSourceMapping",
+      "Properties": {
+        "BatchSize": 10,
+        "Enabled": true,
+        "FunctionName": {
+          "Ref": "SaveNotificationFunction"
+        },
+        "EventSourceArn": {
+          "Fn::GetAtt": [
+            "SaveNotificationFunctionNotificationTopicQueue",
+            "Arn"
+          ]
+        }
+      }
+    },
+    "SaveNotificationFunction": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Handler": "index.save_notification",
+        "Code": {
+          "S3Bucket": "sam-demo-bucket",
+          "S3Key": "notifications.zip"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "SaveNotificationFunctionRole",
+            "Arn"
+          ]
+        },
+        "Runtime": "nodejs12.x",
+        "Tags": [
+          {
+            "Value": "SAM",
+            "Key": "lambda:createdBy"
+          }
+        ]
+      }
+    }
+  }
+}