Merge branch 'main' into awsgh-23803

.github/workflows/yarn-upgrade-v1main.yml

@@ -39,7 +39,7 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Install Tools
         run: |-
-          npm -g install lerna js-yaml npm-check-updates@^9.0.0
+          npm -g install lerna npm-check-updates
       - name: Build CLI
         run: lerna run build --scope aws-cdk --include-dependencies --stream
       - name: Build Integ Runner
@@ -51,7 +51,6 @@ jobs:
           echo "list=$(lerna ls --all --json 2>/dev/null | jq -r 'map(.name) | join(",")')" >> $GITHUB_OUTPUT
       - name: Run "ncu -u"
         # We special-case some @types because they need to be pinned to specific versions due to breaking changes in minor upgrades https://github.com/DefinitelyTyped/DefinitelyTyped/issues/64266
-        # We special-case aws-sdk because of breaking changes with TS interface exports in recent minor versions - https://github.com/aws/aws-sdk-js/issues/3453
         # We special-case typescript because it's not semantically versioned
         # We special-case constructs because we want to stay in control of the minimum compatible version
         # We special-case lerna because we have a patch on it that stops applying if Lerna upgrades. Remove this once https://github.com/lerna/lerna/pull/2874 releases.
@@ -61,8 +60,8 @@ jobs:
           ncu --upgrade --filter=typescript --target=patch
           ncu --upgrade --reject=@types/node,@types/prettier,constructs,typescript,lerna --target=minor
           # Upgrade all the packages
-          lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
-          lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/prettier,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}'  --target=minor
+          lerna exec --parallel ncu -- --upgrade --filter=typescript,lerna --target=patch
+          lerna exec --parallel ncu -- --upgrade --reject='@types/conventional-commits-parser,@types/node,@types/prettier,constructs,typescript,aws-sdk-mock,${{ steps.list-packages.outputs.list }}'  --target=minor
 
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
       - name: Run "yarn install"

.github/workflows/yarn-upgrade.yml

@@ -37,7 +37,7 @@ jobs:
         run: yarn install --frozen-lockfile
       - name: Install Tools
         run: |-
-          npm -g install lerna js-yaml npm-check-updates@^9.0.0
+          npm -g install lerna npm-check-updates
       - name: Build Integ Runner
         run: lerna run build --scope @aws-cdk/integ-runner --include-dependencies
       - name: List Mono-Repo Packages
@@ -47,7 +47,6 @@ jobs:
           echo "list=$(lerna ls --all --json 2>/dev/null | jq -r 'map(.name) | join(",")')" >> $GITHUB_OUTPUT
       - name: Run "ncu -u"
         # We special-case some @types because they need to be pinned to specific versions due to breaking changes in minor upgrades https://github.com/DefinitelyTyped/DefinitelyTyped/issues/64266
-        # We special-case aws-sdk because of breaking changes with TS interface exports in recent minor versions - https://github.com/aws/aws-sdk-js/issues/3453
         # We special-case typescript because it's not semantically versioned
         # We special-case constructs because we want to stay in control of the minimum compatible version
         # We special-case lerna because we have a patch on it that stops applying if Lerna upgrades. Remove this once https://github.com/lerna/lerna/pull/2874 releases.
@@ -58,15 +57,15 @@ jobs:
           ncu --upgrade --reject=@types/node,@types/prettier,constructs,typescript,lerna --target=minor
           # Upgrade all the packages
           lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
-          lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/prettier,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}'  --target=minor
+          lerna exec --parallel ncu -- --upgrade --reject='@types/conventional-commits-parser,@types/node,@types/prettier,constructs,typescript,aws-sdk-mock,${{ steps.list-packages.outputs.list }}'  --target=minor
           # Upgrade package.jsons in init templates
           for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
             (cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
           done
           # Upgrade dependencies at an aws-eks integ test docker image
-          cd packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject='aws-sdk,${{ steps.list-packages.outputs.list }}'
+          cd packages/@aws-cdk/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject=',${{ steps.list-packages.outputs.list }}'
 
-      # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
+      # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
       - name: Run "yarn install"
         run: yarn install
 

CHANGELOG.v2.alpha.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.66.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.65.0-alpha.0...v2.66.0-alpha.0) (2023-02-21)
+
+
+### Features
+
+* **apigatewayv2:** allow websockets routes to return response to client ([#22984](https://github.com/aws/aws-cdk/issues/22984)) ([f8fe1d2](https://github.com/aws/aws-cdk/commit/f8fe1d292feb3fc39a99687bf454a829302c4ff5))
+* **lambda-python:** add optional poetry bundling exclusion list parameter ([#23670](https://github.com/aws/aws-cdk/issues/23670)) ([53beeae](https://github.com/aws/aws-cdk/commit/53beeaed04bfe295e9f840e65f9c89db00cac692)), closes [#22585](https://github.com/aws/aws-cdk/issues/22585) [#22585](https://github.com/aws/aws-cdk/issues/22585)
+* **redshift:** optionally reboot Clusters to apply parameter changes  ([#22063](https://github.com/aws/aws-cdk/issues/22063)) ([f61d950](https://github.com/aws/aws-cdk/commit/f61d950aaeba13bd6501b7c8971a9115f4a53f08)), closes [#22009](https://github.com/aws/aws-cdk/issues/22009) [#22055](https://github.com/aws/aws-cdk/issues/22055) [#22059](https://github.com/aws/aws-cdk/issues/22059)
+
+
+### Bug Fixes
+
+* **servicecatalogappregistry:** Allow user to control stack id via stack name for Application stack ([#24171](https://github.com/aws/aws-cdk/issues/24171)) ([0c7c7e4](https://github.com/aws/aws-cdk/commit/0c7c7e4a7c34957ff7877eda5171f82c5feaba1d)), closes [#24160](https://github.com/aws/aws-cdk/issues/24160)
+
 ## [2.65.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.64.0-alpha.0...v2.65.0-alpha.0) (2023-02-15)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,26 @@
 
 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.66.0](https://github.com/aws/aws-cdk/compare/v2.65.0...v2.66.0) (2023-02-21)
+
+
+### Features
+
+* **cloudwatch:** parse all metrics statistics and support long format ([#23095](https://github.com/aws/aws-cdk/issues/23095)) ([853e3d6](https://github.com/aws/aws-cdk/commit/853e3d631ef0490b0e2d14fdcf50df9f745de3eb)), closes [#23074](https://github.com/aws/aws-cdk/issues/23074) [40aws-cdk/aws-cloudwatch/lib/metric.ts#L295-L296](https://github.com/40aws-cdk/aws-cloudwatch/lib/metric.ts/issues/L295-L296)
+* **core:** Size.bytes() ([#24136](https://github.com/aws/aws-cdk/issues/24136)) ([9b2a45a](https://github.com/aws/aws-cdk/commit/9b2a45a6757c91011f47a6b3893cdfa0f4891002)), closes [#24106](https://github.com/aws/aws-cdk/issues/24106)
+* **efs:** support file system policy ([#24196](https://github.com/aws/aws-cdk/issues/24196)) ([5e0f44b](https://github.com/aws/aws-cdk/commit/5e0f44b05232c70f35f79d27f1294f943fbeb568)), closes [#24042](https://github.com/aws/aws-cdk/issues/24042)
+* **logs:** Add support for multiple parse and filter statements in QueryString ([#24022](https://github.com/aws/aws-cdk/issues/24022)) ([75eb933](https://github.com/aws/aws-cdk/commit/75eb9330194824cdf435ae64095813191fcd6e13))
+* **stepfunctions:** removal policy for state machines ([#24105](https://github.com/aws/aws-cdk/issues/24105)) ([5f33a26](https://github.com/aws/aws-cdk/commit/5f33a26937a78a7d28f913e86c3a2d0b00746e6a))
+
+
+### Bug Fixes
+
+* **apigateway:** rest api deployment does not depend on authorizers ([#23215](https://github.com/aws/aws-cdk/issues/23215)) ([12e13c1](https://github.com/aws/aws-cdk/commit/12e13c130cac347d5d042d414086e9e5aac5e31c))
+* **cognito:** changing `installLatestAwsSdk` breaks Client Secret reference ([#23798](https://github.com/aws/aws-cdk/issues/23798)) ([844d407](https://github.com/aws/aws-cdk/commit/844d4076c142fd88095f36dbc667d85c12e20bd5)), closes [#23796](https://github.com/aws/aws-cdk/issues/23796)
+* **ecs:** validate ecs healthcheck ([#24197](https://github.com/aws/aws-cdk/issues/24197)) ([89802a9](https://github.com/aws/aws-cdk/commit/89802a95360d698921c81a152d11ab6e46b00de3))
+* **eks:** nested OCI repository names for private ECR helmchart deployments are not properly handled ([#23378](https://github.com/aws/aws-cdk/issues/23378)) ([72f2a95](https://github.com/aws/aws-cdk/commit/72f2a95e994ef1b129a48bd548303ea39a3d3c9f))
+* **lambda:** RuntimeManagementMode.FUNCTION_UPDATE has wrong value ([#24252](https://github.com/aws/aws-cdk/issues/24252)) ([fdb0cf1](https://github.com/aws/aws-cdk/commit/fdb0cf13c0b18a436c02a272626ce9f9dde9c343))
+
 ## [2.65.0](https://github.com/aws/aws-cdk/compare/v2.64.0...v2.65.0) (2023-02-15)
 
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "lerna": "3.15.0",
+  "lerna": "^4.0.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

package.json

@@ -16,18 +16,18 @@
     "postinstall": "patch-package --error-on-fail"
   },
   "devDependencies": {
-    "@types/node": "18.11.18",
+    "@types/node": "18.11.19",
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
-    "cdk-generate-synthetic-examples": "^0.1.151",
+    "cdk-generate-synthetic-examples": "^0.1.155",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.10",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.74.0",
-    "jsii-pacmak": "1.74.0",
-    "jsii-reflect": "1.74.0",
-    "jsii-rosetta": "1.74.0",
+    "jsii-diff": "1.75.0",
+    "jsii-pacmak": "1.75.0",
+    "jsii-reflect": "1.75.0",
+    "jsii-rosetta": "1.75.0",
     "lerna": "^4.0.0",
     "patch-package": "^6.5.1",
     "semver": "^6.3.0",

packages/@aws-cdk-testing/cli-integ/lib/aws.ts

@@ -1,5 +1,8 @@
 import * as AWS from 'aws-sdk';
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+require('aws-sdk/lib/maintenance_mode_message').suppress = true;
+
 export class AwsClients {
   public static async default(output: NodeJS.WritableStream) {
     const region = process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? 'us-east-1';

packages/@aws-cdk-testing/cli-integ/lib/package-sources/release-source.ts

@@ -1,9 +1,9 @@
 import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import { IPackageSourceSetup, IPackageSource } from './source';
 import { copyDirectoryContents } from '../files';
 import { shell, rimraf, addToShellPath } from '../shell';
-import { IPackageSourceSetup, IPackageSource } from './source';
 
 export class ReleasePackageSourceSetup implements IPackageSourceSetup {
   readonly name = 'release';

packages/@aws-cdk-testing/cli-integ/lib/package-sources/repo-source.ts

@@ -1,9 +1,9 @@
 import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs-extra';
+import { IPackageSourceSetup, IPackageSource } from './source';
 import { findUp } from '../files';
 import { shell, addToShellPath } from '../shell';
-import { IPackageSourceSetup, IPackageSource } from './source';
 
 export class RepoPackageSourceSetup implements IPackageSourceSetup {
   readonly name = 'repo';

packages/@aws-cdk-testing/cli-integ/lib/staging/maven.ts

@@ -1,10 +1,10 @@
 /* eslint-disable no-console */
 import * as path from 'path';
-import { writeFile } from '../files';
-import { shell } from '../shell';
 import { LoginInformation } from './codeartifact';
 import { parallelShell } from './parallel-shell';
 import { UsageDir } from './usage-dir';
+import { writeFile } from '../files';
+import { shell } from '../shell';
 
 // Do not try to JIT the Maven binary
 const NO_JIT = '-XX:+TieredCompilation -XX:TieredStopAtLevel=1';

packages/@aws-cdk-testing/cli-integ/lib/staging/nuget.ts

@@ -1,9 +1,9 @@
 /* eslint-disable no-console */
-import { writeFile } from '../files';
-import { shell } from '../shell';
 import { LoginInformation } from './codeartifact';
 import { parallelShell } from './parallel-shell';
 import { UsageDir } from './usage-dir';
+import { writeFile } from '../files';
+import { shell } from '../shell';
 
 export async function nugetLogin(login: LoginInformation, usageDir: UsageDir) {
   // NuGet.Config MUST live in the current directory or in the home directory, and there is no environment

packages/@aws-cdk-testing/cli-integ/lib/staging/pypi.ts

@@ -1,10 +1,10 @@
 /* eslint-disable no-console */
 import * as path from 'path';
-import { writeFile } from '../files';
-import { shell } from '../shell';
 import { LoginInformation } from './codeartifact';
 import { parallelShell } from './parallel-shell';
 import { UsageDir } from './usage-dir';
+import { writeFile } from '../files';
+import { shell } from '../shell';
 
 export async function pypiLogin(login: LoginInformation, usageDir: UsageDir) {
   // Write pip config file and set environment var

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

@@ -39,17 +39,18 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "jest": "^27.5.1",
-    "aws-sdk": "^2.1313.0",
+    "aws-sdk": "^2.1317.0",
     "axios": "^0.27.2",
+    "fs-extra": "^9.1.0",
+    "glob": "^7.2.3",
+    "jest": "^27.5.1",
     "jest-junit": "^14.0.1",
+    "make-runnable": "^1.4.1",
+    "npm": "^8.19.4",
+    "p-queue": "^6.6.2",
     "semver": "^7.3.8",
     "ts-mock-imports": "^1.3.8",
-    "yargs": "^17.6.2",
-    "glob": "^7.2.3",
-    "p-queue": "^6.6.2",
-    "fs-extra": "^9.1.0",
-    "npm": "^8.19.3"
+    "yargs": "^17.7.0"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",

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

@@ -0,0 +1,16 @@
+import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '../../lib';
+
+['app', 'sample-app'].forEach(template => {
+  integTest(`init go ${template}`, withTemporaryDirectory(withPackages(async (context) => {
+    context.packages.assertJsiiPackagesAvailable();
+
+    const shell = ShellHelper.fromContext(context);
+    await context.packages.makeCliAvailable();
+
+    await shell.shell(['cdk', 'init', '-l', 'go', template]);
+    await shell.shell(['go', 'mod', 'edit', '-replace', 'github.com/aws/aws-cdk-go/awscdk=$dist_root/go/awscdk']);
+    await shell.shell(['go', 'mod', 'tidy']);
+    await shell.shell(['go', 'test']);
+    await shell.shell(['cdk', 'synth']);
+  })));
+});

packages/@aws-cdk/alexa-ask/package.json

@@ -85,7 +85,8 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

packages/@aws-cdk/assert-internal/lib/assertion.ts

@@ -1,3 +1,5 @@
+/* eslint-disable import/order */
+// @TODO: These tests fail if all imports are at the top
 import { Inspector } from './inspector';
 
 export abstract class Assertion<InspectorClass extends Inspector> {

packages/@aws-cdk/assert-internal/lib/assertions/count-resources.ts

@@ -1,6 +1,6 @@
+import { isSuperObject } from './have-resource';
 import { Assertion, JestFriendlyAssertion } from '../assertion';
 import { StackInspector } from '../inspector';
-import { isSuperObject } from './have-resource';
 
 /**
  * An assertion to check whether a resource of a given type and with the given properties exists, disregarding properties

packages/@aws-cdk/assert-internal/lib/assertions/have-resource.ts

@@ -1,6 +1,6 @@
+import { anything, deepObjectLike, match, objectLike } from './have-resource-matchers';
 import { Assertion, JestFriendlyAssertion } from '../assertion';
 import { StackInspector } from '../inspector';
-import { anything, deepObjectLike, match, objectLike } from './have-resource-matchers';
 
 /**
  * Magic value to signify that a certain key should be absent from the property bag.

packages/@aws-cdk/assert-internal/test/have-resource.test.ts

@@ -1,3 +1,4 @@
+import { mkResource, mkStack } from './cloud-artifact';
 import {
   ABSENT,
   arrayWith,
@@ -9,7 +10,6 @@ import {
   anything,
   stringLike,
 } from '../lib/index';
-import { mkResource, mkStack } from './cloud-artifact';
 
 test('support resource with no properties', () => {
   const synthStack = mkStack({

packages/@aws-cdk/assert-internal/test/match-template.test.ts

@@ -1,5 +1,5 @@
-import { MatchStyle } from '../lib';
 import { mkStack } from './cloud-artifact';
+import { MatchStyle } from '../lib';
 import '../jest';
 
 describe('matchTemplate', () => {

packages/@aws-cdk/assertions/lib/private/resources.ts

@@ -1,7 +1,7 @@
-import { Match, Matcher } from '..';
 import { AbsentMatch } from './matchers/absent';
 import { formatAllMismatches, matchSection, formatSectionMatchFailure } from './section';
 import { Resource, Template } from './template';
+import { Match, Matcher } from '..';
 
 export function findResources(template: Template, type: string, props: any = {}): { [key: string]: { [key: string]: any } } {
   const section = template.Resources ?? {};

packages/@aws-cdk/assertions/lib/private/section.ts

@@ -1,6 +1,6 @@
+import { sortKeyComparator } from './sorting';
 import { Match } from '../match';
 import { Matcher, MatchResult } from '../matcher';
-import { sortKeyComparator } from './sorting';
 
 export type MatchSuccess = { match: true, matches: { [key: string]: any }, analyzed: { [key: string]: any }, analyzedCount: number };
 export type MatchFailure = { match: false, closestResults: Record<string, MatchResult>, analyzed: { [key: string]: any }, analyzedCount: number };

packages/@aws-cdk/aws-accessanalyzer/package.json

@@ -86,7 +86,8 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-amazonmq/package.json

@@ -85,7 +85,8 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/jest": "^27.5.2"
+    "@types/jest": "^27.5.2",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-amplify/package.json

@@ -88,7 +88,8 @@
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.5.2",
-    "aws-sdk": "^2.1211.0"
+    "aws-sdk": "^2.1317.0",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/aws-codebuild": "0.0.0",

packages/@aws-cdk/aws-amplifyuibuilder/package.json

@@ -89,7 +89,8 @@
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.5.2",
-    "@types/node": "18.11.18"
+    "@types/node": "18.11.19",
+    "jsii": "v4.9-next"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

packages/@aws-cdk/aws-apigateway/lib/integrations/lambda.ts

@@ -1,9 +1,9 @@
 import * as iam from '@aws-cdk/aws-iam';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { Lazy, Names, Token } from '@aws-cdk/core';
+import { AwsIntegration } from './aws';
 import { IntegrationConfig, IntegrationOptions } from '../integration';
 import { Method } from '../method';
-import { AwsIntegration } from './aws';
 
 export interface LambdaIntegrationOptions extends IntegrationOptions {
   /**

packages/@aws-cdk/aws-apigateway/lib/integrations/stepfunctions.ts

@@ -4,10 +4,10 @@ import * as iam from '@aws-cdk/aws-iam';
 import * as sfn from '@aws-cdk/aws-stepfunctions';
 import { Token } from '@aws-cdk/core';
 import { RequestContext } from '.';
+import { AwsIntegration } from './aws';
 import { IntegrationConfig, IntegrationOptions, PassthroughBehavior } from '../integration';
 import { Method } from '../method';
 import { Model } from '../model';
-import { AwsIntegration } from './aws';
 /**
  * Options when configuring Step Functions synchronous integration with Rest API
  */