Merge branch 'main' into s3-skip-notification-destination-validation

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

@@ -19,21 +19,14 @@ jobs:
  persist-credentials: false
  - name: Find changed cli files
  id: changed-cli-files
- uses: tj-actions/changed-files@6b2903bdce6310cfbddd87c418f253cf29b2dec9
+ uses: tj-actions/changed-files@c65cd883420fd2eb864698a825fc4162dd94482c
  with:
  base_sha: ${{ github.event.pull_request.base.sha }}
  files_yaml: |
  cli:
  - packages/aws-cdk/bin/**
  - packages/aws-cdk/lib/**
  - packages/aws-cdk/test/**
- - packages/cdk-assets/bin/**
- - packages/cdk-assets/lib/**
- - packages/cdk-assets/test/**
- - packages/aws-cdk-lib/cloud-assembly-schema/lib/**
- - packages/aws-cdk-lib/cloud-assembly-schema/schema/**
- - packages/aws-cdk-lib/cloud-assembly-schema/scripts/**
- - packages/aws-cdk-lib/cloud-assembly-schema/test/**
  - packages/@aws-cdk/cloudformation-diff/lib/**
  - packages/@aws-cdk/cloudformation-diff/test/**
  - packages/@aws-cdk-testing/cli-integ/bin/**

CHANGELOG.v2.alpha.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.152.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.151.1-alpha.0...v2.152.0-alpha.0) (2024-08-14)
+
+## [2.151.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.151.0-alpha.0...v2.151.1-alpha.0) (2024-08-14)
+
 ## [2.151.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.150.0-alpha.0...v2.151.0-alpha.0) (2024-08-01)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.152.0](https://github.com/aws/aws-cdk/compare/v2.151.1...v2.152.0) (2024-08-14)
+
+
+### Features
+
+* **lambda:** support filter criteria encryption ([6aa72a2](https://github.com/aws/aws-cdk/commit/6aa72a215859ab96e9fd8b4ccee0d40bda753200))
+
+## [2.151.1](https://github.com/aws/aws-cdk/compare/v2.151.0...v2.151.1) (2024-08-14)
+
+
+### Reverts
+
+* feat(ecs): add validation checks to memory cpu combinations of FARGATE compatible task definitions ([#31110](https://github.com/aws/aws-cdk/issues/31110)) ([8fdf015](https://github.com/aws/aws-cdk/commit/8fdf015fdc310d6d62cec31b6d89e1ff1decb8b6))
+
 ## [2.151.0](https://github.com/aws/aws-cdk/compare/v2.150.0...v2.151.0) (2024-08-01)
 
 

CONTRIBUTORS.md

@@ -12,21 +12,21 @@ Shout out to our top contributors!
 - [shivlaks](https://github.com/shivlaks)
 - [otaviomacedo](https://github.com/otaviomacedo)
 - [mrgrain](https://github.com/mrgrain)
-- [madeline-k](https://github.com/madeline-k)
 - [pahud](https://github.com/pahud)
+- [madeline-k](https://github.com/madeline-k)
 - [comcalvi](https://github.com/comcalvi)
-- [NetaNir](https://github.com/NetaNir)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
+- [NetaNir](https://github.com/NetaNir)
 - [robertd](https://github.com/robertd)
 - [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
 - [go-to-k](https://github.com/go-to-k)
 - [lpizzinidev](https://github.com/lpizzinidev)
 - [peterwoodworth](https://github.com/peterwoodworth)
 - [colifran](https://github.com/colifran)
 - [msambol](https://github.com/msambol)
-- [nija-at](https://github.com/nija-at)
 - [watany-dev](https://github.com/watany-dev)
+- [nija-at](https://github.com/nija-at)
 - [hoegertn](https://github.com/hoegertn)
 
 
-_Last updated: Mon, 01 Jul 24 00:11:02 +0000_
+_Last updated: Thu, 01 Aug 24 00:10:57 +0000_

lerna.json

@@ -2,7 +2,6 @@
  "npmClient": "yarn",
  "packages": [
  "packages/aws-cdk-lib",
- "packages/cdk-assets",
  "packages/aws-cdk",
  "packages/cdk",
  "packages/@aws-cdk/*",
@@ -25,4 +24,4 @@
  "rejectCycles": true,
  "version": "0.0.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}

package.json

@@ -72,7 +72,6 @@
  "packages/aws-cdk-lib",
  "packages/aws-cdk",
  "packages/cdk",
- "packages/cdk-assets",
  "packages/@aws-cdk/*",
  "packages/awslint",
  "packages/@aws-cdk-testing/*",
@@ -177,4 +176,4 @@
  "dependencies": {
  "string-width": "^4.2.3"
  }
-}
+}

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -102,6 +102,12 @@ integTest('cdk synth', withDefaultFixture(async (fixture) => {
  },
  }));
 
+ expect(await fixture.cdkSynth({
+ options: [fixture.fullStackName('test-1')],
+ })).not.toEqual(expect.stringContaining(`
+Rules:
+ CheckBootstrapVersion:`));
+
  await fixture.cdk(['synth', fixture.fullStackName('test-2')], { verbose: false });
  expect(fixture.template('test-2')).toEqual(expect.objectContaining({
  Resources: {