Merge branch 'develop' into tmp/1749059990/main

roger-zhangg · web-flow · commit 9f6feeb4bd9c · 2025-06-04T11:12:09.000-07:00
diff --git a/integration/resources/templates/combination/function_with_mq.yaml b/integration/resources/templates/combination/function_with_mq.yaml
@@ -112,13 +112,13 @@ Resources:
         Ref: MQBrokerName
       DeploymentMode: SINGLE_INSTANCE
       EngineType: ACTIVEMQ
-      EngineVersion: 5.17.6
+      EngineVersion: 5.18
       HostInstanceType: mq.t3.micro
       Logs:
         Audit: true
         General: true
       PubliclyAccessible: true
-      AutoMinorVersionUpgrade: false
+      AutoMinorVersionUpgrade: true
       SecurityGroups:
       - Ref: MQSecurityGroup
       SubnetIds:
diff --git a/integration/resources/templates/combination/function_with_mq_using_autogen_role.yaml b/integration/resources/templates/combination/function_with_mq_using_autogen_role.yaml
@@ -84,13 +84,13 @@ Resources:
         Ref: MQBrokerName2
       DeploymentMode: SINGLE_INSTANCE
       EngineType: ACTIVEMQ
-      EngineVersion: 5.17.6
+      EngineVersion: 5.18
       HostInstanceType: mq.t3.micro
       Logs:
         Audit: true
         General: true
       PubliclyAccessible: true
-      AutoMinorVersionUpgrade: false
+      AutoMinorVersionUpgrade: true
       SecurityGroups:
       - Ref: MQSecurityGroup
       SubnetIds:
diff --git a/samtranslator/model/cognito.py b/samtranslator/model/cognito.py
@@ -11,6 +11,8 @@ class CognitoUserPool(Resource):
         "AutoVerifiedAttributes": GeneratedProperty(),
         "DeletionProtection": GeneratedProperty(),
         "DeviceConfiguration": GeneratedProperty(),
+        "EmailAuthenticationMessage": GeneratedProperty(),
+        "EmailAuthenticationSubject": GeneratedProperty(),
         "EmailConfiguration": GeneratedProperty(),
         "EmailVerificationMessage": GeneratedProperty(),
         "EmailVerificationSubject": GeneratedProperty(),
@@ -28,7 +30,10 @@ class CognitoUserPool(Resource):
         "UserPoolAddOns": GeneratedProperty(),
         "UserPoolName": GeneratedProperty(),
         "UserPoolTags": GeneratedProperty(),
+        "UserPoolTier": GeneratedProperty(),
         "VerificationMessageTemplate": GeneratedProperty(),
+        "WebAuthnRelyingPartyID": GeneratedProperty(),
+        "WebAuthnUserVerification": GeneratedProperty(),
     }
 
     runtime_attrs = {
diff --git a/samtranslator/schema/schema.json b/samtranslator/schema/schema.json
diff --git a/schema_source/cloudformation-docs.json b/schema_source/cloudformation-docs.json
diff --git a/schema_source/cloudformation.schema.json b/schema_source/cloudformation.schema.json
diff --git a/tests/translator/input/cognito_template_with_new_properties.yaml b/tests/translator/input/cognito_template_with_new_properties.yaml
@@ -0,0 +1,11 @@
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  MyUserPool:
+    Type: AWS::Cognito::UserPool
+    Properties:
+      UserPoolTier: PLUS
+      UserPoolName: MyUserPool
+      EmailAuthenticationMessage: Your verification code is {####}
+      EmailAuthenticationSubject: Your verification code
+      WebAuthnRelyingPartyID: id
+      WebAuthnUserVerification: required
diff --git a/tests/translator/output/aws-cn/cognito_template_with_new_properties.json b/tests/translator/output/aws-cn/cognito_template_with_new_properties.json
@@ -0,0 +1,15 @@
+{
+  "Resources": {
+    "MyUserPool": {
+      "Properties": {
+        "EmailAuthenticationMessage": "Your verification code is {####}",
+        "EmailAuthenticationSubject": "Your verification code",
+        "UserPoolName": "MyUserPool",
+        "UserPoolTier": "PLUS",
+        "WebAuthnRelyingPartyID": "id",
+        "WebAuthnUserVerification": "required"
+      },
+      "Type": "AWS::Cognito::UserPool"
+    }
+  }
+}
diff --git a/tests/translator/output/aws-us-gov/cognito_template_with_new_properties.json b/tests/translator/output/aws-us-gov/cognito_template_with_new_properties.json
@@ -0,0 +1,15 @@
+{
+  "Resources": {
+    "MyUserPool": {
+      "Properties": {
+        "EmailAuthenticationMessage": "Your verification code is {####}",
+        "EmailAuthenticationSubject": "Your verification code",
+        "UserPoolName": "MyUserPool",
+        "UserPoolTier": "PLUS",
+        "WebAuthnRelyingPartyID": "id",
+        "WebAuthnUserVerification": "required"
+      },
+      "Type": "AWS::Cognito::UserPool"
+    }
+  }
+}
diff --git a/tests/translator/output/cognito_template_with_new_properties.json b/tests/translator/output/cognito_template_with_new_properties.json
@@ -0,0 +1,15 @@
+{
+  "Resources": {
+    "MyUserPool": {
+      "Properties": {
+        "EmailAuthenticationMessage": "Your verification code is {####}",
+        "EmailAuthenticationSubject": "Your verification code",
+        "UserPoolName": "MyUserPool",
+        "UserPoolTier": "PLUS",
+        "WebAuthnRelyingPartyID": "id",
+        "WebAuthnUserVerification": "required"
+      },
+      "Type": "AWS::Cognito::UserPool"
+    }
+  }
+}
