Merge branch 'main' into cloudwatch-cross-account

Author: ozelalisen

.github/workflows/codecov-upload.yml

@@ -24,15 +24,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: coverage-artifacts
-          path: ./coverage
+          path: ./coverage/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: ./coverage/packages/aws-cdk-lib/core/coverage/cobertura-coverage.xml
           fail_ci_if_error: true
           flags: suite.unit
           use_oidc: true

.github/workflows/github-merit-badger.yml

@@ -17,4 +17,4 @@ jobs:
           badges: '[beginning-contributor,repeat-contributor,valued-contributor,admired-contributor,star-contributor,distinguished-contributor]'
           thresholds: '[0,3,6,13,25,50]'
           badge-type: 'achievement'
-          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws,ozelalisen,abogical,alinko-aws,vishaalmehrishi,alvazjor,kumsmrit,kumvprat,leonmk-aws,matboros,gasolima]'
+          ignore-usernames: '[rix0rrr,iliapolo,otaviomacedo,kaizencc,TheRealAmazonKendra,mrgrain,pahud,kellertk,ashishdhingra,khushail,moelasmar,paulhcsun,GavinZZ,xazhao,gracelu0,shikha372,godwingrs22,bergjaak,IanKonlog,Leo10Gama,samson-keung,scorbiere,jiayiwang7,saiyush,5d,iankhou,QuantumNeuralCoder,SimonCMoore,Y-JayKim,ykethan,astiwana,maharajhaider,aws-cdk-automation,dependabot[bot],mergify[bot],aemada-aws,ozelalisen,abogical,alinko-aws,vishaalmehrishi,alvazjor,kumsmrit,kumvprat,leonmk-aws,matboros,gasolima,abidhasan-aws]'

.github/workflows/pr-build.yml

@@ -0,0 +1,84 @@
+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_32-core
+
+    env:
+      PR_BUILD: true
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+          cache: "yarn"
+
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      - 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@v4
+        with:
+          path: |
+            ~/.s3buildcache
+          key: s3buildcache-${{ runner.os }}
+
+      - name: Configure system settings
+        run: |
+          (command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
+          sudo sysctl -w vm.max_map_count=2251954
+
+      - name: Build
+        run: /bin/bash ./build.sh --ci
+
+      - name: Run Rosetta
+        run: /bin/bash ./scripts/run-rosetta.sh
+
+      - 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 }}
@@ -65,7 +68,7 @@ pull_request_rules:
       label:
         add: [contribution/core]
     conditions:
-      - author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|TheRealAmazonKendra|mrgrain|pahud|ashishdhingra|kellertk|moelasmar|paulhcsun|GavinZZ|xazhao|gracelu0|shikha372|QuantumNeuralCoder|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere|jiayiwang7|saiyush|5d|iankhou|SimonCMoore|maharajhaider|Y-JayKim|astiwana|ykethan|aemada-aws|ozelalisen|abogical|alinko-aws|vishaalmehrishi|alvazjor|kumsmrit|kumvprat|leonmk-aws|matboros|gasolima)$
+      - author=@aws/aws-cdk-team
       - -label~="contribution/core"
   - name: automatic merge
     actions:
@@ -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:

allowed-breaking-changes.txt

@@ -3,6 +3,11 @@
 # and that won't typecheck if Manifest.load() adds a union arm and now returns A | B | C.
 change-return-type:@aws-cdk/cloud-assembly-schema.Manifest.load
 
+# To deal with the same as the above: adding artifact properties weakens the ArtifactManifest type.
+# This is done on purpose though, and doesn't break a real type contract in practice because the type
+# of the `properties` field is already unreliable for exhaustive checking.
+weakened:aws-cdk-lib.cloud_assembly_schema.ArtifactManifest
+
 # Adding any new context queries will add to the ContextQueryProperties type,
 # which changes the signature of MissingContext.
 weakened:@aws-cdk/cloud-assembly-schema.MissingContext
@@ -190,7 +195,7 @@ removed:aws-cdk-lib.aws_ec2.CfnNetworkInterface.enablePrimaryIpv6
 removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceAttachment.attrId
 removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceProps.enablePrimaryIpv6
 
-# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter. 
+# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter.
 weakened:aws-cdk-lib.aws_appsync.SourceApi
 
 # Due to https://github.com/aws/aws-cdk/issues/27259, none of these could have worked

lerna.json

@@ -12,12 +12,10 @@
     "tools/@aws-cdk/cdk-build-tools",
     "tools/@aws-cdk/user-input-gen",
     "tools/@aws-cdk/cdk-release",
-    "tools/@aws-cdk/node-bundle",
     "tools/@aws-cdk/pkglint",
     "tools/@aws-cdk/pkgtools",
     "tools/@aws-cdk/prlint",
     "tools/@aws-cdk/spec2cdk",
-    "tools/@aws-cdk/yarn-cling",
     "tools/@aws-cdk/lazify",
     "tools/@aws-cdk/lambda-integration-test-updater",
     "tools/@aws-cdk/construct-metadata-updater",
@@ -26,4 +24,4 @@
   "rejectCycles": true,
   "version": "0.0.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}

package.json

@@ -32,7 +32,7 @@
     "nx": "^20",
     "semver": "^7.7.2",
     "standard-version": "^9.5.0",
-    "ts-jest": "^29.3.4",
+    "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2",
     "typescript": "~5.5.4"
   },
@@ -79,12 +79,10 @@
       "tools/@aws-cdk/cdk-build-tools",
       "tools/@aws-cdk/user-input-gen",
       "tools/@aws-cdk/cdk-release",
-      "tools/@aws-cdk/node-bundle",
       "tools/@aws-cdk/pkglint",
       "tools/@aws-cdk/pkgtools",
       "tools/@aws-cdk/prlint",
       "tools/@aws-cdk/spec2cdk",
-      "tools/@aws-cdk/yarn-cling",
       "tools/@aws-cdk/lazify",
       "tools/@aws-cdk/lambda-integration-test-updater",
       "tools/@aws-cdk/construct-metadata-updater",

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",
@@ -30,13 +30,13 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "@aws-cdk/integ-runner": "^2.187.0",
+    "@aws-cdk/integ-runner": "^2.188.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@aws-sdk/client-acm": "3.632.0",
     "@aws-sdk/client-rds": "3.632.0",
     "@aws-sdk/client-s3": "3.632.0",
     "@aws-sdk/client-cognito-identity-provider": "3.632.0",
-    "axios": "1.9.0",
+    "axios": "1.10.0",
     "delay": "5.0.0"
   },
   "dependencies": {
@@ -48,7 +48,7 @@
     "@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
     "@aws-cdk/lambda-layer-kubectl-v33": "^2.0.0",
     "aws-cdk-lib": "0.0.0",
-    "cdk8s": "2.69.73",
+    "cdk8s": "2.69.74",
     "cdk8s-plus-27": "2.9.5",
     "constructs": "^10.0.0"
   },