Merge branch 'main' into merge-back/2.210.0

Author: mergify[bot]

.github/workflows/request-cli-integ-test.yml

@@ -2,7 +2,13 @@
 
 name: request-cli-integ-test
 on:
-  pull_request_target: {}
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
 
 jobs:
   cli-changes:
@@ -28,7 +34,7 @@ jobs:
   submit-to-test-pipeline:
     environment: test-pipeline
     needs: cli-changes
-    if: needs.cli-changes.outputs.any-changed-files == 'true'
+    if: needs.cli-changes.outputs.any-changed-files == 'true' || contains(github.event.pull_request.labels.*.name, 'pr/request-cli-integ-tests')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.mergify.yml

@@ -17,7 +17,6 @@ queue_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
     commit_message_template: |-
@@ -38,7 +37,6 @@ queue_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
     commit_message_template: |-
@@ -58,7 +56,6 @@ queue_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
     commit_message_template: |-
@@ -91,7 +88,6 @@ pull_request_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
   - name: automatic priority merge
@@ -113,7 +109,6 @@ pull_request_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
   - name: automatic merge (2+ approvers)
@@ -135,7 +130,6 @@ pull_request_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
   - name: automatic merge (no-squash)
@@ -157,7 +151,6 @@ pull_request_rules:
       - -approved-reviews-by~=author
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
   - name: remove stale reviews
@@ -198,7 +191,6 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
       # This is important! It makes the PR Linter work.
       - "#changes-requested-reviews-by=0"
-      - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
       - status-success=build
 priority_rules:

packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.table-v2-mrsc.js.snapshot/aws-cdk-global-table-mrsc.assets.json

@@ -0,0 +1,84 @@
+{
+ "Resources": {
+  "GlobalTable89F068B2": {
+   "Type": "AWS::DynamoDB::GlobalTable",
+   "Properties": {
+    "AttributeDefinitions": [
+     {
+      "AttributeName": "pk",
+      "AttributeType": "S"
+     },
+     {
+      "AttributeName": "sk",
+      "AttributeType": "N"
+     }
+    ],
+    "BillingMode": "PAY_PER_REQUEST",
+    "GlobalTableWitnesses": [
+     {
+      "Region": "us-west-2"
+     }
+    ],
+    "KeySchema": [
+     {
+      "AttributeName": "pk",
+      "KeyType": "HASH"
+     },
+     {
+      "AttributeName": "sk",
+      "KeyType": "RANGE"
+     }
+    ],
+    "MultiRegionConsistency": "STRONG",
+    "Replicas": [
+     {
+      "Region": "us-east-2"
+     },
+     {
+      "Region": "us-east-1"
+     }
+    ],
+    "StreamSpecification": {
+     "StreamViewType": "NEW_AND_OLD_IMAGES"
+    },
+    "TableName": "my-global-table"
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  }
+ },
+ "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."
+    }
+   ]
+  }
+ }
+}