Merge branch 'main' into support_putevents_in_apigatewayv2_eventbridge_integrations

Author: jasdeepbhalla

.github/workflows/codecov-collect.yml

@@ -28,7 +28,7 @@ jobs:
         run: cd packages/aws-cdk-lib && yarn test core
 
       - name: Upload Coverage and PR Info
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: coverage-artifacts
           path: |

.github/workflows/pr-build.yml

@@ -65,7 +65,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=2251954
 
       - name: Build
-        run: /bin/bash ./build.sh --ci
+        run: /bin/bash ./build.sh --ci --concurrency=10
 
       - name: Run Rosetta
         run: /bin/bash ./scripts/run-rosetta.sh

.github/workflows/pr-linter-review-trigger.yml

@@ -26,7 +26,7 @@ jobs:
           mkdir -p ./pr
           echo $PR_NUMBER > ./pr/pr_number
           echo $PR_SHA > ./pr/pr_sha
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: pr_info
           path: pr/

.github/workflows/spec-update.yml

@@ -31,7 +31,7 @@ jobs:
 
       # Upload the current db to be used later
       - name: Upload base database
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: db.base.json.gz
           path: node_modules/@aws-cdk/aws-service-spec/db.json.gz
@@ -49,7 +49,7 @@ jobs:
 
       # Now that we have updated the database, upload the new candidate db
       - name: Upload head database
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: db.head.json.gz
           path: node_modules/@aws-cdk/aws-service-spec/db.json.gz
@@ -69,7 +69,7 @@ jobs:
           git add .
           git diff --patch --staged > ${{ runner.temp }}/update-spec.patch
       - name: Upload Patch
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: update-spec.patch
           path: ${{ runner.temp }}/update-spec.patch
@@ -110,7 +110,7 @@ jobs:
           cat DIFF >> PR.md
           echo '```' >> PR.md
       - name: Upload PR body file
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: PR.md
           path: PR.md

.github/workflows/update-metadata-regions.yml

@@ -33,7 +33,7 @@ jobs:
           git add .
           git diff --patch --staged > ${{ runner.temp }}/update-spec.patch
       - name: Upload Patch
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: update-spec.patch
           path: ${{ runner.temp }}/update-spec.patch

.github/workflows/yarn-upgrade-need-manual-work.yml

@@ -66,7 +66,7 @@ jobs:
           git diff --binary --patch --staged > ${{ runner.temp }}/upgrade.patch
 
       - name: Upload Patch
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: upgrade.patch
           path: ${{ runner.temp }}/upgrade.patch

.github/workflows/yarn-upgrade.yml

@@ -80,7 +80,7 @@ jobs:
           git add .
           git diff --patch --staged > ${{ runner.temp }}/upgrade.patch
       - name: Upload Patch
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: upgrade.patch
           path: ${{ runner.temp }}/upgrade.patch

.mergify.yml

@@ -25,7 +25,7 @@ queue_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -50,7 +50,7 @@ queue_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -74,7 +74,7 @@ queue_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -109,7 +109,7 @@ pull_request_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
   - name: automatic priority merge
     actions:
       comment:
@@ -133,7 +133,7 @@ pull_request_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
   - name: automatic merge (2+ approvers)
     actions:
       comment:
@@ -157,7 +157,7 @@ pull_request_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
   - name: automatic merge (no-squash)
     actions:
       comment:
@@ -181,7 +181,7 @@ pull_request_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
   - name: remove stale reviews
     actions:
       dismiss_reviews:
@@ -224,7 +224,7 @@ pull_request_rules:
       - check-success=build
       - or:
         - "-label~=pr/needs-integration-tests-deployment"
-        - "check-success=integration_test_deployment"
+        - "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
 priority_rules:
   - name: priority for queue `default-merge`
     conditions:

allowed-breaking-changes.txt

@@ -966,3 +966,6 @@ removed:aws-cdk-lib.lambda_layer_kubectl.KubectlLayer
 # Fixing the JsonSchema interface to be consistent with JSON Schema spec
 changed-type:aws-cdk-lib.aws_apigateway.JsonSchema.additionalItems
 strengthened:aws-cdk-lib.aws_apigateway.JsonSchema
+
+# Revert a failing change
+strengthened:aws-cdk-lib.aws_stepfunctions.StateMachineProps

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.ts

@@ -5,7 +5,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
 import { IManagedPolicy, ManagedPolicyReference } from 'aws-cdk-lib/aws-iam';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as deploy from 'aws-cdk-lib/aws-s3-deployment';
-import { App, Fn, RemovalPolicy, Stack, UnscopedValidationError } from 'aws-cdk-lib';
+import { App, Fn, RemovalPolicy, ResourceEnvironment, Stack, UnscopedValidationError } from 'aws-cdk-lib';
 import * as integ from '@aws-cdk/integ-tests-alpha';
 import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
 import { Node } from 'constructs';
@@ -56,6 +56,9 @@ function makePolicy(arn: string): IManagedPolicy {
     get node(): Node {
       throw new UnscopedValidationError('The result of fromAwsManagedPolicyName can not be used in this API');
     },
+    get env(): ResourceEnvironment {
+      throw new UnscopedValidationError('The result of fromAwsManagedPolicyName can not be used in this API');
+    },
   };
 }