Merge branch 'main' into s3-transition-size

.mergify.yml

@@ -1,9 +1,22 @@
 # See https://doc.mergify.io
 queue_rules:
-  - name: default
+  - name: default-merge
     update_method: merge
+    merge_method: merge
     conditions:
       - status-success~=AWS CodeBuild us-east-1
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+      {{ body }}
+
+  - name: default-squash
+    update_method: merge
+    merge_method: squash
+    conditions:
+      - status-success~=AWS CodeBuild us-east-1
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+      {{ body }}
 
 pull_request_rules:
   - name: label core
@@ -18,11 +31,7 @@ pull_request_rules:
       comment:
         message: Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       queue:
-        name: default
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-          {{ body }}
+        name: default-squash
     conditions:
       - base!=release
       - -title~=(WIP|wip)
@@ -41,11 +50,7 @@ pull_request_rules:
       comment:
         message: Thank you for contributing! Your pull request will be automatically updated and merged (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       queue:
-        name: default
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-          {{ body }}
+        name: default-squash
     conditions:
       - base!=release
       - -title~=(WIP|wip)
@@ -65,11 +70,7 @@ pull_request_rules:
       comment:
         message: Thank you for contributing! Your pull request will be automatically updated and merged without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       queue:
-        name: default
-        method: merge
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-          {{ body }}
+        name: default-merge
     conditions:
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)
@@ -112,11 +113,7 @@ pull_request_rules:
       comment:
         message: Thanks Dependabot!
       queue:
-        name: default
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-          {{ body }}
+        name: default-squash
     conditions:
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)

packages/@aws-cdk-testing/framework-integ/test/aws-cognito/test/integ.user-pool-idp.apple.js.snapshot/integ-user-pool-idp-apple.template.json

@@ -34,9 +34,6 @@
   "poolclient2623294C": {
    "Type": "AWS::Cognito::UserPoolClient",
    "Properties": {
-    "UserPoolId": {
-     "Ref": "pool056F3F7E"
-    },
     "AllowedOAuthFlows": [
      "implicit",
      "code"
@@ -57,7 +54,10 @@
       "Ref": "apple9B5408AC"
      },
      "COGNITO"
-    ]
+    ],
+    "UserPoolId": {
+     "Ref": "pool056F3F7E"
+    }
    }
   },
   "pooldomain430FA744": {
@@ -72,21 +72,22 @@
   "apple9B5408AC": {
    "Type": "AWS::Cognito::UserPoolIdentityProvider",
    "Properties": {
-    "ProviderName": "SignInWithApple",
-    "ProviderType": "SignInWithApple",
-    "UserPoolId": {
-     "Ref": "pool056F3F7E"
-    },
     "AttributeMapping": {
      "family_name": "lastName",
-     "given_name": "firstName"
+     "given_name": "firstName",
+     "email_verified": "email_verified"
     },
     "ProviderDetails": {
      "client_id": "com.amzn.cdk",
      "team_id": "CDKTEAMCDK",
      "key_id": "CDKKEYCDK1",
      "private_key": "PRIV_KEY_CDK",
      "authorize_scopes": "email name"
+    },
+    "ProviderName": "SignInWithApple",
+    "ProviderType": "SignInWithApple",
+    "UserPoolId": {
+     "Ref": "pool056F3F7E"
     }
    }
   }