Merge branch 'main' into revert-32904-custom-resource-missing-permission

.github/workflows/project-prioritization-assignment.yml

@@ -1,7 +1,7 @@
 name: PR Prioritization
 on:
   pull_request_target:
-    types: 
+    types:
       - labeled
       - opened
       - reopened
@@ -10,6 +10,7 @@ on:
 
 jobs:
   prioritize:
+    if: github.repository == 'aws/aws-cdk'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/project-prioritization-r2-assignment.yml

@@ -6,10 +6,11 @@ on:
 
 jobs:
   update_project_status:
+    if: github.repository == 'aws/aws-cdk'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Check and assign R2 Priority to PRs
         uses: actions/github-script@v7
         with:

.github/workflows/project-prioritization-r5-assignment.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   update_project_status:
+    if: github.repository == 'aws/aws-cdk'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

packages/@aws-cdk-testing/framework-integ/test/aws-cognito/test/integ.user-pool-domain-managed-login.js.snapshot/integ-user-pool-domain-managed-login.template.json

@@ -0,0 +1,86 @@
+{
+ "Resources": {
+  "UserPool6BA7E5F2": {
+   "Type": "AWS::Cognito::UserPool",
+   "Properties": {
+    "AccountRecoverySetting": {
+     "RecoveryMechanisms": [
+      {
+       "Name": "verified_phone_number",
+       "Priority": 1
+      },
+      {
+       "Name": "verified_email",
+       "Priority": 2
+      }
+     ]
+    },
+    "AdminCreateUserConfig": {
+     "AllowAdminCreateUserOnly": true
+    },
+    "EmailVerificationMessage": "The verification code to your new account is {####}",
+    "EmailVerificationSubject": "Verify your new account",
+    "SmsVerificationMessage": "The verification code to your new account is {####}",
+    "VerificationMessageTemplate": {
+     "DefaultEmailOption": "CONFIRM_WITH_CODE",
+     "EmailMessage": "The verification code to your new account is {####}",
+     "EmailSubject": "Verify your new account",
+     "SmsMessage": "The verification code to your new account is {####}"
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "UserPoolDomainD0EA232A": {
+   "Type": "AWS::Cognito::UserPoolDomain",
+   "Properties": {
+    "Domain": "naonao-user-pool-domain",
+    "ManagedLoginVersion": 2,
+    "UserPoolId": {
+     "Ref": "UserPool6BA7E5F2"
+    }
+   }
+  }
+ },
+ "Outputs": {
+  "Domain": {
+   "Value": {
+    "Ref": "UserPoolDomainD0EA232A"
+   }
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}