Merge branch 'main' into 34768-aws_stepfunction_tasks-callawsservicecrossregions-lambda-doesnt-return-service-response-correctly

Author: mergify[bot]

.github/workflows/codecov-upload.yml

@@ -24,15 +24,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: coverage-artifacts
-          path: ./coverage
+          path: ./packages/aws-cdk-lib/core/coverage
           github-token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.repository }}
           run-id: ${{ github.event.workflow_run.id }}
 
       - name: Upload to Codecov
         uses: codecov/codecov-action@v5
         with:
-          files: ./coverage/packages/aws-cdk-lib/coverage/cobertura-coverage.xml
+          files: ./packages/aws-cdk-lib/core/coverage/cobertura-coverage.xml
           fail_ci_if_error: true
           flags: suite.unit
           use_oidc: true

.github/workflows/pr-build.yml

@@ -1,14 +1,26 @@
 name: PR Build
 
 on:
+  workflow_dispatch: {}
+  merge_group: {}
+  push:
+    branches:
+      - main
+      - v2-release
   pull_request:
     branches:
       - main
       - v2-release
 
+# For every PR, cancel any previous builds in progress
+# ... but for all other builds we keep them running
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    runs-on: aws-cdk_ubuntu-latest_16-core
+    runs-on: aws-cdk_ubuntu-latest_32-core
 
     env:
       PR_BUILD: true
@@ -18,24 +30,32 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "18"
           cache: "yarn"
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
 
-      # @TODO
-      # - name: Start ECR proxy
-      #   run: /root/ecr-proxy/start.sh
+      - name: Load Docker images
+        id: docker-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.docker-images.tar
+          key: docker-cache-${{ runner.os }}
+
+      - name: Restore Docker images
+        if: ${{ steps.docker-cache.outputs.cache-hit }}
+        run: docker image load --input ~/.docker-images.tar
 
       - name: Cache build artifacts
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.s3buildcache
-          key: ${{ runner.os }}-${{ github.event.pull_request.base.ref }}-s3buildcache
+          key: s3buildcache-${{ runner.os }}
 
       - name: Configure system settings
         run: |
@@ -50,3 +70,15 @@ jobs:
 
       - name: Check for uncommitted changes
         run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD
+
+      - name: Export Docker images
+        if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
+        run: docker image save --output ~/.docker-images.tar $(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}')
+
+      - name: Cache Docker images
+        if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ~/.docker-images.tar
+          key: docker-cache-${{ runner.os }}

.github/workflows/spec-update.yml

@@ -2,8 +2,8 @@ name: AWS Service Spec Update
 
 on:
   schedule:
-    # Every Monday at 13:37 UTC
-    - cron: 37 13 * * 1
+    # Every Monday at 10:15 UTC since dependency releases are on Fridays : https://github.com/cdklabs/awscdk-service-spec/releases?q=-spec&expanded=true
+    - cron: 15 10 * * 1
   workflow_dispatch: {}
 
 jobs:

.mergify.yml

@@ -16,6 +16,7 @@ queue_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -36,6 +37,7 @@ queue_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -55,6 +57,7 @@ queue_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
     commit_message_template: |-
       {{ title }} (#{{ number }})
       {{ body }}
@@ -87,6 +90,7 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
   - name: automatic priority merge
     actions:
       comment:
@@ -108,6 +112,7 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
   - name: automatic merge (2+ approvers)
     actions:
       comment:
@@ -129,6 +134,7 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
   - name: automatic merge (no-squash)
     actions:
       comment:
@@ -150,6 +156,7 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
   - name: remove stale reviews
     actions:
       dismiss_reviews:
@@ -190,6 +197,7 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+      - status-success=build
 priority_rules:
   - name: priority for queue `default-merge`
     conditions:

CONTRIBUTORS.md

@@ -9,8 +9,8 @@ Shout out to our top contributors!
 - [jogold](https://github.com/jogold)
 - [iliapolo](https://github.com/iliapolo)
 - [corymhall](https://github.com/corymhall)
-- [shivlaks](https://github.com/shivlaks)
 - [mrgrain](https://github.com/mrgrain)
+- [shivlaks](https://github.com/shivlaks)
 - [otaviomacedo](https://github.com/otaviomacedo)
 - [mazyu36](https://github.com/mazyu36)
 - [pahud](https://github.com/pahud)
@@ -29,4 +29,4 @@ Shout out to our top contributors!
 - [colifran](https://github.com/colifran)
 
 
-_Last updated: Sun, 01 Jun 25 00:16:05 +0000_
+_Last updated: Tue, 01 Jul 25 00:15:11 +0000_

packages/@aws-cdk-testing/framework-integ/package.json

@@ -9,7 +9,7 @@
     "lint": "cdk-lint",
     "pkglint": "pkglint -f",
     "test": "cdk-test",
-    "integ": "integ-runner --language javascript",
+    "integ": "integ-runner --unstable=toolkit-lib-engine --language javascript",
     "package": "cdk-package",
     "build+test": "yarn build && yarn test",
     "build+extract": "yarn build",

packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.alarm-and-dashboard.js.snapshot/aws-cdk-cloudwatch-alarms.assets.json

@@ -7,7 +7,6 @@
    "Type": "AWS::CloudWatch::Alarm",
    "Properties": {
     "ComparisonOperator": "GreaterThanOrEqualToThreshold",
-    "EvaluationPeriods": 3,
     "DatapointsToAlarm": 2,
     "Dimensions": [
      {
@@ -20,6 +19,7 @@
       }
      }
     ],
+    "EvaluationPeriods": 3,
     "MetricName": "ApproximateNumberOfMessagesVisible",
     "Namespace": "AWS/SQS",
     "Period": 300,
@@ -94,7 +94,7 @@
        {
         "Ref": "AWS::Region"
        },
-       "\",\"query\":\"SOURCE 'my-log-group' | fields @message\\n                | filter @message like /Error/\"}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":50,\"properties\":{\"view\":\"singleValue\",\"title\":\"Sent message size\",\"region\":\"",
+       "\",\"accountId\":\"123456789012\",\"query\":\"SOURCE 'my-log-group' | fields @message\\n                | filter @message like /Error/\"}},{\"type\":\"metric\",\"width\":6,\"height\":3,\"x\":0,\"y\":50,\"properties\":{\"view\":\"singleValue\",\"title\":\"Sent message size\",\"region\":\"",
        {
         "Ref": "AWS::Region"
        },