fix: Validate Trigger field and test Cognito properties with intrinsic functions

samtranslator/model/eventsources/push.py

@@ -947,7 +947,7 @@ class Cognito(PushEventSource):
 
     property_types = {
         "UserPool": PropertyType(True, is_str()),
-        "Trigger": PropertyType(True, one_of(is_str(), list_of(is_str()))),
+        "Trigger": PropertyType(True, one_of(is_str(), list_of(is_str())), False),
     }
 
     def resources_to_link(self, resources):

tests/translator/input/cognito_userpool_with_event.yaml

@@ -2,8 +2,16 @@ Resources:
   UserPool:
     Type: AWS::Cognito::UserPool
     Properties:
-      LambdaConfig:
-        PreAuthentication: "Test"
+      UserPoolName: UserPoolName
+      Policies:
+        PasswordPolicy:
+          MinimumLength: 8
+      UsernameAttributes:
+        - email
+      Schema:
+        - AttributeDataType: String
+          Name: email
+          Required: false
   ImplicitApiFunction:
     Type: AWS::Serverless::Function
     Properties:
@@ -14,12 +22,12 @@ Resources:
         OneTrigger:
           Type: Cognito
           Properties:
-            UserPool: 
+            UserPool:
               Ref: UserPool
             Trigger: PreSignUp
         TwoTrigger:
           Type: Cognito
           Properties:
-            UserPool: 
+            UserPool:
               Ref: UserPool
-            Trigger: [Test1, Test2]        
+            Trigger: [PostConfirmation, VerifyAuthChallengeResponse]

tests/translator/input/error_cognito_trigger_invalid_type.yaml

@@ -0,0 +1,28 @@
+Resources:
+  UserPool:
+    Type: AWS::Cognito::UserPool
+    Properties:
+      UserPoolName: UserPoolName
+      Policies:
+        PasswordPolicy:
+          MinimumLength: 8
+      UsernameAttributes:
+        - email
+      Schema:
+        - AttributeDataType: String
+          Name: email
+          Required: false
+  ImplicitApiFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      InlineCode: |
+        exports.handler = async () => ‘Hello World!'
+      Handler: index.handler
+      Runtime: nodejs12.x
+      Events:
+        OneTrigger:
+          Type: Cognito
+          Properties:
+            UserPool:
+              Ref: UserPool
+            Trigger: !Join [ "", [ "Pre", "Sign", "Up"] ]

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

@@ -6,60 +6,67 @@
         "LambdaConfig": {
           "PreSignUp": {
             "Fn::GetAtt": [
-              "ImplicitApiFunction", "Arn"
+              "ImplicitApiFunction",
+              "Arn"
             ]
           },
-          "PreAuthentication": "Test",
-          "Test1": {
+          "PostConfirmation": {
             "Fn::GetAtt": [
               "ImplicitApiFunction",
               "Arn"
             ]
           },
-          "Test2": {
+          "VerifyAuthChallengeResponse": {
             "Fn::GetAtt": [
               "ImplicitApiFunction",
               "Arn"
             ]
           }
-        }
+        },
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": 8
+          }
+        },
+        "Schema": [
+          {
+            "AttributeDataType": "String",
+            "Name": "email",
+            "Required": false
+          }
+        ],
+        "UsernameAttributes": [
+          "email"
+        ],
+        "UserPoolName": "UserPoolName"
       }
     },
     "ImplicitApiFunction": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
-        "Handler": "index.gethtml", 
         "Code": {
-          "S3Bucket": "sam-demo-bucket", 
+          "S3Bucket": "sam-demo-bucket",
           "S3Key": "member_portal.zip"
-        }, 
+        },
+        "Handler": "index.gethtml",
         "Role": {
           "Fn::GetAtt": [
-            "ImplicitApiFunctionRole", 
+            "ImplicitApiFunctionRole",
             "Arn"
           ]
-        }, 
+        },
         "Runtime": "nodejs12.x",
         "Tags": [
           {
-            "Value": "SAM", 
-            "Key": "lambda:createdBy"
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
           }
         ]
       }
     },
     "ImplicitApiFunctionRole": {
       "Type": "AWS::IAM::Role",
       "Properties": {
-        "ManagedPolicyArns": [
-          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ],
-        "Tags": [
-          {
-            "Value": "SAM",
-            "Key": "lambda:createdBy"
-          }
-        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -75,24 +82,33 @@
               }
             }
           ]
-        }
+        },
+        "ManagedPolicyArns": [
+          "arn:aws-cn:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
       }
-    },    
+    },
     "ImplicitApiFunctionCognitoPermission": {
       "Type": "AWS::Lambda::Permission",
       "Properties": {
         "Action": "lambda:InvokeFunction",
         "FunctionName": {
           "Ref": "ImplicitApiFunction"
         },
+        "Principal": "cognito-idp.amazonaws.com",
         "SourceArn": {
           "Fn::GetAtt": [
             "UserPool",
             "Arn"
           ]
-        },
-        "Principal": "cognito-idp.amazonaws.com"
+        }
       }
     }
   }
-}
+}

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

@@ -6,60 +6,67 @@
         "LambdaConfig": {
           "PreSignUp": {
             "Fn::GetAtt": [
-              "ImplicitApiFunction", "Arn"
+              "ImplicitApiFunction",
+              "Arn"
             ]
           },
-          "PreAuthentication": "Test",
-          "Test1": {
+          "PostConfirmation": {
             "Fn::GetAtt": [
               "ImplicitApiFunction",
               "Arn"
             ]
           },
-          "Test2": {
+          "VerifyAuthChallengeResponse": {
             "Fn::GetAtt": [
               "ImplicitApiFunction",
               "Arn"
             ]
           }
-        }
+        },
+        "Policies": {
+          "PasswordPolicy": {
+            "MinimumLength": 8
+          }
+        },
+        "Schema": [
+          {
+            "AttributeDataType": "String",
+            "Name": "email",
+            "Required": false
+          }
+        ],
+        "UsernameAttributes": [
+          "email"
+        ],
+        "UserPoolName": "UserPoolName"
       }
     },
     "ImplicitApiFunction": {
-      "Type": "AWS::Lambda::Function", 
+      "Type": "AWS::Lambda::Function",
       "Properties": {
-        "Handler": "index.gethtml", 
         "Code": {
-          "S3Bucket": "sam-demo-bucket", 
+          "S3Bucket": "sam-demo-bucket",
           "S3Key": "member_portal.zip"
-        }, 
+        },
+        "Handler": "index.gethtml",
         "Role": {
           "Fn::GetAtt": [
-            "ImplicitApiFunctionRole", 
+            "ImplicitApiFunctionRole",
             "Arn"
           ]
-        }, 
+        },
         "Runtime": "nodejs12.x",
         "Tags": [
           {
-            "Value": "SAM", 
-            "Key": "lambda:createdBy"
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
           }
         ]
       }
     },
     "ImplicitApiFunctionRole": {
       "Type": "AWS::IAM::Role",
       "Properties": {
-        "ManagedPolicyArns": [
-          "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-        ],
-        "Tags": [
-          {
-            "Value": "SAM",
-            "Key": "lambda:createdBy"
-          }
-        ],
         "AssumeRolePolicyDocument": {
           "Version": "2012-10-17",
           "Statement": [
@@ -75,24 +82,33 @@
               }
             }
           ]
-        }
+        },
+        "ManagedPolicyArns": [
+          "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+        ],
+        "Tags": [
+          {
+            "Key": "lambda:createdBy",
+            "Value": "SAM"
+          }
+        ]
       }
-    },    
+    },
     "ImplicitApiFunctionCognitoPermission": {
       "Type": "AWS::Lambda::Permission",
       "Properties": {
         "Action": "lambda:InvokeFunction",
         "FunctionName": {
           "Ref": "ImplicitApiFunction"
         },
+        "Principal": "cognito-idp.amazonaws.com",
         "SourceArn": {
           "Fn::GetAtt": [
             "UserPool",
             "Arn"
           ]
-        },
-        "Principal": "cognito-idp.amazonaws.com"
+        }
       }
     }
   }
-}
+}