fix: allow references in NotificationARNs property (#1088)

keetonian · praneetap · commit 1f71077f4052 · 2019-08-19T11:09:55.000-07:00
diff --git a/samtranslator/model/cloudformation.py b/samtranslator/model/cloudformation.py
@@ -1,5 +1,5 @@
 from samtranslator.model import PropertyType, Resource
-from samtranslator.model.types import is_type, is_str, list_of
+from samtranslator.model.types import is_type, is_str, list_of, one_of
 from samtranslator.model.intrinsics import ref
 
 
@@ -9,7 +9,7 @@ class NestedStack(Resource):
     property_types = {
         'TemplateURL': PropertyType(True, is_str()),
         'Parameters': PropertyType(False, is_type(dict)),
-        'NotificationARNs': PropertyType(False, list_of(is_str())),
+        'NotificationARNs': PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),
         'Tags': PropertyType(False, list_of(is_type(dict))),
         'TimeoutInMinutes': PropertyType(False, is_type(int))
     }
diff --git a/samtranslator/model/sam_resources.py b/samtranslator/model/sam_resources.py
@@ -617,7 +617,7 @@ class SamApplication(SamResourceMacro):
         'Location': PropertyType(True, one_of(is_str(), is_type(dict))),
         'TemplateUrl': PropertyType(False, is_str()),
         'Parameters': PropertyType(False, is_type(dict)),
-        'NotificationARNs': PropertyType(False, list_of(is_str())),
+        'NotificationARNs': PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),
         'Tags': PropertyType(False, is_type(dict)),
         'TimeoutInMinutes': PropertyType(False, is_type(int))
     }
diff --git a/tests/translator/input/application_with_intrinsics.yaml b/tests/translator/input/application_with_intrinsics.yaml
@@ -37,4 +37,8 @@ Resources:
         SemanticVersion: !FindInMap
         - ApplicationLocations
         - !Ref 'AWS::Region'
-        - Version
+        - Version
+      NotificationARNs:
+        - !Ref Sns
+  Sns:
+    Type: AWS::SNS::Topic
diff --git a/tests/translator/output/application_with_intrinsics.json b/tests/translator/output/application_with_intrinsics.json
@@ -1,70 +1,78 @@
 {
+  "Parameters": {
+    "ApplicationIdParam": {
+      "Default": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world", 
+      "Type": "String"
+    }, 
+    "VersionParam": {
+      "Default": "1.0.0", 
+      "Type": "String"
+    }
+  }, 
+  "Mappings": {
+    "ApplicationLocations": {
+      "cn-north-1": {
+        "Version": "1.0.2", 
+        "ApplicationId": "arn:aws-cn:serverlessrepo:cn-north-1:123456789012:applications/hello-world"
+      }, 
+      "us-gov-west-1": {
+        "Version": "1.0.3", 
+        "ApplicationId": "arn:aws-gov:serverlessrepo:us-gov-west-1:123456789012:applications/hello-world"
+      }, 
+      "ap-southeast-1": {
+        "Version": "1.0.1", 
+        "ApplicationId": "arn:aws:serverlessrepo:ap-southeast-1:123456789012:applications/hello-world"
+      }
+    }
+  }, 
   "Resources": {
-    "ApplicationRefParameter": {
-      "Type": "AWS::CloudFormation::Stack",
+    "ApplicationFindInMap": {
+      "Type": "AWS::CloudFormation::Stack", 
       "Properties": {
-        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url",
+        "NotificationARNs": [
+          {
+            "Ref": "Sns"
+          }
+        ], 
+        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url", 
         "Tags": [
           {
-            "Value": "SAM",
+            "Value": "SAM", 
             "Key": "lambda:createdBy"
-          },
+          }, 
           {
-            "Value": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world",
+            "Value": "arn:aws:serverlessrepo:ap-southeast-1:123456789012:applications/hello-world", 
             "Key": "serverlessrepo:applicationId"
-          },
+          }, 
           {
-            "Value": "1.0.0",
+            "Value": "1.0.1", 
             "Key": "serverlessrepo:semanticVersion"
           }
         ]
       }
-    },
-    "ApplicationFindInMap": {
-      "Type": "AWS::CloudFormation::Stack",
+    }, 
+    "ApplicationRefParameter": {
+      "Type": "AWS::CloudFormation::Stack", 
       "Properties": {
-        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url",
+        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url", 
         "Tags": [
           {
-            "Value": "SAM",
+            "Value": "SAM", 
             "Key": "lambda:createdBy"
-          },
+          }, 
           {
-            "Value": "arn:aws:serverlessrepo:ap-southeast-1:123456789012:applications/hello-world",
+            "Value": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world", 
             "Key": "serverlessrepo:applicationId"
-          },
+          }, 
           {
-            "Value": "1.0.1",
+            "Value": "1.0.0", 
             "Key": "serverlessrepo:semanticVersion"
           }
         ]
       }
-    }
-  },
-  "Parameters": {
-    "ApplicationIdParam": {
-      "Type": "String",
-      "Default": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world"
-    },
-    "VersionParam": {
-      "Type": "String",
-      "Default": "1.0.0"
-    }
-  },
-  "Mappings": {
-    "ApplicationLocations": {
-      "ap-southeast-1": {
-        "ApplicationId": "arn:aws:serverlessrepo:ap-southeast-1:123456789012:applications/hello-world",
-        "Version": "1.0.1"
-      },
-      "cn-north-1": {
-        "ApplicationId": "arn:aws-cn:serverlessrepo:cn-north-1:123456789012:applications/hello-world",
-        "Version": "1.0.2"
-      },
-      "us-gov-west-1": {
-        "ApplicationId": "arn:aws-gov:serverlessrepo:us-gov-west-1:123456789012:applications/hello-world",
-        "Version": "1.0.3"
-      }
+    }, 
+    "Sns": {
+      "Type": "AWS::SNS::Topic"
     }
   }
 }
diff --git a/tests/translator/output/aws-cn/application_with_intrinsics.json b/tests/translator/output/aws-cn/application_with_intrinsics.json
@@ -1,70 +1,78 @@
 {
+  "Parameters": {
+    "ApplicationIdParam": {
+      "Default": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world", 
+      "Type": "String"
+    }, 
+    "VersionParam": {
+      "Default": "1.0.0", 
+      "Type": "String"
+    }
+  }, 
+  "Mappings": {
+    "ApplicationLocations": {
+      "cn-north-1": {
+        "Version": "1.0.2", 
+        "ApplicationId": "arn:aws-cn:serverlessrepo:cn-north-1:123456789012:applications/hello-world"
+      }, 
+      "us-gov-west-1": {
+        "Version": "1.0.3", 
+        "ApplicationId": "arn:aws-gov:serverlessrepo:us-gov-west-1:123456789012:applications/hello-world"
+      }, 
+      "ap-southeast-1": {
+        "Version": "1.0.1", 
+        "ApplicationId": "arn:aws:serverlessrepo:ap-southeast-1:123456789012:applications/hello-world"
+      }
+    }
+  }, 
   "Resources": {
-    "ApplicationRefParameter": {
-      "Type": "AWS::CloudFormation::Stack",
+    "ApplicationFindInMap": {
+      "Type": "AWS::CloudFormation::Stack", 
       "Properties": {
-        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url",
+        "NotificationARNs": [
+          {
+            "Ref": "Sns"
+          }
+        ], 
+        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url", 
         "Tags": [
           {
-            "Value": "SAM",
+            "Value": "SAM", 
             "Key": "lambda:createdBy"
-          },
+          }, 
           {
-            "Value": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world",
+            "Value": "arn:aws-cn:serverlessrepo:cn-north-1:123456789012:applications/hello-world", 
             "Key": "serverlessrepo:applicationId"
-          },
+          }, 
           {
-            "Value": "1.0.0",
+            "Value": "1.0.2", 
             "Key": "serverlessrepo:semanticVersion"
           }
         ]
       }
-    },
-    "ApplicationFindInMap": {
-      "Type": "AWS::CloudFormation::Stack",
+    }, 
+    "ApplicationRefParameter": {
+      "Type": "AWS::CloudFormation::Stack", 
       "Properties": {
-        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url",
+        "TemplateURL": "https://awsserverlessrepo-changesets-xxx.s3.amazonaws.com/signed-url", 
         "Tags": [
           {
-            "Value": "SAM",
+            "Value": "SAM", 
             "Key": "lambda:createdBy"
-          },
+          }, 
           {
-            "Value": "arn:aws-cn:serverlessrepo:cn-north-1:123456789012:applications/hello-world",
+            "Value": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world", 
             "Key": "serverlessrepo:applicationId"
-          },
+          }, 
           {
-            "Value": "1.0.2",
+            "Value": "1.0.0", 
             "Key": "serverlessrepo:semanticVersion"
           }
         ]
       }
-    }
-  },
-  "Parameters": {
-    "ApplicationIdParam": {
-      "Type": "String",
-      "Default": "arn:aws:serverlessrepo:us-east-1:123456789012:applications/hello-world"
-    },
-    "VersionParam": {
-      "Type": "String",
-      "Default": "1.0.0"
-    }
-  },
-  "Mappings": {
-    "ApplicationLocations": {
-      "ap-southeast-1": {
-        "ApplicationId": "arn:aws:serverlessrepo:ap-southeast-1:123456789012:applications/hello-world",
-        "Version": "1.0.1"
-      },
-      "cn-north-1": {
-        "ApplicationId": "arn:aws-cn:serverlessrepo:cn-north-1:123456789012:applications/hello-world",
-        "Version": "1.0.2"
-      },
-      "us-gov-west-1": {
-        "ApplicationId": "arn:aws-gov:serverlessrepo:us-gov-west-1:123456789012:applications/hello-world",
-        "Version": "1.0.3"
-      }
+    }, 
+    "Sns": {
+      "Type": "AWS::SNS::Topic"
     }
   }
 }
diff --git a/tests/translator/output/aws-us-gov/application_with_intrinsics.json b/tests/translator/output/aws-us-gov/application_with_intrinsics.json

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ class SamApplication(SamResourceMacro):`
`617`	`617`	`'Location': PropertyType(True, one_of(is_str(), is_type(dict))),`
`618`	`618`	`'TemplateUrl': PropertyType(False, is_str()),`
`619`	`619`	`'Parameters': PropertyType(False, is_type(dict)),`
`620`		`- 'NotificationARNs': PropertyType(False, list_of(is_str())),`
	`620`	`+ 'NotificationARNs': PropertyType(False, list_of(one_of(is_str(), is_type(dict)))),`
`621`	`621`	`'Tags': PropertyType(False, is_type(dict)),`
`622`	`622`	`'TimeoutInMinutes': PropertyType(False, is_type(int))`
`623`	`623`	`}`