From 6a63924c0b184342befd92903b8867e45b158252 Mon Sep 17 00:00:00 2001
From: Peter Woodworth <44349620+peterwoodworth@users.noreply.github.com>
Date: Mon, 28 Mar 2022 18:30:08 -0700
Subject: [PATCH 01/19] fix(docdb): DB Instance ARN uses 'docdb' as the service
 component instead of 'rds' (#19555)

Fixes #19554

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-docdb/lib/instance.ts       | 2 +-
 packages/@aws-cdk/aws-docdb/test/instance.test.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@aws-cdk/aws-docdb/lib/instance.ts b/packages/@aws-cdk/aws-docdb/lib/instance.ts
index 1a791b99a0bf5..9611235077389 100644
--- a/packages/@aws-cdk/aws-docdb/lib/instance.ts
+++ b/packages/@aws-cdk/aws-docdb/lib/instance.ts
@@ -101,7 +101,7 @@ abstract class DatabaseInstanceBase extends cdk.Resource implements IDatabaseIns
    */
   public get instanceArn(): string {
     return cdk.Stack.of(this).formatArn({
-      service: 'docdb',
+      service: 'rds',
       resource: 'db',
       arnFormat: ArnFormat.COLON_RESOURCE_NAME,
       resourceName: this.instanceIdentifier,
diff --git a/packages/@aws-cdk/aws-docdb/test/instance.test.ts b/packages/@aws-cdk/aws-docdb/test/instance.test.ts
index d7e90af3e3e90..a83525110f8f8 100644
--- a/packages/@aws-cdk/aws-docdb/test/instance.test.ts
+++ b/packages/@aws-cdk/aws-docdb/test/instance.test.ts
@@ -117,7 +117,7 @@ describe('DatabaseInstance', () => {
           [
             'arn:',
             { Ref: 'AWS::Partition' },
-            ':docdb:us-test-1:12345:db:',
+            ':rds:us-test-1:12345:db:',
             { Ref: 'InstanceC1063A87' },
           ],
         ],
@@ -160,7 +160,7 @@ describe('DatabaseInstance', () => {
           [
             'arn:',
             { Ref: 'AWS::Partition' },
-            `:docdb:us-test-1:12345:db:${instanceIdentifier}`,
+            `:rds:us-test-1:12345:db:${instanceIdentifier}`,
           ],
         ],
       },

From 64b266fde9ab2b1639b05c2d70f7ca13941af927 Mon Sep 17 00:00:00 2001
From: Peter Woodworth <44349620+peterwoodworth@users.noreply.github.com>
Date: Mon, 28 Mar 2022 19:13:08 -0700
Subject: [PATCH 02/19] docs(lambda): remove references to deprecated
 addVersion() (#19601)

fixes #19594

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-applicationautoscaling/README.md | 2 +-
 packages/@aws-cdk/aws-codedeploy/README.md             | 4 ++--
 packages/@aws-cdk/aws-codepipeline-actions/README.md   | 2 +-
 packages/@aws-cdk/aws-lambda/lib/alias.ts              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/@aws-cdk/aws-applicationautoscaling/README.md b/packages/@aws-cdk/aws-applicationautoscaling/README.md
index 0870212d274a9..9697a9d27badc 100644
--- a/packages/@aws-cdk/aws-applicationautoscaling/README.md
+++ b/packages/@aws-cdk/aws-applicationautoscaling/README.md
@@ -222,7 +222,7 @@ const handler = new lambda.Function(this, 'MyFunction', {
   reservedConcurrentExecutions: 2,
 });
 
-const fnVer = handler.addVersion('CDKLambdaVersion', undefined, 'demo alias', 10);
+const fnVer = handler.currentVersion;
 
 const target = new appscaling.ScalableTarget(this, 'ScalableTarget', {
   serviceNamespace: appscaling.ServiceNamespace.LAMBDA,
diff --git a/packages/@aws-cdk/aws-codedeploy/README.md b/packages/@aws-cdk/aws-codedeploy/README.md
index 9b6aa5cda5d8d..2608c706022ea 100644
--- a/packages/@aws-cdk/aws-codedeploy/README.md
+++ b/packages/@aws-cdk/aws-codedeploy/README.md
@@ -207,7 +207,7 @@ To create a new CodeDeploy Deployment Group that deploys to a Lambda function:
 ```ts
 declare const myApplication: codedeploy.LambdaApplication;
 declare const func: lambda.Function;
-const version = func.addVersion('1');
+const version = func.currentVersion;
 const version1Alias = new lambda.Alias(this, 'alias', {
   aliasName: 'prod',
   version,
@@ -222,7 +222,7 @@ const deploymentGroup = new codedeploy.LambdaDeploymentGroup(this, 'BlueGreenDep
 
 In order to deploy a new version of this function:
 
-1. Increment the version, e.g. `const version = func.addVersion('2')`.
+1. Reference the version with the latest changes `const version = func.currentVersion`.
 2. Re-deploy the stack (this will trigger a deployment).
 3. Monitor the CodeDeploy deployment as traffic shifts between the versions.
 
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/README.md b/packages/@aws-cdk/aws-codepipeline-actions/README.md
index 7169f72f2cddd..c616cecd2302e 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/README.md
+++ b/packages/@aws-cdk/aws-codepipeline-actions/README.md
@@ -765,7 +765,7 @@ const func = new lambda.Function(this, 'Lambda', {
   runtime: lambda.Runtime.NODEJS_12_X,
 });
 // used to make sure each CDK synthesis produces a different Version
-const version = func.addVersion('NewVersion');
+const version = func.currentVersion;
 const alias = new lambda.Alias(this, 'LambdaAlias', {
   aliasName: 'Prod',
   version,
diff --git a/packages/@aws-cdk/aws-lambda/lib/alias.ts b/packages/@aws-cdk/aws-lambda/lib/alias.ts
index 36fdbdfcc2eaf..be92b4a3dde8f 100644
--- a/packages/@aws-cdk/aws-lambda/lib/alias.ts
+++ b/packages/@aws-cdk/aws-lambda/lib/alias.ts
@@ -75,7 +75,7 @@ export interface AliasProps extends AliasOptions {
   /**
    * Function version this alias refers to
    *
-   * Use lambda.addVersion() to obtain a new lambda version to refer to.
+   * Use lambda.currentVersion to reference a version with your latest changes.
    */
   readonly version: IVersion;
 }

From a0fb04f4bcd3d2dd963f4dc047cba0dfa2c49e46 Mon Sep 17 00:00:00 2001
From: Madeline Kusters <80541297+madeline-k@users.noreply.github.com>
Date: Tue, 29 Mar 2022 01:27:22 -0700
Subject: [PATCH 03/19] chore(core): change FeatureFlags to use
 constructs.IConstruct (#19567)

This change is motivated by #18140, where we are running into trouble because the current scope is a `constructs.Construct` but `FeatureFlags.of` required a `core.construct`.

----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/core/lib/feature-flags.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@aws-cdk/core/lib/feature-flags.ts b/packages/@aws-cdk/core/lib/feature-flags.ts
index 44fd5e138bdc7..2da5397b8ec23 100644
--- a/packages/@aws-cdk/core/lib/feature-flags.ts
+++ b/packages/@aws-cdk/core/lib/feature-flags.ts
@@ -1,5 +1,5 @@
 import * as cxapi from '@aws-cdk/cx-api';
-import { IConstruct } from '../lib/construct-compat';
+import { IConstruct, Node } from 'constructs';
 
 /**
  * Features that are implemented behind a flag in order to preserve backwards
@@ -24,7 +24,7 @@ export class FeatureFlags {
    * module.
    */
   public isEnabled(featureFlag: string): boolean | undefined {
-    const context = this.construct.node.tryGetContext(featureFlag);
+    const context = Node.of(this.construct).tryGetContext(featureFlag);
     if (cxapi.FUTURE_FLAGS_EXPIRED.includes(featureFlag)) {
       if (context !== undefined) {
         throw new Error(`Unsupported feature flag '${featureFlag}'. This flag existed on CDKv1 but has been removed in CDKv2.`

From 8f9d2740d216bb04c35e0f8394e006b0e680a301 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 29 Mar 2022 11:11:52 +0200
Subject: [PATCH 04/19] chore(cx-api): remove more `instanceof`s (#19511)

Fixes #17974

Follow-up of #14468

This follows the implementation of https://github.com/aws/constructs/pull/955 to be more robust.

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../aws-ecr-assets/test/image-asset.test.ts   |  6 +---
 .../@aws-cdk/aws-s3-assets/test/asset.test.ts |  6 +---
 .../lib/artifacts/asset-manifest-artifact.ts  | 35 +++++++++++++++++++
 .../lib/api/cloudformation-deployments.ts     |  6 +---
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/packages/@aws-cdk/aws-ecr-assets/test/image-asset.test.ts b/packages/@aws-cdk/aws-ecr-assets/test/image-asset.test.ts
index d931401484ba2..7640557032510 100644
--- a/packages/@aws-cdk/aws-ecr-assets/test/image-asset.test.ts
+++ b/packages/@aws-cdk/aws-ecr-assets/test/image-asset.test.ts
@@ -452,7 +452,7 @@ testFutureBehavior('nested assemblies share assets: default synth edition', flag
 
   // Read the asset manifests to verify the file paths
   for (const stageName of ['Stage1', 'Stage2']) {
-    const manifestArtifact = assembly.getNestedAssembly(`assembly-${stageName}`).artifacts.filter(isAssetManifestArtifact)[0];
+    const manifestArtifact = assembly.getNestedAssembly(`assembly-${stageName}`).artifacts.filter(cxapi.AssetManifestArtifact.isAssetManifestArtifact)[0];
     const manifest = JSON.parse(fs.readFileSync(manifestArtifact.file, { encoding: 'utf-8' }));
 
     expect(manifest.dockerImages[DEMO_IMAGE_ASSET_HASH].source).toEqual({
@@ -464,7 +464,3 @@ testFutureBehavior('nested assemblies share assets: default synth edition', flag
 function isStackArtifact(x: any): x is cxapi.CloudFormationStackArtifact {
   return x instanceof cxapi.CloudFormationStackArtifact;
 }
-
-function isAssetManifestArtifact(x: any): x is cxapi.AssetManifestArtifact {
-  return x instanceof cxapi.AssetManifestArtifact;
-}
diff --git a/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts b/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
index f04218f95929d..23666d832f7e2 100644
--- a/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
+++ b/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
@@ -275,7 +275,7 @@ test('nested assemblies share assets: default synth edition', () => {
 
   // Read the asset manifests to verify the file paths
   for (const stageName of ['Stage1', 'Stage2']) {
-    const manifestArtifact = assembly.getNestedAssembly(`assembly-${stageName}`).artifacts.filter(isAssetManifestArtifact)[0];
+    const manifestArtifact = assembly.getNestedAssembly(`assembly-${stageName}`).artifacts.filter(cxapi.AssetManifestArtifact.isAssetManifestArtifact)[0];
     const manifest = JSON.parse(fs.readFileSync(manifestArtifact.file, { encoding: 'utf-8' }));
 
     expect(manifest.files[SAMPLE_ASSET_HASH].source).toEqual({
@@ -410,7 +410,3 @@ function mkdtempSync() {
 function isStackArtifact(x: any): x is cxapi.CloudFormationStackArtifact {
   return x instanceof cxapi.CloudFormationStackArtifact;
 }
-
-function isAssetManifestArtifact(x: any): x is cxapi.AssetManifestArtifact {
-  return x instanceof cxapi.AssetManifestArtifact;
-}
\ No newline at end of file
diff --git a/packages/@aws-cdk/cx-api/lib/artifacts/asset-manifest-artifact.ts b/packages/@aws-cdk/cx-api/lib/artifacts/asset-manifest-artifact.ts
index 3c8c102f2c5ab..10ddea69b624e 100644
--- a/packages/@aws-cdk/cx-api/lib/artifacts/asset-manifest-artifact.ts
+++ b/packages/@aws-cdk/cx-api/lib/artifacts/asset-manifest-artifact.ts
@@ -3,10 +3,33 @@ import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import { CloudArtifact } from '../cloud-artifact';
 import { CloudAssembly } from '../cloud-assembly';
 
+const ASSET_MANIFEST_ARTIFACT_SYM = Symbol.for('@aws-cdk/cx-api.AssetManifestArtifact');
+
 /**
  * Asset manifest is a description of a set of assets which need to be built and published
  */
 export class AssetManifestArtifact extends CloudArtifact {
+  /**
+   * Checks if `art` is an instance of this class.
+   *
+   * Use this method instead of `instanceof` to properly detect `AssetManifestArtifact`
+   * instances, even when the construct library is symlinked.
+   *
+   * Explanation: in JavaScript, multiple copies of the `cx-api` library on
+   * disk are seen as independent, completely different libraries. As a
+   * consequence, the class `AssetManifestArtifact` in each copy of the `cx-api` library
+   * is seen as a different class, and an instance of one class will not test as
+   * `instanceof` the other class. `npm install` will not create installations
+   * like this, but users may manually symlink construct libraries together or
+   * use a monorepo tool: in those cases, multiple copies of the `cx-api`
+   * library can be accidentally installed, and `instanceof` will behave
+   * unpredictably. It is safest to avoid using `instanceof`, and using
+   * this type-testing method instead.
+   */
+  public static isAssetManifestArtifact(art: any): art is AssetManifestArtifact {
+    return art && typeof art === 'object' && art[ASSET_MANIFEST_ARTIFACT_SYM];
+  }
+
   /**
    * The file name of the asset manifest
    */
@@ -36,3 +59,15 @@ export class AssetManifestArtifact extends CloudArtifact {
     this.bootstrapStackVersionSsmParameter = properties.bootstrapStackVersionSsmParameter;
   }
 }
+
+/**
+ * Mark all instances of 'AssetManifestArtifact'
+ *
+ * Why not put this in the constructor? Because this is a class property,
+ * not an instance property. It applies to all instances of the class.
+ */
+Object.defineProperty(AssetManifestArtifact.prototype, ASSET_MANIFEST_ARTIFACT_SYM, {
+  value: true,
+  enumerable: false,
+  writable: false,
+});
diff --git a/packages/aws-cdk/lib/api/cloudformation-deployments.ts b/packages/aws-cdk/lib/api/cloudformation-deployments.ts
index 60b883f13fb40..ebf40bbb7442b 100644
--- a/packages/aws-cdk/lib/api/cloudformation-deployments.ts
+++ b/packages/aws-cdk/lib/api/cloudformation-deployments.ts
@@ -405,7 +405,7 @@ export class CloudFormationDeployments {
    */
   private async publishStackAssets(stack: cxapi.CloudFormationStackArtifact, toolkitInfo: ToolkitInfo) {
     const stackEnv = await this.sdkProvider.resolveEnvironment(stack.environment);
-    const assetArtifacts = stack.dependencies.filter(isAssetManifestArtifact);
+    const assetArtifacts = stack.dependencies.filter(cxapi.AssetManifestArtifact.isAssetManifestArtifact);
 
     for (const assetArtifact of assetArtifacts) {
       await this.validateBootstrapStackVersion(
@@ -437,7 +437,3 @@ export class CloudFormationDeployments {
     }
   }
 }
-
-function isAssetManifestArtifact(art: cxapi.CloudArtifact): art is cxapi.AssetManifestArtifact {
-  return art instanceof cxapi.AssetManifestArtifact;
-}

From 94f9d27e626bced5fc68a6ebbd653fea21c6e21e Mon Sep 17 00:00:00 2001
From: Dzhuneyt <1754428+Dzhuneyt@users.noreply.github.com>
Date: Tue, 29 Mar 2022 15:33:47 +0300
Subject: [PATCH 05/19] feat(aws-ec2): Enable/disable EC2 "Detailed Monitoring"
 (#19437)

Closes https://github.com/aws/aws-cdk/issues/19346

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-ec2/README.md           | 16 ++++
 packages/@aws-cdk/aws-ec2/lib/instance.ts     | 10 +++
 .../@aws-cdk/aws-ec2/test/instance.test.ts    | 83 +++++++++++++++++--
 .../aws-ec2/test/integ.instance.expected.json | 31 +++----
 .../@aws-cdk/aws-ec2/test/integ.instance.ts   |  1 +
 .../@aws-cdk/aws-ec2/test/userdata.test.ts    |  2 +-
 packages/aws-cdk-lib/package.json             |  1 +
 7 files changed, 123 insertions(+), 21 deletions(-)

diff --git a/packages/@aws-cdk/aws-ec2/README.md b/packages/@aws-cdk/aws-ec2/README.md
index af8c5ff64594e..20b9dab23c434 100644
--- a/packages/@aws-cdk/aws-ec2/README.md
+++ b/packages/@aws-cdk/aws-ec2/README.md
@@ -1475,3 +1475,19 @@ const template = new ec2.LaunchTemplate(this, 'LaunchTemplate', {
   }),
 });
 ```
+
+## Detailed Monitoring
+
+The following demonstrates how to enable [Detailed Monitoring](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch-new.html) for an EC2 instance. Keep in mind that Detailed Monitoring results in [additional charges](http://aws.amazon.com/cloudwatch/pricing/).
+
+```ts
+declare const vpc: ec2.Vpc;
+declare const instanceType: ec2.InstanceType;
+
+new ec2.Instance(this, 'Instance1', {
+  vpc,
+  instanceType,
+  machineImage: new ec2.AmazonLinuxImage(),
+  detailedMonitoring: true,
+});
+```
diff --git a/packages/@aws-cdk/aws-ec2/lib/instance.ts b/packages/@aws-cdk/aws-ec2/lib/instance.ts
index a12c3a45d6108..213b1ef0e4629 100644
--- a/packages/@aws-cdk/aws-ec2/lib/instance.ts
+++ b/packages/@aws-cdk/aws-ec2/lib/instance.ts
@@ -245,6 +245,15 @@ export interface InstanceProps {
    * @default - false
    */
   readonly requireImdsv2?: boolean;
+
+  /**
+   * Whether "Detailed Monitoring" is enabled for this instance
+   * Keep in mind that Detailed Monitoring results in extra charges
+   *
+   * @see http://aws.amazon.com/cloudwatch/pricing/
+   * @default - false
+   */
+  readonly detailedMonitoring?: boolean;
 }
 
 /**
@@ -381,6 +390,7 @@ export class Instance extends Resource implements IInstance {
       blockDeviceMappings: props.blockDevices !== undefined ? instanceBlockDeviceMappings(this, props.blockDevices) : undefined,
       privateIpAddress: props.privateIpAddress,
       propagateTagsToVolumeOnCreation: props.propagateTagsToVolumeOnCreation,
+      monitoring: props.detailedMonitoring,
     });
     this.instance.node.addDependency(this.role);
 
diff --git a/packages/@aws-cdk/aws-ec2/test/instance.test.ts b/packages/@aws-cdk/aws-ec2/test/instance.test.ts
index 5f4011aa12f3e..6fd215af31bff 100644
--- a/packages/@aws-cdk/aws-ec2/test/instance.test.ts
+++ b/packages/@aws-cdk/aws-ec2/test/instance.test.ts
@@ -5,8 +5,19 @@ import { Asset } from '@aws-cdk/aws-s3-assets';
 import { StringParameter } from '@aws-cdk/aws-ssm';
 import { Stack } from '@aws-cdk/core';
 import {
-  AmazonLinuxImage, BlockDeviceVolume, CloudFormationInit,
-  EbsDeviceVolumeType, InitCommand, Instance, InstanceArchitecture, InstanceClass, InstanceSize, InstanceType, LaunchTemplate, UserData, Vpc,
+  AmazonLinuxImage,
+  BlockDeviceVolume,
+  CloudFormationInit,
+  EbsDeviceVolumeType,
+  InitCommand,
+  Instance,
+  InstanceArchitecture,
+  InstanceClass,
+  InstanceSize,
+  InstanceType,
+  LaunchTemplate,
+  UserData,
+  Vpc,
 } from '../lib';
 
 let stack: Stack;
@@ -144,7 +155,7 @@ describe('instance', () => {
 
     for (const instanceClass of sampleInstanceClassKeys) {
       // WHEN
-      const key = instanceClass.key as keyof(typeof InstanceClass);
+      const key = instanceClass.key as keyof (typeof InstanceClass);
       const instanceType = InstanceClass[key];
 
       // THEN
@@ -432,6 +443,62 @@ describe('instance', () => {
       },
     });
   });
+
+  describe('Detailed Monitoring', () => {
+    test('instance with Detailed Monitoring enabled', () => {
+      // WHEN
+      new Instance(stack, 'Instance', {
+        vpc,
+        machineImage: new AmazonLinuxImage(),
+        instanceType: new InstanceType('t2.micro'),
+        detailedMonitoring: true,
+      });
+
+      // Force stack synth so the Instance is applied
+      Template.fromStack(stack);
+
+      // THEN
+      Template.fromStack(stack).hasResourceProperties('AWS::EC2::Instance', {
+        Monitoring: true,
+      });
+    });
+
+    test('instance with Detailed Monitoring disabled', () => {
+      // WHEN
+      new Instance(stack, 'Instance', {
+        vpc,
+        machineImage: new AmazonLinuxImage(),
+        instanceType: new InstanceType('t2.micro'),
+        detailedMonitoring: false,
+      });
+
+      // Force stack synth so the Instance is applied
+      Template.fromStack(stack);
+
+      // THEN
+      Template.fromStack(stack).hasResourceProperties('AWS::EC2::Instance', {
+        Monitoring: false,
+      });
+    });
+
+    test('instance with Detailed Monitoring unset falls back to disabled', () => {
+      // WHEN
+      new Instance(stack, 'Instance', {
+        vpc,
+        machineImage: new AmazonLinuxImage(),
+        instanceType: new InstanceType('t2.micro'),
+      });
+
+      // Force stack synth so the Instance is applied
+      Template.fromStack(stack);
+
+      // THEN
+      Template.fromStack(stack).hasResourceProperties('AWS::EC2::Instance', {
+        Monitoring: Match.absent(),
+      });
+    });
+  });
+
 });
 
 test('add CloudFormation Init to instance', () => {
@@ -519,8 +586,14 @@ test('cause replacement from s3 asset in userdata', () => {
   const hash = 'f88eace39faf39d7';
   Template.fromStack(stack).templateMatches(Match.objectLike({
     Resources: Match.objectLike({
-      [`InstanceOne5B821005${hash}`]: Match.objectLike({ Type: 'AWS::EC2::Instance', Properties: Match.anyValue() }),
-      [`InstanceTwoDC29A7A7${hash}`]: Match.objectLike({ Type: 'AWS::EC2::Instance', Properties: Match.anyValue() }),
+      [`InstanceOne5B821005${hash}`]: Match.objectLike({
+        Type: 'AWS::EC2::Instance',
+        Properties: Match.anyValue(),
+      }),
+      [`InstanceTwoDC29A7A7${hash}`]: Match.objectLike({
+        Type: 'AWS::EC2::Instance',
+        Properties: Match.anyValue(),
+      }),
     }),
   }));
 });
diff --git a/packages/@aws-cdk/aws-ec2/test/integ.instance.expected.json b/packages/@aws-cdk/aws-ec2/test/integ.instance.expected.json
index 957af9c0f453e..d30b3a47c711e 100644
--- a/packages/@aws-cdk/aws-ec2/test/integ.instance.expected.json
+++ b/packages/@aws-cdk/aws-ec2/test/integ.instance.expected.json
@@ -18,11 +18,11 @@
     "VPCPublicSubnet1SubnetB4246D30": {
       "Type": "AWS::EC2::Subnet",
       "Properties": {
-        "CidrBlock": "10.0.0.0/19",
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         },
         "AvailabilityZone": "test-region-1a",
+        "CidrBlock": "10.0.0.0/19",
         "MapPublicIpOnLaunch": true,
         "Tags": [
           {
@@ -95,15 +95,15 @@
     "VPCPublicSubnet1NATGatewayE0556630": {
       "Type": "AWS::EC2::NatGateway",
       "Properties": {
+        "SubnetId": {
+          "Ref": "VPCPublicSubnet1SubnetB4246D30"
+        },
         "AllocationId": {
           "Fn::GetAtt": [
             "VPCPublicSubnet1EIP6AD938E8",
             "AllocationId"
           ]
         },
-        "SubnetId": {
-          "Ref": "VPCPublicSubnet1SubnetB4246D30"
-        },
         "Tags": [
           {
             "Key": "Name",
@@ -115,11 +115,11 @@
     "VPCPublicSubnet2Subnet74179F39": {
       "Type": "AWS::EC2::Subnet",
       "Properties": {
-        "CidrBlock": "10.0.32.0/19",
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         },
         "AvailabilityZone": "test-region-1b",
+        "CidrBlock": "10.0.32.0/19",
         "MapPublicIpOnLaunch": true,
         "Tags": [
           {
@@ -192,15 +192,15 @@
     "VPCPublicSubnet2NATGateway3C070193": {
       "Type": "AWS::EC2::NatGateway",
       "Properties": {
+        "SubnetId": {
+          "Ref": "VPCPublicSubnet2Subnet74179F39"
+        },
         "AllocationId": {
           "Fn::GetAtt": [
             "VPCPublicSubnet2EIP4947BC00",
             "AllocationId"
           ]
         },
-        "SubnetId": {
-          "Ref": "VPCPublicSubnet2Subnet74179F39"
-        },
         "Tags": [
           {
             "Key": "Name",
@@ -212,11 +212,11 @@
     "VPCPublicSubnet3Subnet631C5E25": {
       "Type": "AWS::EC2::Subnet",
       "Properties": {
-        "CidrBlock": "10.0.64.0/19",
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         },
         "AvailabilityZone": "test-region-1c",
+        "CidrBlock": "10.0.64.0/19",
         "MapPublicIpOnLaunch": true,
         "Tags": [
           {
@@ -289,15 +289,15 @@
     "VPCPublicSubnet3NATGatewayD3048F5C": {
       "Type": "AWS::EC2::NatGateway",
       "Properties": {
+        "SubnetId": {
+          "Ref": "VPCPublicSubnet3Subnet631C5E25"
+        },
         "AllocationId": {
           "Fn::GetAtt": [
             "VPCPublicSubnet3EIPAD4BC883",
             "AllocationId"
           ]
         },
-        "SubnetId": {
-          "Ref": "VPCPublicSubnet3Subnet631C5E25"
-        },
         "Tags": [
           {
             "Key": "Name",
@@ -309,11 +309,11 @@
     "VPCPrivateSubnet1Subnet8BCA10E0": {
       "Type": "AWS::EC2::Subnet",
       "Properties": {
-        "CidrBlock": "10.0.96.0/19",
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         },
         "AvailabilityZone": "test-region-1a",
+        "CidrBlock": "10.0.96.0/19",
         "MapPublicIpOnLaunch": false,
         "Tags": [
           {
@@ -371,11 +371,11 @@
     "VPCPrivateSubnet2SubnetCFCDAA7A": {
       "Type": "AWS::EC2::Subnet",
       "Properties": {
-        "CidrBlock": "10.0.128.0/19",
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         },
         "AvailabilityZone": "test-region-1b",
+        "CidrBlock": "10.0.128.0/19",
         "MapPublicIpOnLaunch": false,
         "Tags": [
           {
@@ -433,11 +433,11 @@
     "VPCPrivateSubnet3Subnet3EDCD457": {
       "Type": "AWS::EC2::Subnet",
       "Properties": {
-        "CidrBlock": "10.0.160.0/19",
         "VpcId": {
           "Ref": "VPCB9E5F0B4"
         },
         "AvailabilityZone": "test-region-1c",
+        "CidrBlock": "10.0.160.0/19",
         "MapPublicIpOnLaunch": false,
         "Tags": [
           {
@@ -620,6 +620,7 @@
           "Ref": "SsmParameterValueawsserviceamiamazonlinuxlatestamzn2amihvmx8664gp2C96584B6F00A464EAD1953AFF4B05118Parameter"
         },
         "InstanceType": "t3.nano",
+        "Monitoring": true,
         "SecurityGroupIds": [
           {
             "Fn::GetAtt": [
diff --git a/packages/@aws-cdk/aws-ec2/test/integ.instance.ts b/packages/@aws-cdk/aws-ec2/test/integ.instance.ts
index bae57818521cc..1b120c511eaaa 100644
--- a/packages/@aws-cdk/aws-ec2/test/integ.instance.ts
+++ b/packages/@aws-cdk/aws-ec2/test/integ.instance.ts
@@ -15,6 +15,7 @@ class TestStack extends cdk.Stack {
       vpc,
       instanceType: ec2.InstanceType.of(ec2.InstanceClass.T3, ec2.InstanceSize.NANO),
       machineImage: new ec2.AmazonLinuxImage({ generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2 }),
+      detailedMonitoring: true,
     });
 
     instance.addToRolePolicy(new PolicyStatement({
diff --git a/packages/@aws-cdk/aws-ec2/test/userdata.test.ts b/packages/@aws-cdk/aws-ec2/test/userdata.test.ts
index c385ce83a7254..fc877cbb2c7c9 100644
--- a/packages/@aws-cdk/aws-ec2/test/userdata.test.ts
+++ b/packages/@aws-cdk/aws-ec2/test/userdata.test.ts
@@ -1,5 +1,5 @@
-import { Bucket } from '@aws-cdk/aws-s3';
 import { Template, Match } from '@aws-cdk/assertions';
+import { Bucket } from '@aws-cdk/aws-s3';
 import { Aws, Stack, CfnResource } from '@aws-cdk/core';
 import * as ec2 from '../lib';
 
diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
index 82233d7412b63..632d8357b9976 100644
--- a/packages/aws-cdk-lib/package.json
+++ b/packages/aws-cdk-lib/package.json
@@ -414,6 +414,7 @@
     "./aws-autoscalingplans": "./aws-autoscalingplans/index.js",
     "./aws-backup": "./aws-backup/index.js",
     "./aws-batch": "./aws-batch/index.js",
+    "./aws-billingconductor": "./aws-billingconductor/index.js",
     "./aws-budgets": "./aws-budgets/index.js",
     "./aws-cassandra": "./aws-cassandra/index.js",
     "./aws-ce": "./aws-ce/index.js",

From 97cc8e29e155b222d553b1fe955a0302036feed5 Mon Sep 17 00:00:00 2001
From: Rico Huijbers <rix0rrr@gmail.com>
Date: Tue, 29 Mar 2022 15:45:26 +0200
Subject: [PATCH 06/19] fix(aws-cdk): include nested stacks when building
 changesets (#19494)

This is a workaround for #5722 - users can do `cdk deploy --no-execute`
and then view the nested changesets as a way to get a full diff of
changes.

This PR is a re-roll of #17396. That PR broke an integration test in the CLI,
which this version fixes.

Closes #19224.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/aws-cdk/lib/api/deploy-stack.ts         |  1 +
 packages/aws-cdk/test/api/deploy-stack.test.ts   | 12 ++++++++++++
 packages/aws-cdk/test/integ/cli/cli.integtest.ts |  9 ++++++---
 packages/aws-cdk/test/integ/helpers/cdk.ts       |  6 ++----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/aws-cdk/lib/api/deploy-stack.ts b/packages/aws-cdk/lib/api/deploy-stack.ts
index 76b9386cc9550..d8f8a390677bf 100644
--- a/packages/aws-cdk/lib/api/deploy-stack.ts
+++ b/packages/aws-cdk/lib/api/deploy-stack.ts
@@ -299,6 +299,7 @@ async function prepareAndExecuteChangeSet(
     StackName: deployName,
     ChangeSetName: changeSetName,
     ChangeSetType: update ? 'UPDATE' : 'CREATE',
+    IncludeNestedStacks: true,
     Description: `CDK Changeset for execution ${executionId}`,
     TemplateBody: bodyParameter.TemplateBody,
     TemplateURL: bodyParameter.TemplateURL,
diff --git a/packages/aws-cdk/test/api/deploy-stack.test.ts b/packages/aws-cdk/test/api/deploy-stack.test.ts
index 2b199ea225b87..d8eb55bf77eaa 100644
--- a/packages/aws-cdk/test/api/deploy-stack.test.ts
+++ b/packages/aws-cdk/test/api/deploy-stack.test.ts
@@ -164,6 +164,18 @@ test('correctly passes CFN parameters, ignoring ones with empty values', async (
   }));
 });
 
+test('correctly passes IncludeNestedStacks', async () => {
+  // WHEN
+  await deployStack({
+    ...standardDeployStackArguments(),
+  });
+
+  // THEN
+  expect(cfnMocks.createChangeSet).toHaveBeenCalledWith(expect.objectContaining({
+    IncludeNestedStacks: true,
+  }));
+});
+
 test('reuse previous parameters if requested', async () => {
   // GIVEN
   givenStackExists({
diff --git a/packages/aws-cdk/test/integ/cli/cli.integtest.ts b/packages/aws-cdk/test/integ/cli/cli.integtest.ts
index 7f65950550cb4..627dc150c36bf 100644
--- a/packages/aws-cdk/test/integ/cli/cli.integtest.ts
+++ b/packages/aws-cdk/test/integ/cli/cli.integtest.ts
@@ -638,10 +638,13 @@ integTest('fast deploy', withDefaultFixture(async (fixture) => {
   const changeSet2 = await getLatestChangeSet();
   expect(changeSet2.ChangeSetId).toEqual(changeSet1.ChangeSetId);
 
-  // Deploy the stack again with --force, now we should create a changeset
-  await fixture.cdkDeploy('with-nested-stack', { options: ['--force'] });
+  // Deploy the stack again with --force. This creates a changeset which will be
+  // empty (since CFN now tracks changes into nested stacks as well), so we delete
+  // it again because it couldn't be executed anyway.
+  const output = await fixture.cdkDeploy('with-nested-stack', { options: ['--force'] });
   const changeSet3 = await getLatestChangeSet();
-  expect(changeSet3.ChangeSetId).not.toEqual(changeSet2.ChangeSetId);
+  expect(output).toContain('No changes are to be performed on');
+  expect(changeSet3.ChangeSetId).toEqual(changeSet2.ChangeSetId);
 
   // Deploy the stack again with tags, expected to create a new changeset
   // even though the resources didn't change.
diff --git a/packages/aws-cdk/test/integ/helpers/cdk.ts b/packages/aws-cdk/test/integ/helpers/cdk.ts
index 75787ab7b747c..62a6abd08afce 100644
--- a/packages/aws-cdk/test/integ/helpers/cdk.ts
+++ b/packages/aws-cdk/test/integ/helpers/cdk.ts
@@ -720,11 +720,9 @@ export async function installNpmPackages(fixture: TestFixture, packages: Record<
 const installNpm7 = memoize0(async (): Promise<string> => {
   const installDir = path.join(os.tmpdir(), 'cdk-integ-npm7');
   await shell(['rm', '-rf', installDir]);
-  await shell(['mkdir', '-p', installDir]);
+  await shell(['mkdir', '-p', `${installDir}/node_modules`]);
 
-  await shell(['npm', 'install',
-    '--prefix', installDir,
-    'npm@7']);
+  await shell(['npm', 'install', 'npm@7'], { cwd: installDir });
 
   return path.join(installDir, 'node_modules', '.bin', 'npm');
 });

From e576e53492148576005aa513511d78c471e716bf Mon Sep 17 00:00:00 2001
From: T31M <4603377+T31M@users.noreply.github.com>
Date: Tue, 29 Mar 2022 18:44:29 +0200
Subject: [PATCH 07/19] chore(rds): add PostgreSQL 14.2, 13.6, 12.10, 11.15,
 and 10.20 versions (#19500)

----

### Add new PostgreSQL Minor Versions

From Announcement: https://aws.amazon.com/about-aws/whats-new/2022/03/amazon-rds-postgresql-supports-postgresql-minor-versions/

> [Amazon Relational Database Service (Amazon RDS) for PostgreSQL](https://aws.amazon.com/rds/postgresql/) now supports PostgreSQL minor versions 14.2, 13.6, 12.10, 11.15, and 10.20. We recommend that you upgrade to the latest minor versions to fix known security vulnerabilities in prior versions of PostgreSQL, and to benefit from the numerous bug fixes, performance improvements, and new functionality added by the PostgreSQL community

List an example of the new version (here: 12.10) via cli:
`aws rds describe-db-engine-versions --engine postgres --region eu-west-1 --engine-version 12.10`

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-rds/lib/instance-engine.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/@aws-cdk/aws-rds/lib/instance-engine.ts b/packages/@aws-cdk/aws-rds/lib/instance-engine.ts
index 01f2f62d7a4da..53524c94c462c 100644
--- a/packages/@aws-cdk/aws-rds/lib/instance-engine.ts
+++ b/packages/@aws-cdk/aws-rds/lib/instance-engine.ts
@@ -841,6 +841,8 @@ export class PostgresEngineVersion {
   public static readonly VER_10_18 = PostgresEngineVersion.of('10.18', '10', { s3Import: true, s3Export: true });
   /** Version "10.19". */
   public static readonly VER_10_19 = PostgresEngineVersion.of('10.19', '10', { s3Import: true, s3Export: true });
+  /** Version "10.20". */
+  public static readonly VER_10_20 = PostgresEngineVersion.of('10.20', '10', { s3Import: true, s3Export: true });
 
   /** Version "11" (only a major version, without a specific minor version). */
   public static readonly VER_11 = PostgresEngineVersion.of('11', '11', { s3Import: true });
@@ -870,6 +872,8 @@ export class PostgresEngineVersion {
   public static readonly VER_11_13 = PostgresEngineVersion.of('11.13', '11', { s3Import: true, s3Export: true });
   /** Version "11.14". */
   public static readonly VER_11_14 = PostgresEngineVersion.of('11.14', '11', { s3Import: true, s3Export: true });
+  /** Version "11.15". */
+  public static readonly VER_11_15 = PostgresEngineVersion.of('11.15', '11', { s3Import: true, s3Export: true });
 
   /** Version "12" (only a major version, without a specific minor version). */
   public static readonly VER_12 = PostgresEngineVersion.of('12', '12', { s3Import: true });
@@ -889,6 +893,8 @@ export class PostgresEngineVersion {
   public static readonly VER_12_8 = PostgresEngineVersion.of('12.8', '12', { s3Import: true, s3Export: true });
   /** Version "12.9". */
   public static readonly VER_12_9 = PostgresEngineVersion.of('12.9', '12', { s3Import: true, s3Export: true });
+  /** Version "12.10". */
+  public static readonly VER_12_10 = PostgresEngineVersion.of('12.10', '12', { s3Import: true, s3Export: true });
 
   /** Version "13" (only a major version, without a specific minor version). */
   public static readonly VER_13 = PostgresEngineVersion.of('13', '13', { s3Import: true, s3Export: true });
@@ -902,11 +908,15 @@ export class PostgresEngineVersion {
   public static readonly VER_13_4 = PostgresEngineVersion.of('13.4', '13', { s3Import: true, s3Export: true });
   /** Version "13.5". */
   public static readonly VER_13_5 = PostgresEngineVersion.of('13.5', '13', { s3Import: true, s3Export: true });
+  /** Version "13.6". */
+  public static readonly VER_13_6 = PostgresEngineVersion.of('13.6', '13', { s3Import: true, s3Export: true });
 
   /** Version "14" (only a major version, without a specific minor version). */
   public static readonly VER_14 = PostgresEngineVersion.of('14', '14', { s3Import: true, s3Export: true });
   /** Version "14.1". */
   public static readonly VER_14_1 = PostgresEngineVersion.of('14.1', '14', { s3Import: true, s3Export: true });
+  /** Version "14.2". */
+  public static readonly VER_14_2 = PostgresEngineVersion.of('14.2', '14', { s3Import: true, s3Export: true });
 
   /**
    * Create a new PostgresEngineVersion with an arbitrary version.

From 9b4a22e2fc1c4ab20a40e2dcb19f061aaec7d3ce Mon Sep 17 00:00:00 2001
From: Emilis Panovas <disordered@users.noreply.github.com>
Date: Tue, 29 Mar 2022 19:56:40 +0200
Subject: [PATCH 08/19] chore(rds): add MySQL 5.7.35, 5.7.36, 5.7.37, 8.0.27,
 8.0.28 versions (#19613)

Supported versions taken from [documentation](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_MySQL.html#MySQL.Concepts.VersionMgmt)

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-rds/lib/instance-engine.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/@aws-cdk/aws-rds/lib/instance-engine.ts b/packages/@aws-cdk/aws-rds/lib/instance-engine.ts
index 53524c94c462c..fd84f6fd17444 100644
--- a/packages/@aws-cdk/aws-rds/lib/instance-engine.ts
+++ b/packages/@aws-cdk/aws-rds/lib/instance-engine.ts
@@ -492,6 +492,12 @@ export class MysqlEngineVersion {
   public static readonly VER_5_7_33 = MysqlEngineVersion.of('5.7.33', '5.7');
   /** Version "5.7.34". */
   public static readonly VER_5_7_34 = MysqlEngineVersion.of('5.7.34', '5.7');
+  /** Version "5.7.35". */
+  public static readonly VER_5_7_35 = MysqlEngineVersion.of('5.7.35', '5.7');
+  /** Version "5.7.36". */
+  public static readonly VER_5_7_36 = MysqlEngineVersion.of('5.7.36', '5.7');
+  /** Version "5.7.37". */
+  public static readonly VER_5_7_37 = MysqlEngineVersion.of('5.7.37', '5.7');
 
   /** Version "8.0" (only a major version, without a specific minor version). */
   public static readonly VER_8_0 = MysqlEngineVersion.of('8.0', '8.0');
@@ -517,6 +523,10 @@ export class MysqlEngineVersion {
   public static readonly VER_8_0_25 = MysqlEngineVersion.of('8.0.25', '8.0');
   /** Version "8.0.26". */
   public static readonly VER_8_0_26 = MysqlEngineVersion.of('8.0.26', '8.0');
+  /** Version "8.0.27". */
+  public static readonly VER_8_0_27 = MysqlEngineVersion.of('8.0.27', '8.0');
+  /** Version "8.0.28". */
+  public static readonly VER_8_0_28 = MysqlEngineVersion.of('8.0.28', '8.0');
 
   /**
    * Create a new MysqlEngineVersion with an arbitrary version.

From bbc26287244d65fa41de102e6f0c6677b9de9d0c Mon Sep 17 00:00:00 2001
From: Madeline Kusters <80541297+madeline-k@users.noreply.github.com>
Date: Tue, 29 Mar 2022 15:07:13 -0700
Subject: [PATCH 09/19] =?UTF-8?q?chore(aws-cdk):=20Revert=20"fix(aws-cdk):?=
 =?UTF-8?q?=20include=20nested=20stacks=20when=20building=20changesets=20?=
 =?UTF-8?q?=E2=80=A6=20(#19618)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…(#19494)"

This reverts commit 97cc8e29e155b222d553b1fe955a0302036feed5.

Reverting this commit since it introduced a regression. Or, it is not a regression but the regression runs of the CLI integ tests think it is. The same test fails in the run-against-latest-release and the run-against-latest-code regression test suites: https://github.com/aws/aws-cdk/blob/master/packages/aws-cdk/test/integ/cli/cli.integtest.ts#L629.

Test fails with:
```
    expect(received).not.toEqual(expected) // deep equality

    Expected: not "arn:aws:cloudformation:ap-southeast-2:416588550161:changeSet/cdk-deploy-change-set/c8c68622-fc38-4199-81b2-b74206380152"
      at cli.integtest.ts:644:38
          at runMicrotasks (<anonymous>)
      at ../helpers/cdk.ts:130:7
      at ResourcePool.using (../helpers/resource-pool.ts:44:14)
      at ../helpers/test-helpers.ts:38:14
```
----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/aws-cdk/lib/api/deploy-stack.ts         |  1 -
 packages/aws-cdk/test/api/deploy-stack.test.ts   | 12 ------------
 packages/aws-cdk/test/integ/cli/cli.integtest.ts |  9 +++------
 packages/aws-cdk/test/integ/helpers/cdk.ts       |  6 ++++--
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/packages/aws-cdk/lib/api/deploy-stack.ts b/packages/aws-cdk/lib/api/deploy-stack.ts
index d8f8a390677bf..76b9386cc9550 100644
--- a/packages/aws-cdk/lib/api/deploy-stack.ts
+++ b/packages/aws-cdk/lib/api/deploy-stack.ts
@@ -299,7 +299,6 @@ async function prepareAndExecuteChangeSet(
     StackName: deployName,
     ChangeSetName: changeSetName,
     ChangeSetType: update ? 'UPDATE' : 'CREATE',
-    IncludeNestedStacks: true,
     Description: `CDK Changeset for execution ${executionId}`,
     TemplateBody: bodyParameter.TemplateBody,
     TemplateURL: bodyParameter.TemplateURL,
diff --git a/packages/aws-cdk/test/api/deploy-stack.test.ts b/packages/aws-cdk/test/api/deploy-stack.test.ts
index d8eb55bf77eaa..2b199ea225b87 100644
--- a/packages/aws-cdk/test/api/deploy-stack.test.ts
+++ b/packages/aws-cdk/test/api/deploy-stack.test.ts
@@ -164,18 +164,6 @@ test('correctly passes CFN parameters, ignoring ones with empty values', async (
   }));
 });
 
-test('correctly passes IncludeNestedStacks', async () => {
-  // WHEN
-  await deployStack({
-    ...standardDeployStackArguments(),
-  });
-
-  // THEN
-  expect(cfnMocks.createChangeSet).toHaveBeenCalledWith(expect.objectContaining({
-    IncludeNestedStacks: true,
-  }));
-});
-
 test('reuse previous parameters if requested', async () => {
   // GIVEN
   givenStackExists({
diff --git a/packages/aws-cdk/test/integ/cli/cli.integtest.ts b/packages/aws-cdk/test/integ/cli/cli.integtest.ts
index 627dc150c36bf..7f65950550cb4 100644
--- a/packages/aws-cdk/test/integ/cli/cli.integtest.ts
+++ b/packages/aws-cdk/test/integ/cli/cli.integtest.ts
@@ -638,13 +638,10 @@ integTest('fast deploy', withDefaultFixture(async (fixture) => {
   const changeSet2 = await getLatestChangeSet();
   expect(changeSet2.ChangeSetId).toEqual(changeSet1.ChangeSetId);
 
-  // Deploy the stack again with --force. This creates a changeset which will be
-  // empty (since CFN now tracks changes into nested stacks as well), so we delete
-  // it again because it couldn't be executed anyway.
-  const output = await fixture.cdkDeploy('with-nested-stack', { options: ['--force'] });
+  // Deploy the stack again with --force, now we should create a changeset
+  await fixture.cdkDeploy('with-nested-stack', { options: ['--force'] });
   const changeSet3 = await getLatestChangeSet();
-  expect(output).toContain('No changes are to be performed on');
-  expect(changeSet3.ChangeSetId).toEqual(changeSet2.ChangeSetId);
+  expect(changeSet3.ChangeSetId).not.toEqual(changeSet2.ChangeSetId);
 
   // Deploy the stack again with tags, expected to create a new changeset
   // even though the resources didn't change.
diff --git a/packages/aws-cdk/test/integ/helpers/cdk.ts b/packages/aws-cdk/test/integ/helpers/cdk.ts
index 62a6abd08afce..75787ab7b747c 100644
--- a/packages/aws-cdk/test/integ/helpers/cdk.ts
+++ b/packages/aws-cdk/test/integ/helpers/cdk.ts
@@ -720,9 +720,11 @@ export async function installNpmPackages(fixture: TestFixture, packages: Record<
 const installNpm7 = memoize0(async (): Promise<string> => {
   const installDir = path.join(os.tmpdir(), 'cdk-integ-npm7');
   await shell(['rm', '-rf', installDir]);
-  await shell(['mkdir', '-p', `${installDir}/node_modules`]);
+  await shell(['mkdir', '-p', installDir]);
 
-  await shell(['npm', 'install', 'npm@7'], { cwd: installDir });
+  await shell(['npm', 'install',
+    '--prefix', installDir,
+    'npm@7']);
 
   return path.join(installDir, 'node_modules', '.bin', 'npm');
 });

From 046af4e7d6d72c5187e2fe23a0ba5fd242f08d17 Mon Sep 17 00:00:00 2001
From: AWS CDK Automation
 <43080478+aws-cdk-automation@users.noreply.github.com>
Date: Wed, 30 Mar 2022 05:44:59 -0400
Subject: [PATCH 10/19] docs(cfnspec): update CloudFormation documentation
 (#19624)

---
 .../spec-source/cfn-docs/cfn-docs.json        | 335 ++++++++++++------
 1 file changed, 235 insertions(+), 100 deletions(-)

diff --git a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
index 20a91a1f2960f..51903ee940094 100644
--- a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
+++ b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
@@ -9507,7 +9507,7 @@
       "description": "The AWS::CustomerProfiles::Integration resource specifies an Amazon Connect Customer Profiles Integration.",
       "properties": {
         "DomainName": "The unique name of the domain.",
-        "FlowDefinition": "",
+        "FlowDefinition": "The configuration that controls how Customer Profiles retrieves data from the source.",
         "ObjectTypeName": "The name of the profile object type mapping to use.",
         "ObjectTypeNames": "",
         "Tags": "The tags used to organize, track, or control access for this resource.",
@@ -9516,39 +9516,39 @@
     },
     "AWS::CustomerProfiles::Integration.ConnectorOperator": {
       "attributes": {},
-      "description": "",
+      "description": "The operation to be performed on the provided source fields.",
       "properties": {
-        "Marketo": "",
-        "S3": "",
-        "Salesforce": "",
-        "ServiceNow": "",
-        "Zendesk": ""
+        "Marketo": "The operation to be performed on the provided Marketo source fields.",
+        "S3": "The operation to be performed on the provided Amazon S3 source fields.",
+        "Salesforce": "The operation to be performed on the provided Salesforce source fields.",
+        "ServiceNow": "The operation to be performed on the provided ServiceNow source fields.",
+        "Zendesk": "The operation to be performed on the provided Zendesk source fields."
       }
     },
     "AWS::CustomerProfiles::Integration.FlowDefinition": {
       "attributes": {},
-      "description": "",
+      "description": "The configurations that control how Customer Profiles retrieves data from the source, Amazon AppFlow. Customer Profiles uses this information to create an AppFlow flow on behalf of customers.",
       "properties": {
-        "Description": "",
-        "FlowName": "",
-        "KmsArn": "",
-        "SourceFlowConfig": "",
-        "Tasks": "",
-        "TriggerConfig": ""
+        "Description": "A description of the flow you want to create.",
+        "FlowName": "The specified name of the flow. Use underscores (_) or hyphens (-) only. Spaces are not allowed.",
+        "KmsArn": "The Amazon Resource Name (ARN) of the AWS Key Management Service (KMS) key you provide for encryption.",
+        "SourceFlowConfig": "The configuration that controls how Customer Profiles retrieves data from the source.",
+        "Tasks": "A list of tasks that Customer Profiles performs while transferring the data in the flow run.",
+        "TriggerConfig": "The trigger settings that determine how and when the flow runs."
       }
     },
     "AWS::CustomerProfiles::Integration.IncrementalPullConfig": {
       "attributes": {},
-      "description": "",
+      "description": "Specifies the configuration used when importing incremental records from the source.",
       "properties": {
-        "DatetimeTypeFieldName": ""
+        "DatetimeTypeFieldName": "A field that specifies the date time or timestamp field as the criteria to use when importing incremental records from the source."
       }
     },
     "AWS::CustomerProfiles::Integration.MarketoSourceProperties": {
       "attributes": {},
-      "description": "",
+      "description": "The properties that are applied when Marketo is being used as a source.",
       "properties": {
-        "Object": ""
+        "Object": "The object specified in the Marketo flow source."
       }
     },
     "AWS::CustomerProfiles::Integration.ObjectTypeMapping": {
@@ -9561,101 +9561,101 @@
     },
     "AWS::CustomerProfiles::Integration.S3SourceProperties": {
       "attributes": {},
-      "description": "",
+      "description": "The properties that are applied when Amazon S3 is being used as the flow source.",
       "properties": {
-        "BucketName": "",
-        "BucketPrefix": ""
+        "BucketName": "The Amazon S3 bucket name where the source files are stored.",
+        "BucketPrefix": "The object key for the Amazon S3 bucket in which the source files are stored."
       }
     },
     "AWS::CustomerProfiles::Integration.SalesforceSourceProperties": {
       "attributes": {},
-      "description": "",
+      "description": "The properties that are applied when Salesforce is being used as a source.",
       "properties": {
-        "EnableDynamicFieldUpdate": "",
-        "IncludeDeletedRecords": "",
-        "Object": ""
+        "EnableDynamicFieldUpdate": "The flag that enables dynamic fetching of new (recently added) fields in the Salesforce objects while running a flow.",
+        "IncludeDeletedRecords": "Indicates whether Amazon AppFlow includes deleted files in the flow run.",
+        "Object": "The object specified in the Salesforce flow source."
       }
     },
     "AWS::CustomerProfiles::Integration.ScheduledTriggerProperties": {
       "attributes": {},
-      "description": "",
+      "description": "Specifies the configuration details of a scheduled-trigger flow that you define. Currently, these settings only apply to the scheduled-trigger type.",
       "properties": {
-        "DataPullMode": "",
-        "FirstExecutionFrom": "",
-        "ScheduleEndTime": "",
-        "ScheduleExpression": "",
-        "ScheduleOffset": "",
-        "ScheduleStartTime": "",
-        "Timezone": ""
+        "DataPullMode": "Specifies whether a scheduled flow has an incremental data transfer or a complete data transfer for each flow run.",
+        "FirstExecutionFrom": "Specifies the date range for the records to import from the connector in the first flow run.",
+        "ScheduleEndTime": "Specifies the scheduled end time for a scheduled-trigger flow.",
+        "ScheduleExpression": "The scheduling expression that determines the rate at which the schedule will run, for example rate (5 minutes).",
+        "ScheduleOffset": "Specifies the optional offset that is added to the time interval for a schedule-triggered flow.",
+        "ScheduleStartTime": "Specifies the scheduled start time for a scheduled-trigger flow.",
+        "Timezone": "Specifies the time zone used when referring to the date and time of a scheduled-triggered flow, such as America/New_York."
       }
     },
     "AWS::CustomerProfiles::Integration.ServiceNowSourceProperties": {
       "attributes": {},
-      "description": "",
+      "description": "The properties that are applied when ServiceNow is being used as a source.",
       "properties": {
-        "Object": ""
+        "Object": "The object specified in the ServiceNow flow source."
       }
     },
     "AWS::CustomerProfiles::Integration.SourceConnectorProperties": {
       "attributes": {},
-      "description": "",
+      "description": "Specifies the information that is required to query a particular Amazon AppFlow connector. Customer Profiles supports Salesforce, Zendesk, Marketo, ServiceNow and Amazon S3.",
       "properties": {
-        "Marketo": "",
-        "S3": "",
-        "Salesforce": "",
-        "ServiceNow": "",
-        "Zendesk": ""
+        "Marketo": "The properties that are applied when Marketo is being used as a source.",
+        "S3": "The properties that are applied when Amazon S3 is being used as the flow source.",
+        "Salesforce": "The properties that are applied when Salesforce is being used as a source.",
+        "ServiceNow": "The properties that are applied when ServiceNow is being used as a source.",
+        "Zendesk": "The properties that are applied when using Zendesk as a flow source."
       }
     },
     "AWS::CustomerProfiles::Integration.SourceFlowConfig": {
       "attributes": {},
-      "description": "",
+      "description": "The configuration that controls how Customer Profiles retrieves data from the source.",
       "properties": {
-        "ConnectorProfileName": "",
-        "ConnectorType": "",
-        "IncrementalPullConfig": "",
-        "SourceConnectorProperties": ""
+        "ConnectorProfileName": "The name of the Amazon AppFlow connector profile. This name must be unique for each connector profile in the AWS account.",
+        "ConnectorType": "The type of connector, such as Salesforce, Marketo, and so on.",
+        "IncrementalPullConfig": "Defines the configuration for a scheduled incremental data pull. If a valid configuration is provided, the fields specified in the configuration are used when querying for the incremental data pull.",
+        "SourceConnectorProperties": "Specifies the information that is required to query a particular source connector."
       }
     },
     "AWS::CustomerProfiles::Integration.Task": {
       "attributes": {},
-      "description": "",
+      "description": "The `Task` property type specifies the class for modeling different type of tasks. Task implementation varies based on the TaskType.",
       "properties": {
-        "ConnectorOperator": "",
-        "DestinationField": "",
-        "SourceFields": "",
-        "TaskProperties": "",
-        "TaskType": ""
+        "ConnectorOperator": "The operation to be performed on the provided source fields.",
+        "DestinationField": "A field in a destination connector, or a field value against which Amazon AppFlow validates a source field.",
+        "SourceFields": "The source fields to which a particular task is applied.",
+        "TaskProperties": "A map used to store task-related information. The service looks for particular information based on the TaskType.",
+        "TaskType": "Specifies the particular task implementation that Amazon AppFlow performs."
       }
     },
     "AWS::CustomerProfiles::Integration.TaskPropertiesMap": {
       "attributes": {},
-      "description": "",
+      "description": "A map used to store task-related information. The execution service looks for particular information based on the `TaskType` .",
       "properties": {
-        "OperatorPropertyKey": "",
-        "Property": ""
+        "OperatorPropertyKey": "The task property key.",
+        "Property": "The task property value."
       }
     },
     "AWS::CustomerProfiles::Integration.TriggerConfig": {
       "attributes": {},
-      "description": "",
+      "description": "The trigger settings that determine how and when Amazon AppFlow runs the specified flow.",
       "properties": {
-        "TriggerProperties": "",
-        "TriggerType": ""
+        "TriggerProperties": "Specifies the configuration details of a schedule-triggered flow that you define. Currently, these settings only apply to the Scheduled trigger type.",
+        "TriggerType": "Specifies the type of flow trigger. It can be OnDemand, Scheduled, or Event."
       }
     },
     "AWS::CustomerProfiles::Integration.TriggerProperties": {
       "attributes": {},
-      "description": "",
+      "description": "Specifies the configuration details that control the trigger for a flow. Currently, these settings only apply to the Scheduled trigger type.",
       "properties": {
-        "Scheduled": ""
+        "Scheduled": "Specifies the configuration details of a schedule-triggered flow that you define."
       }
     },
     "AWS::CustomerProfiles::Integration.ZendeskSourceProperties": {
       "attributes": {},
-      "description": "",
+      "description": "The properties that are applied when using Zendesk as a flow source.",
       "properties": {
-        "Object": ""
+        "Object": "The object specified in the Zendesk flow source."
       }
     },
     "AWS::CustomerProfiles::ObjectType": {
@@ -11893,7 +11893,7 @@
         "SubnetId": "[EC2-VPC] The ID of the subnet to launch the instance into.\n\nIf you specify a network interface, you must specify any subnets as part of the network interface.",
         "Tags": "The tags to add to the instance. These tags are not applied to the EBS volumes, such as the root volume.",
         "Tenancy": "The tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of `dedicated` runs on single-tenant hardware.",
-        "UserData": "The user data to make available to the instance. For more information, see [Run commands on your Linux instance at launch](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) and [Run commands on your Windows instance at launch](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-windows-user-data.html) . If you are using a command line tool, base64-encoding is performed for you, and you can load the text from a file. Otherwise, you must provide base64-encoded text. User data is limited to 16 KB.",
+        "UserData": "The user data script to make available to the instance. For more information, see [Run commands on your Linux instance at launch](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) and [Run commands on your Windows instance at launch](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-windows-user-data.html) . If you are using a command line tool, base64-encoding is performed for you, and you can load the text from a file. Otherwise, you must provide base64-encoded text. User data is limited to 16 KB.",
         "Volumes": "The volumes to attach to the instance."
       }
     },
@@ -12658,7 +12658,7 @@
       "properties": {
         "NatGatewayId": "The ID of a NAT gateway.",
         "NetworkInterfaceId": "The ID of a network interface.",
-        "Origin": "Describes how the route was created. The following are possible values:\n\n- `CreateRouteTable` - The route was automatically created when the route table was created.\n- `CreateRoute` - The route was manually added to the route table.\n- `EnableVgwRoutePropagation` - The route was propagated by route propagation.",
+        "Origin": "Describes how the route was created. The following are the possible values:\n\n- CreateRouteTable - The route was automatically created when the route table was created.\n- CreateRoute - The route was manually added to the route table.\n- EnableVgwRoutePropagation - The route was propagated by route propagation.",
         "TransitGatewayId": "The ID of a transit gateway.",
         "VpcPeeringConnectionId": "The ID of a VPC peering connection.",
         "destinationCidr": "The destination IPv4 address, in CIDR notation.",
@@ -12673,7 +12673,7 @@
       "description": "Describes a security group rule.",
       "properties": {
         "Cidr": "The IPv4 address range, in CIDR notation.",
-        "Direction": "The direction. The following are possible values:\n\n- egress\n- ingress",
+        "Direction": "The direction. The following are the possible values:\n\n- egress\n- ingress",
         "PortRange": "The port range.",
         "PrefixListId": "The prefix list ID.",
         "Protocol": "The protocol name.",
@@ -12696,7 +12696,7 @@
         "CustomerGateway": "The customer gateway.",
         "Destination": "The destination.",
         "DestinationVpc": "The destination VPC.",
-        "Direction": "The direction. The following are possible values:\n\n- egress\n- ingress",
+        "Direction": "The direction. The following are the possible values:\n\n- egress\n- ingress",
         "ElasticLoadBalancerListener": "The load balancer listener.",
         "ExplanationCode": "The explanation code.",
         "IngressRouteTable": "The route table.",
@@ -12918,13 +12918,13 @@
     },
     "AWS::EC2::SecurityGroup.Egress": {
       "attributes": {},
-      "description": "Specifies an outbound rule for a security group. An outbound rule permits instances to send traffic to the specified IPv4 or IPv6 address range, or to the instances associated with the specified destination security groups.\n\nYou must specify only one of the following properties: `CidrIp` , `CidrIpv6` , `DestinationPrefixListId` , or `DestinationSecurityGroupId` .\n\nThe EC2 Security Group Rule is an embedded property of the `AWS::EC2::SecurityGroup` type.",
+      "description": "[EC2-VPC only] Adds the specified egress rules to a security group for use with a VPC.\n\nAn outbound rule permits instances to send traffic to the specified destination IPv4 or IPv6 CIDR address ranges, or to the specified destination security groups for the same VPC.\n\nYou specify a protocol for each rule (for example, TCP). For the TCP and UDP protocols, you must also specify the destination port or port range. For the ICMP protocol, you must also specify the ICMP type and code. You can use -1 for the type or code to mean all types or all codes.\n\nYou must specify only one of the following properties: `CidrIp` , `CidrIpv6` , `DestinationPrefixListId` , or `DestinationSecurityGroupId` .\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ). If you do not specify one of these parameters, the stack will launch successfully but the rule will not be added to the security group.\n\nRule changes are propagated to affected instances as quickly as possible. However, a small delay might occur.\n\nFor more information about VPC security group limits, see [Amazon VPC Limits](https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html) .\n\nUse `SecurityGroup.Ingress` and `SecurityGroup.Egress` only when necessary, typically to allow security groups to reference each other in ingress and egress rules. Otherwise, use the embedded ingress and egress rules of the security group. For more information, see [Amazon EC2 Security Groups](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html) .\n\nThe EC2 Security Group Rule is an embedded property of the `AWS::EC2::SecurityGroup` type.",
       "properties": {
-        "CidrIp": "The IPv4 address range, in CIDR format.",
-        "CidrIpv6": "The IPv6 address range, in CIDR format.",
+        "CidrIp": "The IPv4 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
+        "CidrIpv6": "The IPv6 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
         "Description": "A description for the security group rule.\n\nConstraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*",
-        "DestinationPrefixListId": "[EC2-VPC only] The prefix list IDs for the destination AWS service. This is the AWS service that you want to access through a VPC endpoint from instances associated with the security group.",
-        "DestinationSecurityGroupId": "The ID of the destination VPC security group.",
+        "DestinationPrefixListId": "[EC2-VPC only] The prefix list IDs for the destination AWS service. This is the AWS service that you want to access through a VPC endpoint from instances associated with the security group.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).",
+        "DestinationSecurityGroupId": "The ID of the destination VPC security group.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).",
         "FromPort": "The start of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 type number. A value of `-1` indicates all ICMP/ICMPv6 types. If you specify all ICMP/ICMPv6 types, you must specify all codes.",
         "IpProtocol": "The IP protocol name ( `tcp` , `udp` , `icmp` , `icmpv6` ) or number (see [Protocol Numbers](https://docs.aws.amazon.com/http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml) ).\n\n[VPC only] Use `-1` to specify all protocols. When authorizing security group rules, specifying `-1` or a protocol number other than `tcp` , `udp` , `icmp` , or `icmpv6` allows traffic on all ports, regardless of any port range you specify. For `tcp` , `udp` , and `icmp` , you must specify a port range. For `icmpv6` , the port range is optional; if you omit the port range, traffic for all types and codes is allowed.",
         "ToPort": "The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 code. A value of `-1` indicates all ICMP/ICMPv6 codes. If you specify all ICMP/ICMPv6 types, you must specify all codes."
@@ -12932,16 +12932,16 @@
     },
     "AWS::EC2::SecurityGroup.Ingress": {
       "attributes": {},
-      "description": "Specifies an inbound rule for a security group. An inbound rule permits instances to receive traffic from the specified IPv4 or IPv6 CIDR address range, or from the instances associated with the specified security group.\n\nYou must specify only one of the following properties: `CidrIp` , `CidrIpv6` , `SourcePrefixListId` , `SourceSecurityGroupId` , or `SourceSecurityGroupName` .\n\nThe EC2 Security Group Rule is an embedded property of the `AWS::EC2::SecurityGroup` type.",
+      "description": "Adds an inbound rule to a security group.\n\nAn inbound rule permits instances to receive traffic from the specified IPv4 or IPv6 CIDR address range, or from the instances associated with the specified security group.\n\nYou must specify only one of the following properties: `CidrIp` , `CidrIpv6` , `SourcePrefixListId` , `SourceSecurityGroupId` , or `SourceSecurityGroupName` .\n\nYou specify a protocol for each rule (for example, TCP). For TCP and UDP, you must also specify a port or port range. For ICMP/ICMPv6, you must also specify the ICMP/ICMPv6 type and code. You can use -1 to mean all types or all codes.\n\nYou must specify a source security group ( `SourcePrefixListId` , `SourceSecurityGroupId` , or `SourceSecurityGroupName` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ). If you do not specify one of these parameters, the stack will launch successfully but the rule will not be added to the security group.\n\nRule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.\n\nThe EC2 Security Group Rule is an embedded property of the `AWS::EC2::SecurityGroup` type.",
       "properties": {
-        "CidrIp": "The IPv4 address range, in CIDR format.",
-        "CidrIpv6": "The IPv6 address range, in CIDR format.",
-        "Description": "A description for the security group rule.\n\nConstraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*",
+        "CidrIp": "The IPv4 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
+        "CidrIpv6": "The IPv6 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
+        "Description": "Updates the description of an ingress (inbound) security group rule. You can replace an existing description, or add a description to a rule that did not have one previously.\n\nConstraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*",
         "FromPort": "The start of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 type number. A value of `-1` indicates all ICMP/ICMPv6 types. If you specify all ICMP/ICMPv6 types, you must specify all codes.",
         "IpProtocol": "The IP protocol name ( `tcp` , `udp` , `icmp` , `icmpv6` ) or number (see [Protocol Numbers](https://docs.aws.amazon.com/http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml) ).\n\n[VPC only] Use `-1` to specify all protocols. When authorizing security group rules, specifying `-1` or a protocol number other than `tcp` , `udp` , `icmp` , or `icmpv6` allows traffic on all ports, regardless of any port range you specify. For `tcp` , `udp` , and `icmp` , you must specify a port range. For `icmpv6` , the port range is optional; if you omit the port range, traffic for all types and codes is allowed.",
         "SourcePrefixListId": "[EC2-VPC only] The ID of a prefix list.",
         "SourceSecurityGroupId": "The ID of the security group. You must specify either the security group ID or the security group name in the request. For security groups in a nondefault VPC, you must specify the security group ID.",
-        "SourceSecurityGroupName": "[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with an IP address range. Creates rules that grant full ICMP, UDP, and TCP access.",
+        "SourceSecurityGroupName": "[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with an IP address range. Creates rules that grant full ICMP, UDP, and TCP access.\n\nYou must specify the `GroupName` property or the `GroupId` property. For security groups that are in a VPC, you must use the `GroupId` property.",
         "SourceSecurityGroupOwnerId": "[nondefault VPC] The AWS account ID for the source security group, if the source security group is in a different account. You can't specify this property with an IP address range. Creates rules that grant full ICMP, UDP, and TCP access.\n\nIf you specify `SourceSecurityGroupName` or `SourceSecurityGroupId` and that security group is owned by a different account than the account creating the stack, you must specify the `SourceSecurityGroupOwnerId` ; otherwise, this property is optional.",
         "ToPort": "The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 code. A value of `-1` indicates all ICMP/ICMPv6 codes. If you specify all ICMP/ICMPv6 types, you must specify all codes."
       }
@@ -12950,11 +12950,11 @@
       "attributes": {
         "Ref": "`Ref` returns the name of the security egress rule."
       },
-      "description": "[EC2-VPC only] Adds the specified egress rules to a security group for use with a VPC.\n\nAn outbound rule permits instances to send traffic to the specified destination IPv4 or IPv6 CIDR address ranges, or to the specified destination security groups for the same VPC.\n\nYou specify a protocol for each rule (for example, TCP). For the TCP and UDP protocols, you must also specify the destination port or port range. For the ICMP protocol, you must also specify the ICMP type and code. You can use -1 for the type or code to mean all types or all codes.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ). If you do not specify one of these parameters, the stack will launch successfully but the rule will not be added to the security group.\n\nRule changes are propagated to affected instances as quickly as possible. However, a small delay might occur.\n\nFor more information about VPC security group limits, see [Amazon VPC Limits](https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html) .\n\nUse `AWS::EC2::SecurityGroupIngress` and `AWS::EC2::SecurityGroupEgress` only when necessary, typically to allow security groups to reference each other in ingress and egress rules. Otherwise, use the embedded ingress and egress rules of the security group. For more information, see [Amazon EC2 Security Groups](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html) .",
+      "description": "[EC2-VPC only] Adds the specified egress rules to a security group for use with a VPC.\n\nAn outbound rule permits instances to send traffic to the specified destination IPv4 or IPv6 CIDR address ranges, or to the specified destination security groups for the same VPC.\n\nYou specify a protocol for each rule (for example, TCP). For the TCP and UDP protocols, you must also specify the destination port or port range. For the ICMP protocol, you must also specify the ICMP type and code. You can use -1 for the type or code to mean all types or all codes.\n\nYou must specify only one of the following properties: `CidrIp` , `CidrIpv6` , `DestinationPrefixListId` , or `DestinationSecurityGroupId` .\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ). If you do not specify one of these parameters, the stack will launch successfully but the rule will not be added to the security group.\n\nRule changes are propagated to affected instances as quickly as possible. However, a small delay might occur.\n\nFor more information about VPC security group limits, see [Amazon VPC Limits](https://docs.aws.amazon.com/vpc/latest/userguide/amazon-vpc-limits.html) .\n\nUse `AWS::EC2::SecurityGroupIngress` and `AWS::EC2::SecurityGroupEgress` only when necessary, typically to allow security groups to reference each other in ingress and egress rules. Otherwise, use the embedded ingress and egress rules of the security group. For more information, see [Amazon EC2 Security Groups](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html) .",
       "properties": {
         "CidrIp": "The IPv4 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
         "CidrIpv6": "The IPv6 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
-        "Description": "The description of an egress (outbound) security group rule.",
+        "Description": "The description of an egress (outbound) security group rule.\n\nConstraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*",
         "DestinationPrefixListId": "[EC2-VPC only] The prefix list IDs for an AWS service. This is the AWS service that you want to access through a VPC endpoint from instances associated with the security group.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).",
         "DestinationSecurityGroupId": "The ID of the security group.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).",
         "FromPort": "The start of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 type number. A value of `-1` indicates all ICMP/ICMPv6 types. If you specify all ICMP/ICMPv6 types, you must specify all codes.",
@@ -12965,19 +12965,19 @@
     },
     "AWS::EC2::SecurityGroupIngress": {
       "attributes": {},
-      "description": "Adds an inbound rule to a security group.\n\nAn inbound rule permits instances to receive traffic from the specified IPv4 or IPv6 CIDR address range, or from the instances associated with the specified security group.\n\nYou specify a protocol for each rule (for example, TCP). For TCP and UDP, you must also specify a port or port range. For ICMP/ICMPv6, you must also specify the ICMP/ICMPv6 type and code. You can use -1 to mean all types or all codes.\n\nYou must specify a source security group ( `SourcePrefixListId` , `SourceSecurityGroupId` , or `SourceSecurityGroupName` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ). If you do not specify one of these parameters, the stack will launch successfully but the rule will not be added to the security group.\n\nRule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.",
+      "description": "Adds an inbound rule to a security group.\n\nAn inbound rule permits instances to receive traffic from the specified IPv4 or IPv6 CIDR address range, or from the instances associated with the specified security group.\n\nYou must specify only one of the following properties: `CidrIp` , `CidrIpv6` , `SourcePrefixListId` , `SourceSecurityGroupId` , or `SourceSecurityGroupName` .\n\nYou specify a protocol for each rule (for example, TCP). For TCP and UDP, you must also specify a port or port range. For ICMP/ICMPv6, you must also specify the ICMP/ICMPv6 type and code. You can use -1 to mean all types or all codes.\n\nYou must specify a source security group ( `SourcePrefixListId` , `SourceSecurityGroupId` , or `SourceSecurityGroupName` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ). If you do not specify one of these parameters, the stack will launch successfully but the rule will not be added to the security group.\n\nRule changes are propagated to instances within the security group as quickly as possible. However, a small delay might occur.",
       "properties": {
-        "CidrIp": "The IPv4 address range, in CIDR format.",
-        "CidrIpv6": "The IPv6 address range, in CIDR format.",
-        "Description": "Updates the description of an ingress (inbound) security group rule. You can replace an existing description, or add a description to a rule that did not have one previously.",
+        "CidrIp": "The IPv4 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
+        "CidrIpv6": "The IPv6 address range, in CIDR format.\n\nYou must specify a destination security group ( `DestinationPrefixListId` or `DestinationSecurityGroupId` ) or a CIDR range ( `CidrIp` or `CidrIpv6` ).\n\nFor examples of rules that you can add to security groups for specific access scenarios, see [Security group rules for different use cases](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-rules-reference.html) in the *Amazon EC2 User Guide* .",
+        "Description": "Updates the description of an ingress (inbound) security group rule. You can replace an existing description, or add a description to a rule that did not have one previously.\n\nConstraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*",
         "FromPort": "The start of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 type number. A value of `-1` indicates all ICMP/ICMPv6 types. If you specify all ICMP/ICMPv6 types, you must specify all codes.\n\nUse this for ICMP and any protocol that uses ports.",
         "GroupId": "The ID of the security group. You must specify either the security group ID or the security group name in the request. For security groups in a nondefault VPC, you must specify the security group ID.\n\nYou must specify the `GroupName` property or the `GroupId` property. For security groups that are in a VPC, you must use the `GroupId` property.",
         "GroupName": "The name of the security group.\n\nConstraints: Up to 255 characters in length. Cannot start with `sg-` .\n\nConstraints for EC2-Classic: ASCII characters\n\nConstraints for EC2-VPC: a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&;{}!$*",
         "IpProtocol": "The IP protocol name ( `tcp` , `udp` , `icmp` , `icmpv6` ) or number (see [Protocol Numbers](https://docs.aws.amazon.com/http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml) ).\n\n[VPC only] Use `-1` to specify all protocols. When authorizing security group rules, specifying `-1` or a protocol number other than `tcp` , `udp` , `icmp` , or `icmpv6` allows traffic on all ports, regardless of any port range you specify. For `tcp` , `udp` , and `icmp` , you must specify a port range. For `icmpv6` , the port range is optional; if you omit the port range, traffic for all types and codes is allowed.",
         "SourcePrefixListId": "[EC2-VPC only] The ID of a prefix list.",
         "SourceSecurityGroupId": "The ID of the security group. You must specify either the security group ID or the security group name. For security groups in a nondefault VPC, you must specify the security group ID.",
-        "SourceSecurityGroupName": "[EC2-Classic, default VPC] The name of the source security group.\n\nYou must specify the `GroupName` property or the `GroupId` property. For security groups that are in a VPC, you must use the `GroupId` property.",
-        "SourceSecurityGroupOwnerId": "[nondefault VPC] The AWS account ID that owns the source security group. You can't specify this property with an IP address range.\n\nIf you specify `SourceSecurityGroupName` or `SourceSecurityGroupId` and that security group is owned by a different account than the account creating the stack, you must specify the `SourceSecurityGroupOwnerId` ; otherwise, this property is optional.",
+        "SourceSecurityGroupName": "[EC2-Classic, default VPC] The name of the source security group. You can't specify this parameter in combination with an IP address range. Creates rules that grant full ICMP, UDP, and TCP access.\n\nYou must specify the `GroupName` property or the `GroupId` property. For security groups that are in a VPC, you must use the `GroupId` property.",
+        "SourceSecurityGroupOwnerId": "[nondefault VPC] The AWS account ID for the source security group, if the source security group is in a different account. You can't specify this property with an IP address range. Creates rules that grant full ICMP, UDP, and TCP access.\n\nIf you specify `SourceSecurityGroupName` or `SourceSecurityGroupId` and that security group is owned by a different account than the account creating the stack, you must specify the `SourceSecurityGroupOwnerId` ; otherwise, this property is optional.",
         "ToPort": "The end of port range for the TCP and UDP protocols, or an ICMP/ICMPv6 code. A value of `-1` indicates all ICMP/ICMPv6 codes for the specified ICMP type. If you specify all ICMP/ICMPv6 types, you must specify all codes.\n\nUse this for ICMP and any protocol that uses ports."
       }
     },
@@ -13057,7 +13057,7 @@
       "properties": {
         "LaunchTemplateId": "The ID of the launch template. If you specify the template ID, you can't specify the template name.",
         "LaunchTemplateName": "The name of the launch template. You must specify either a template name or a template ID.\n\nMinimum length of 3. Maximum length of 128. Names must match the following pattern: `[a-zA-Z0-9\\(\\)\\.-/_]+`",
-        "Version": "The version number of the launch template. You must specify a version number. AWS CloudFormation does not support specifying `$Latest` or `$Default` for the template version number.\n\nMinimum length of 1. Maximum length of 255. Versions must fit the following pattern: `[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*`"
+        "Version": "The version number of the launch template. You must specify a version number.\n\nMinimum length of 1. Maximum length of 255. Versions must fit the following pattern: `[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*`"
       }
     },
     "AWS::EC2::SpotFleet.GroupIdentifier": {
@@ -17501,6 +17501,141 @@
         "WeeklyMaintenanceStartTime": "A recurring weekly time, in the format `D:HH:MM` .\n\n`D` is the day of the week, for which 1 represents Monday and 7 represents Sunday. For further details, see [the ISO-8601 spec as described on Wikipedia](https://docs.aws.amazon.com/https://en.wikipedia.org/wiki/ISO_week_date) .\n\n`HH` is the zero-padded hour of the day (0-23), and `MM` is the zero-padded minute of the hour.\n\nFor example, `1:05:00` specifies maintenance at 5 AM Monday."
       }
     },
+    "AWS::FSx::Snapshot": {
+      "attributes": {
+        "Ref": "`Ref` returns the ID of the snapshot. For example:\n\n`{\"Ref\":\"logical_snapshot_id\"}`\n\nReturns `fsvolsnap-0123456789abcedf5` .",
+        "ResourceARN": "Returns the snapshot's Amazon Resource Name (ARN).\n\nExample: `arn:aws:fsx:us-east-2:111133334444:snapshot/fsvol-01234567890123456/fsvolsnap-0123456789abcedf5`"
+      },
+      "description": "A snapshot of an Amazon FSx for OpenZFS volume.",
+      "properties": {
+        "Name": "The name of the snapshot.",
+        "Tags": "An array of key-value pairs to apply to this resource.\n\nFor more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html) .",
+        "VolumeId": "The ID of the volume that the snapshot is of."
+      }
+    },
+    "AWS::FSx::StorageVirtualMachine": {
+      "attributes": {
+        "Ref": "`Ref` returns the resource ID, such as `svm-01234567890123456` . For example:\n\n`{\"Ref\": \"svm_logical_id\"}` returns\n\n`svm-01234567890123456`",
+        "ResourceARN": "Returns the storage virtual machine's Amazon Resource Name (ARN).\n\nExample: `arn:aws:fsx:us-east-2:111111111111:storage-virtual-machine/fs-0123456789abcdef1/svm-01234567890123456`",
+        "StorageVirtualMachineId": "Returns the storgage virtual machine's system generated ID.\n\nExample: `svm-0123456789abcedf1`",
+        "UUID": "Returns the storage virtual machine's system generated unique identifier (UUID).\n\nExample: `abcd0123-cd45-ef67-11aa-1111aaaa23bc`"
+      },
+      "description": "Creates a storage virtual machine (SVM) for an Amazon FSx for ONTAP file system.",
+      "properties": {
+        "ActiveDirectoryConfiguration": "Describes the Microsoft Active Directory configuration to which the SVM is joined, if applicable.",
+        "FileSystemId": "Specifies the FSx for ONTAP file system on which to create the SVM.",
+        "Name": "The name of the SVM.",
+        "RootVolumeSecurityStyle": "The security style of the root volume of the SVM. Specify one of the following values:\n\n- `UNIX` if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account.\n- `NTFS` if the file system is managed by a Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Windows user as the service account.\n- `MIXED` if the file system is managed by both UNIX and Windows administrators and users consist of both NFS and SMB clients.",
+        "SvmAdminPassword": "Specifies the password to use when logging on to the SVM using a secure shell (SSH) connection to the SVM's management endpoint. Doing so enables you to manage the SVM using the NetApp ONTAP CLI or REST API. If you do not specify a password, you can still use the file system's `fsxadmin` user to manage the SVM. For more information, see [Managing SVMs using the NetApp ONTAP CLI](https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/managing-resources-ontap-apps.html#vsadmin-ontap-cli) in the *FSx for ONTAP User Guide* .",
+        "Tags": "An array of key-value pairs to apply to this resource.\n\nFor more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html) ."
+      }
+    },
+    "AWS::FSx::StorageVirtualMachine.ActiveDirectoryConfiguration": {
+      "attributes": {},
+      "description": "Describes the self-managed Microsoft Active Directory to which you want to join the SVM. Joining an Active Directory provides user authentication and access control for SMB clients, including Microsoft Windows and macOS client accessing the file system.",
+      "properties": {
+        "NetBiosName": "The NetBIOS name of the Active Directory computer object that will be created for your SVM.",
+        "SelfManagedActiveDirectoryConfiguration": "The configuration that Amazon FSx uses to join the ONTAP storage virtual machine (SVM) to your self-managed (including on-premises) Microsoft Active Directory (AD) directory."
+      }
+    },
+    "AWS::FSx::StorageVirtualMachine.SelfManagedActiveDirectoryConfiguration": {
+      "attributes": {},
+      "description": "The configuration that Amazon FSx uses to join a FSx for Windows File Server file system or an ONTAP storage virtual machine (SVM) to a self-managed (including on-premises) Microsoft Active Directory (AD) directory. For more information, see [Using Amazon FSx with your self-managed Microsoft Active Directory](https://docs.aws.amazon.com/fsx/latest/WindowsGuide/self-managed-AD.html) or [Managing SVMs](https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/managing-svms.html) .",
+      "properties": {
+        "DnsIps": "A list of up to three IP addresses of DNS servers or domain controllers in the self-managed AD directory.",
+        "DomainName": "The fully qualified domain name of the self-managed AD directory, such as `corp.example.com` .",
+        "FileSystemAdministratorsGroup": "(Optional) The name of the domain group whose members are granted administrative privileges for the file system. Administrative privileges include taking ownership of files and folders, setting audit controls (audit ACLs) on files and folders, and administering the file system remotely by using the FSx Remote PowerShell. The group that you specify must already exist in your domain. If you don't provide one, your AD domain's Domain Admins group is used.",
+        "OrganizationalUnitDistinguishedName": "(Optional) The fully qualified distinguished name of the organizational unit within your self-managed AD directory. Amazon FSx only accepts OU as the direct parent of the file system. An example is `OU=FSx,DC=yourdomain,DC=corp,DC=com` . To learn more, see [RFC 2253](https://docs.aws.amazon.com/https://tools.ietf.org/html/rfc2253) . If none is provided, the FSx file system is created in the default location of your self-managed AD directory.\n\n> Only Organizational Unit (OU) objects can be the direct parent of the file system that you're creating.",
+        "Password": "The password for the service account on your self-managed AD domain that Amazon FSx will use to join to your AD domain.",
+        "UserName": "The user name for the service account on your self-managed AD domain that Amazon FSx will use to join to your AD domain. This account must have the permission to join computers to the domain in the organizational unit provided in `OrganizationalUnitDistinguishedName` , or in the default location of your AD domain."
+      }
+    },
+    "AWS::FSx::Volume": {
+      "attributes": {
+        "Ref": "`Ref` returns the ID for the volume. For example:\n\n`{\"Ref\":\"vol_logical_id\"}`\n\nReturns `fsvol-0123456789abcdef6` .",
+        "ResourceARN": "Returns the volume's Amazon Resource Name (ARN).\n\nExample: `arn:aws:fsx:us-east-2:111122223333:volume/fs-0123456789abcdef9/fsvol-01234567891112223`",
+        "UUID": "Returns the volume's universally unique identifier (UUID).\n\nExample: `abcd0123-cd45-ef67-11aa-1111aaaa23bc`",
+        "VolumeId": "Returns the volume's ID.\n\nExample: `fsvol-0123456789abcdefa`"
+      },
+      "description": "Creates an FSx for ONTAP or Amazon FSx for OpenZFS storage volume.",
+      "properties": {
+        "BackupId": "Specifies the ID of the volume backup to use to create a new volume.",
+        "Name": "The name of the volume.",
+        "OntapConfiguration": "The configuration of an Amazon FSx for NetApp ONTAP volume.",
+        "OpenZFSConfiguration": "The configuration of an Amazon FSx for OpenZFS volume.",
+        "Tags": "An array of key-value pairs to apply to this resource.\n\nFor more information, see [Tag](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html) .",
+        "VolumeType": "The type of the volume."
+      }
+    },
+    "AWS::FSx::Volume.ClientConfigurations": {
+      "attributes": {},
+      "description": "Specifies who can mount an OpenZFS file system and the options available while mounting the file system.",
+      "properties": {
+        "Clients": "A value that specifies who can mount the file system. You can provide a wildcard character ( `*` ), an IP address ( `0.0.0.0` ), or a CIDR address ( `192.0.2.0/24` ). By default, Amazon FSx uses the wildcard character when specifying the client.",
+        "Options": "The options to use when mounting the file system. For a list of options that you can use with Network File System (NFS), see the [exports(5) - Linux man page](https://docs.aws.amazon.com/https://linux.die.net/man/5/exports) . When choosing your options, consider the following:\n\n- `crossmnt` is used by default. If you don't specify `crossmnt` when changing the client configuration, you won't be able to see or access snapshots in your file system's snapshot directory.\n- `sync` is used by default. If you instead specify `async` , the system acknowledges writes before writing to disk. If the system crashes before the writes are finished, you lose the unwritten data."
+      }
+    },
+    "AWS::FSx::Volume.NfsExports": {
+      "attributes": {},
+      "description": "The configuration object for mounting a Network File System (NFS) file system.",
+      "properties": {
+        "ClientConfigurations": "A list of configuration objects that contain the client and options for mounting the OpenZFS file system."
+      }
+    },
+    "AWS::FSx::Volume.OntapConfiguration": {
+      "attributes": {},
+      "description": "Specifies the configuration of the ONTAP volume that you are creating.",
+      "properties": {
+        "JunctionPath": "Specifies the location in the SVM's namespace where the volume is mounted. The `JunctionPath` must have a leading forward slash, such as `/vol3` .",
+        "SecurityStyle": "The security style for the volume. Specify one of the following values:\n\n- `UNIX` if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account. `UNIX` is the default.\n- `NTFS` if the file system is managed by a Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Windows user as the service account.\n- `MIXED` if the file system is managed by both UNIX and Windows administrators and users consist of both NFS and SMB clients.",
+        "SizeInMegabytes": "Specifies the size of the volume, in megabytes (MB), that you are creating.",
+        "StorageEfficiencyEnabled": "Set to true to enable deduplication, compression, and compaction storage efficiency features on the volume.",
+        "StorageVirtualMachineId": "Specifies the ONTAP SVM in which to create the volume.",
+        "TieringPolicy": "Describes the data tiering policy for an ONTAP volume. When enabled, Amazon FSx for ONTAP's intelligent tiering automatically transitions a volume's data between the file system's primary storage and capacity pool storage based on your access patterns.\n\nValid tiering policies are the following:\n\n- `SNAPSHOT_ONLY` - (Default value) moves cold snapshots to the capacity pool storage tier.\n\n- `AUTO` - moves cold user data and snapshots to the capacity pool storage tier based on your access patterns.\n\n- `ALL` - moves all user data blocks in both the active file system and Snapshot copies to the storage pool tier.\n\n- `NONE` - keeps a volume's data in the primary storage tier, preventing it from being moved to the capacity pool tier."
+      }
+    },
+    "AWS::FSx::Volume.OpenZFSConfiguration": {
+      "attributes": {},
+      "description": "Specifies the configuration of the Amazon FSx for OpenZFS volume that you are creating.",
+      "properties": {
+        "CopyTagsToSnapshots": "A Boolean value indicating whether tags for the volume should be copied to snapshots. This value defaults to `false` . If it's set to `true` , all tags for the volume are copied to snapshots where the user doesn't specify tags. If this value is `true` , and you specify one or more tags, only the specified tags are copied to snapshots. If you specify one or more tags when creating the snapshot, no tags are copied from the volume, regardless of this value.",
+        "DataCompressionType": "Specifies the method used to compress the data on the volume. The compression type is `NONE` by default.\n\n- `NONE` - Doesn't compress the data on the volume. `NONE` is the default.\n- `ZSTD` - Compresses the data in the volume using the Zstandard (ZSTD) compression algorithm. Compared to LZ4, Z-Standard provides a better compression ratio to minimize on-disk storage utilization.\n- `LZ4` - Compresses the data in the volume using the LZ4 compression algorithm. Compared to Z-Standard, LZ4 is less compute-intensive and delivers higher write throughput speeds.",
+        "NfsExports": "The configuration object for mounting a Network File System (NFS) file system.",
+        "Options": "To delete the volume's child volumes, snapshots, and clones, use the string `DELETE_CHILD_VOLUMES_AND_SNAPSHOTS` .",
+        "OriginSnapshot": "The configuration object that specifies the snapshot to use as the origin of the data for the volume.",
+        "ParentVolumeId": "The ID of the volume to use as the parent volume of the volume that you are creating.",
+        "ReadOnly": "A Boolean value indicating whether the volume is read-only.",
+        "RecordSizeKiB": "Specifies the suggested block size for a volume in a ZFS dataset, in kibibytes (KiB). Valid values are 4, 8, 16, 32, 64, 128, 256, 512, or 1024 KiB. The default is 128 KiB. We recommend using the default setting for the majority of use cases. Generally, workloads that write in fixed small or large record sizes may benefit from setting a custom record size, like database workloads (small record size) or media streaming workloads (large record size). For additional guidance on when to set a custom record size, see [ZFS Record size](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/performance.html#record-size-performance) in the *Amazon FSx for OpenZFS User Guide* .",
+        "StorageCapacityQuotaGiB": "Sets the maximum storage size in gibibytes (GiB) for the volume. You can specify a quota that is larger than the storage on the parent volume. A volume quota limits the amount of storage that the volume can consume to the configured amount, but does not guarantee the space will be available on the parent volume. To guarantee quota space, you must also set `StorageCapacityReservationGiB` . To *not* specify a storage capacity quota, set this to `-1` .\n\nFor more information, see [Volume properties](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/managing-volumes.html#volume-properties) in the *Amazon FSx for OpenZFS User Guide* .",
+        "StorageCapacityReservationGiB": "Specifies the amount of storage in gibibytes (GiB) to reserve from the parent volume. Setting `StorageCapacityReservationGiB` guarantees that the specified amount of storage space on the parent volume will always be available for the volume. You can't reserve more storage than the parent volume has. To *not* specify a storage capacity reservation, set this to `0` or `-1` . For more information, see [Volume properties](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/managing-volumes.html#volume-properties) in the *Amazon FSx for OpenZFS User Guide* .",
+        "UserAndGroupQuotas": "An object specifying how much storage users or groups can use on the volume."
+      }
+    },
+    "AWS::FSx::Volume.OriginSnapshot": {
+      "attributes": {},
+      "description": "The configuration object that specifies the snapshot to use as the origin of the data for the volume.",
+      "properties": {
+        "CopyStrategy": "The strategy used when copying data from the snapshot to the new volume.\n\n- `CLONE` - The new volume references the data in the origin snapshot. Cloning a snapshot is faster than copying data from the snapshot to a new volume and doesn't consume disk throughput. However, the origin snapshot can't be deleted if there is a volume using its copied data.\n- `FULL_COPY` - Copies all data from the snapshot to the new volume.",
+        "SnapshotARN": "Specifies the snapshot to use when creating an OpenZFS volume from a snapshot."
+      }
+    },
+    "AWS::FSx::Volume.TieringPolicy": {
+      "attributes": {},
+      "description": "Describes the data tiering policy for an ONTAP volume. When enabled, Amazon FSx for ONTAP's intelligent tiering automatically transitions a volume's data between the file system's primary storage and capacity pool storage based on your access patterns.\n\nValid tiering policies are the following:\n\n- `SNAPSHOT_ONLY` - (Default value) moves cold snapshots to the capacity pool storage tier.\n\n- `AUTO` - moves cold user data and snapshots to the capacity pool storage tier based on your access patterns.\n\n- `ALL` - moves all user data blocks in both the active file system and Snapshot copies to the storage pool tier.\n\n- `NONE` - keeps a volume's data in the primary storage tier, preventing it from being moved to the capacity pool tier.",
+      "properties": {
+        "CoolingPeriod": "Specifies the number of days that user data in a volume must remain inactive before it is considered \"cold\" and moved to the capacity pool. Used with the `AUTO` and `SNAPSHOT_ONLY` tiering policies. Enter a whole number between 2 and 183. Default values are 31 days for `AUTO` and 2 days for `SNAPSHOT_ONLY` .",
+        "Name": "Specifies the tiering policy used to transition data. Default value is `SNAPSHOT_ONLY` .\n\n- `SNAPSHOT_ONLY` - moves cold snapshots to the capacity pool storage tier.\n- `AUTO` - moves cold user data and snapshots to the capacity pool storage tier based on your access patterns.\n- `ALL` - moves all user data blocks in both the active file system and Snapshot copies to the storage pool tier.\n- `NONE` - keeps a volume's data in the primary storage tier, preventing it from being moved to the capacity pool tier."
+      }
+    },
+    "AWS::FSx::Volume.UserAndGroupQuotas": {
+      "attributes": {},
+      "description": "An object specifying how much storage users or groups can use on the volume.",
+      "properties": {
+        "Id": "The ID of the user or group.",
+        "StorageCapacityQuotaGiB": "The amount of storage that the user or group can use in gibibytes (GiB).",
+        "Type": "A value that specifies whether the quota applies to a user or group."
+      }
+    },
     "AWS::FinSpace::Environment": {
       "attributes": {
         "AwsAccountId": "The ID of the AWS account in which the FinSpace environment is created.",
@@ -28633,7 +28768,7 @@
         "Mode": "If \"vod,\" all segments are indexed and kept permanently in the destination and manifest. If \"live,\" only the number segments specified in keepSegments and indexNSegments are kept. Newer segments replace older segments, which might prevent players from rewinding all the way to the beginning of the channel. VOD mode uses HLS EXT-X-PLAYLIST-TYPE of EVENT while the channel is running, converting it to a \"VOD\" type manifest on completion of the stream.",
         "OutputSelection": "MANIFESTSANDSEGMENTS: Generates manifests (the master manifest, if applicable, and media manifests) for this output group. SEGMENTSONLY: Doesn't generate any manifests for this output group.",
         "ProgramDateTime": "Includes or excludes the EXT-X-PROGRAM-DATE-TIME tag in .m3u8 manifest files. The value is calculated as follows: Either the program date and time are initialized using the input timecode source, or the time is initialized using the input timecode source and the date is initialized using the timestampOffset.",
-        "ProgramDateTimeClock": "",
+        "ProgramDateTimeClock": "Specifies the algorithm used to drive the HLS EXT-X-PROGRAM-DATE-TIME clock. Options include: INITIALIZE_FROM_OUTPUT_TIMECODE: The PDT clock is initialized as a function of the first output timecode, then incremented by the EXTINF duration of each encoded segment. SYSTEM_CLOCK: The PDT clock is initialized as a function of the UTC wall clock, then incremented by the EXTINF duration of each encoded segment. If the PDT clock diverges from the wall clock by more than 500ms, it is resynchronized to the wall clock.",
         "ProgramDateTimePeriod": "The period of insertion of the EXT-X-PROGRAM-DATE-TIME entry, in seconds.",
         "RedundantManifest": "ENABLED: The master manifest (.m3u8 file) for each pipeline includes information about both pipelines: first its own media files, then the media files of the other pipeline. This feature allows a playout device that supports stale manifest detection to switch from one manifest to the other, when the current manifest seems to be stale. There are still two destinations and two master manifests, but both master manifests reference the media files from both pipelines. DISABLED: The master manifest (.m3u8 file) for each pipeline includes information about its own pipeline only. For an HLS output group with MediaPackage as the destination, the DISABLED behavior is always followed. MediaPackage regenerates the manifests it serves to players, so a redundant manifest from MediaLive is irrelevant.",
         "SegmentLength": "The length of the MPEG-2 Transport Stream segments to create, in seconds. Note that segments will end on the next keyframe after this number of seconds, so the actual segment length might be longer.",
@@ -33226,7 +33361,7 @@
         "AllowMajorVersionUpgrade": "A value that indicates whether major version upgrades are allowed. Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible.\n\nConstraints: Major version upgrades must be allowed when specifying a value for the `EngineVersion` parameter that is a different major version than the DB instance's current version.",
         "AssociatedRoles": "The AWS Identity and Access Management (IAM) roles associated with the DB instance.",
         "AutoMinorVersionUpgrade": "A value that indicates whether minor engine upgrades are applied automatically to the DB instance during the maintenance window. By default, minor engine upgrades are applied automatically.",
-        "AvailabilityZone": "The Availability Zone that the database instance will be created in.\n\nDefault: A random, system-chosen Availability Zone in the endpoint's region.\n\nExample: `us-east-1d`\n\nConstraint: The AvailabilityZone parameter cannot be specified if the MultiAZ parameter is set to `true` . The specified Availability Zone must be in the same region as the current endpoint.",
+        "AvailabilityZone": "The Availability Zone (AZ) where the database will be created. For information on AWS Regions and Availability Zones, see [Regions and Availability Zones](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html) .\n\n*Amazon Aurora*\n\nNot applicable. Availability Zones are managed by the DB cluster.\n\nDefault: A random, system-chosen Availability Zone in the endpoint's AWS Region .\n\nExample: `us-east-1d`\n\nConstraint: The `AvailabilityZone` parameter can't be specified if the DB instance is a Multi-AZ deployment. The specified Availability Zone must be in the same AWS Region as the current endpoint.\n\n> If you're creating a DB instance in an RDS on VMware environment, specify the identifier of the custom Availability Zone to create the DB instance in.\n> \n> For more information about RDS on VMware, see the [RDS on VMware User Guide.](https://docs.aws.amazon.com/AmazonRDS/latest/RDSonVMwareUserGuide/rds-on-vmware.html)",
         "BackupRetentionPeriod": "The number of days for which automated backups are retained. Setting this parameter to a positive number enables backups. Setting this parameter to 0 disables automated backups.\n\n*Amazon Aurora*\n\nNot applicable. The retention period for automated backups is managed by the DB cluster.\n\nDefault: 1\n\nConstraints:\n\n- Must be a value from 0 to 35\n- Can't be set to 0 if the DB instance is a source to read replicas",
         "CACertificateIdentifier": "The identifier of the CA certificate for this DB instance.\n\n> Specifying or updating this property triggers a reboot. \n\nFor more information about CA certificate identifiers for RDS DB engines, see [Rotating Your SSL/TLS Certificate](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL-certificate-rotation.html) in the *Amazon RDS User Guide* .\n\nFor more information about CA certificate identifiers for Aurora DB engines, see [Rotating Your SSL/TLS Certificate](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.SSL-certificate-rotation.html) in the *Amazon Aurora User Guide* .",
         "CharacterSetName": "For supported engines, indicates that the DB instance should be associated with the specified character set.\n\n*Amazon Aurora*\n\nNot applicable. The character set is managed by the DB cluster. For more information, see [AWS::RDS::DBCluster](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html) .",
@@ -33411,9 +33546,9 @@
       "description": "The `Ingress` property type specifies an individual ingress rule within an `AWS::RDS::DBSecurityGroup` resource.",
       "properties": {
         "CIDRIP": "The IP range to authorize.",
-        "EC2SecurityGroupId": "Id of the EC2 Security Group to authorize. For VPC DB Security Groups, `EC2SecurityGroupId` must be provided. Otherwise, EC2SecurityGroupOwnerId and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
-        "EC2SecurityGroupName": "Name of the EC2 Security Group to authorize. For VPC DB Security Groups, `EC2SecurityGroupId` must be provided. Otherwise, EC2SecurityGroupOwnerId and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
-        "EC2SecurityGroupOwnerId": "AWS Account Number of the owner of the EC2 Security Group specified in the EC2SecurityGroupName parameter. The AWS Access Key ID is not an acceptable value. For VPC DB Security Groups, `EC2SecurityGroupId` must be provided. Otherwise, EC2SecurityGroupOwnerId and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided."
+        "EC2SecurityGroupId": "Id of the EC2 security group to authorize. For VPC DB security groups, `EC2SecurityGroupId` must be provided. Otherwise, `EC2SecurityGroupOwnerId` and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
+        "EC2SecurityGroupName": "Name of the EC2 security group to authorize. For VPC DB security groups, `EC2SecurityGroupId` must be provided. Otherwise, `EC2SecurityGroupOwnerId` and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
+        "EC2SecurityGroupOwnerId": "AWS account number of the owner of the EC2 security group specified in the `EC2SecurityGroupName` parameter. The AWS access key ID isn't an acceptable value. For VPC DB security groups, `EC2SecurityGroupId` must be provided. Otherwise, `EC2SecurityGroupOwnerId` and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided."
       }
     },
     "AWS::RDS::DBSecurityGroupIngress": {
@@ -33423,10 +33558,10 @@
       "description": "The `AWS::RDS::DBSecurityGroupIngress` resource enables ingress to a DB security group using one of two forms of authorization. First, you can add EC2 or VPC security groups to the DB security group if the application using the database is running on EC2 or VPC instances. Second, IP ranges are available if the application accessing your database is running on the Internet.\n\nThis type supports updates. For more information about updating stacks, see [AWS CloudFormation Stacks Updates](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks.html) .\n\nFor details about the settings for DB security group ingress, see [AuthorizeDBSecurityGroupIngress](https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_AuthorizeDBSecurityGroupIngress.html) .",
       "properties": {
         "CIDRIP": "The IP range to authorize.",
-        "DBSecurityGroupName": "The name of the DB Security Group to add authorization to.",
-        "EC2SecurityGroupId": "Id of the EC2 Security Group to authorize. For VPC DB Security Groups, `EC2SecurityGroupId` must be provided. Otherwise, EC2SecurityGroupOwnerId and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
-        "EC2SecurityGroupName": "Name of the EC2 Security Group to authorize. For VPC DB Security Groups, `EC2SecurityGroupId` must be provided. Otherwise, EC2SecurityGroupOwnerId and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
-        "EC2SecurityGroupOwnerId": "AWS Account Number of the owner of the EC2 Security Group specified in the EC2SecurityGroupName parameter. The AWS Access Key ID is not an acceptable value. For VPC DB Security Groups, `EC2SecurityGroupId` must be provided. Otherwise, EC2SecurityGroupOwnerId and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided."
+        "DBSecurityGroupName": "The name of the DB security group to add authorization to.",
+        "EC2SecurityGroupId": "Id of the EC2 security group to authorize. For VPC DB security groups, `EC2SecurityGroupId` must be provided. Otherwise, `EC2SecurityGroupOwnerId` and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
+        "EC2SecurityGroupName": "Name of the EC2 security group to authorize. For VPC DB security groups, `EC2SecurityGroupId` must be provided. Otherwise, `EC2SecurityGroupOwnerId` and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided.",
+        "EC2SecurityGroupOwnerId": "AWS account number of the owner of the EC2 security group specified in the `EC2SecurityGroupName` parameter. The AWS access key ID isn't an acceptable value. For VPC DB security groups, `EC2SecurityGroupId` must be provided. Otherwise, `EC2SecurityGroupOwnerId` and either `EC2SecurityGroupName` or `EC2SecurityGroupId` must be provided."
       }
     },
     "AWS::RDS::DBSubnetGroup": {
@@ -33435,9 +33570,9 @@
       },
       "description": "The `AWS::RDS::DBSubnetGroup` resource creates a database subnet group. Subnet groups must contain at least two subnets in two different Availability Zones in the same region.\n\nFor more information, see [Working with DB subnet groups](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html#USER_VPC.Subnets) in the *Amazon RDS User Guide* .",
       "properties": {
-        "DBSubnetGroupDescription": "The description for the DB Subnet Group.",
+        "DBSubnetGroupDescription": "The description for the DB subnet group.",
         "DBSubnetGroupName": "The name for the DB subnet group. This value is stored as a lowercase string.\n\nConstraints: Must contain no more than 255 lowercase alphanumeric characters or hyphens. Must not be \"Default\".\n\nExample: `mysubnetgroup`",
-        "SubnetIds": "The EC2 Subnet IDs for the DB Subnet Group.",
+        "SubnetIds": "The EC2 Subnet IDs for the DB subnet group.",
         "Tags": "Tags to assign to the DB subnet group."
       }
     },
@@ -33447,8 +33582,8 @@
       },
       "description": "The `AWS::RDS::EventSubscription` resource allows you to receive notifications for Amazon Relational Database Service events through the Amazon Simple Notification Service (Amazon SNS). For more information, see [Using Amazon RDS Event Notification](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Events.html) in the *Amazon RDS User Guide* .",
       "properties": {
-        "Enabled": "A Boolean value; set to *true* to activate the subscription, set to *false* to create the subscription but not active it.",
-        "EventCategories": "A list of event categories for a SourceType that you want to subscribe to. You can see a list of the categories for a given SourceType in the [Events](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Events.html) topic in the Amazon RDS User Guide or by using the *DescribeEventCategories* action.",
+        "Enabled": "A value that indicates whether to activate the subscription. If the event notification subscription isn't activated, the subscription is created but not active.",
+        "EventCategories": "A list of event categories for a particular source type ( `SourceType` ) that you want to subscribe to. You can see a list of the categories for a given source type in the \"Amazon RDS event categories and event messages\" section of the [*Amazon RDS User Guide*](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Events.Messages.html) or the [*Amazon Aurora User Guide*](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Events.Messages.html) . You can also see this list by using the `DescribeEventCategories` operation.",
         "SnsTopicArn": "The Amazon Resource Name (ARN) of the SNS topic created for event notification. The ARN is created by Amazon SNS when you create a topic and subscribe to it.",
         "SourceIds": "The list of identifiers of the event sources for which events are returned. If not specified, then all sources are included in the response. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens. It can't end with a hyphen or contain two consecutive hyphens.\n\nConstraints:\n\n- If a `SourceIds` value is supplied, `SourceType` must also be provided.\n- If the source type is a DB instance, a `DBInstanceIdentifier` value must be supplied.\n- If the source type is a DB cluster, a `DBClusterIdentifier` value must be supplied.\n- If the source type is a DB parameter group, a `DBParameterGroupName` value must be supplied.\n- If the source type is a DB security group, a `DBSecurityGroupName` value must be supplied.\n- If the source type is a DB snapshot, a `DBSnapshotIdentifier` value must be supplied.\n- If the source type is a DB cluster snapshot, a `DBClusterSnapshotIdentifier` value must be supplied.",
         "SourceType": "The type of source that is generating the events. For example, if you want to be notified of events generated by a DB instance, set this parameter to `db-instance` . If this value isn't specified, all events are returned.\n\nValid values: `db-instance` | `db-cluster` | `db-parameter-group` | `db-security-group` | `db-snapshot` | `db-cluster-snapshot`"
@@ -33581,8 +33716,8 @@
         "RotateEncryptionKey": "",
         "SnapshotClusterIdentifier": "The name of the cluster the source snapshot was created from. This parameter is required if your IAM user has a policy containing a snapshot resource element that specifies anything other than * for the cluster name.",
         "SnapshotCopyGrantName": "The name of the snapshot copy grant.",
-        "SnapshotCopyManual": "",
-        "SnapshotCopyRetentionPeriod": "",
+        "SnapshotCopyManual": "Indicates whether to apply the snapshot retention period to newly copied manual snapshots instead of automated snapshots.",
+        "SnapshotCopyRetentionPeriod": "The number of days to retain automated snapshots in the destination AWS Region after they are copied from the source AWS Region .\n\nBy default, this only changes the retention period of copied automated snapshots.\n\nIf you decrease the retention period for automated snapshots that are copied to a destination AWS Region , Amazon Redshift deletes any existing automated snapshots that were copied to the destination AWS Region and that fall outside of the new retention period.\n\nConstraints: Must be at least 1 and no more than 35 for automated snapshots.\n\nIf you specify the `manual` option, only newly copied manual snapshots will have the new retention period.\n\nIf you specify the value of -1 newly copied manual snapshots are retained indefinitely.\n\nConstraints: The number of days must be either -1 or an integer between 1 and 3,653 for manual snapshots.",
         "SnapshotIdentifier": "The name of the snapshot from which to create the new cluster. This parameter isn't case sensitive.\n\nExample: `my-snapshot-id`",
         "Tags": "A list of tag instances.",
         "VpcSecurityGroupIds": "A list of Virtual Private Cloud (VPC) security groups to be associated with the cluster.\n\nDefault: The default VPC security group is associated with the cluster."

From 3d71e44840976f3667af879fde11be0b7ab6f80c Mon Sep 17 00:00:00 2001
From: AWS CDK Automation
 <43080478+aws-cdk-automation@users.noreply.github.com>
Date: Wed, 30 Mar 2022 10:51:27 -0400
Subject: [PATCH 11/19] chore: npm-check-updates && yarn upgrade (#19628)

Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
---
 .../@aws-cdk/assert-internal/package.json     |   2 +-
 packages/@aws-cdk/assert/package.json         |   2 +-
 packages/@aws-cdk/assertions/package.json     |   2 +-
 .../package.json                              |   2 +-
 .../aws-codepipeline-actions/package.json     |   2 +-
 packages/@aws-cdk/aws-dynamodb/package.json   |   2 +-
 packages/@aws-cdk/aws-eks/package.json        |   4 +-
 .../@aws-cdk/aws-lambda-nodejs/package.json   |   2 +-
 packages/@aws-cdk/aws-lambda/package.json     |   2 +-
 packages/@aws-cdk/aws-sam/package.json        |   2 +-
 .../@aws-cdk/cloudformation-diff/package.json |   2 +-
 .../cloudformation-include/package.json       |   2 +-
 packages/@aws-cdk/core/package.json           |   2 +-
 .../@monocdk-experiment/assert/package.json   |   2 +-
 packages/aws-cdk-lib/package.json             |   2 +-
 packages/aws-cdk/THIRD_PARTY_LICENSES         |   2 +-
 packages/aws-cdk/package.json                 |   4 +-
 tools/@aws-cdk/cdk-build-tools/package.json   |   2 +-
 tools/@aws-cdk/cfn2ts/package.json            |   2 +-
 tools/@aws-cdk/node-bundle/package.json       |   6 +-
 yarn.lock                                     | 565 +++++++++---------
 21 files changed, 311 insertions(+), 302 deletions(-)

diff --git a/packages/@aws-cdk/assert-internal/package.json b/packages/@aws-cdk/assert-internal/package.json
index b1074a77bd1a4..26857b92b9f77 100644
--- a/packages/@aws-cdk/assert-internal/package.json
+++ b/packages/@aws-cdk/assert-internal/package.json
@@ -28,7 +28,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.1",
     "jest": "^27.5.1",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "dependencies": {
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
diff --git a/packages/@aws-cdk/assert/package.json b/packages/@aws-cdk/assert/package.json
index dc22fd90c4d0d..153f87b7f98cb 100644
--- a/packages/@aws-cdk/assert/package.json
+++ b/packages/@aws-cdk/assert/package.json
@@ -41,7 +41,7 @@
     "aws-cdk-migration": "0.0.0",
     "constructs": "^3.3.69",
     "jest": "^27.3.1",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "dependencies": {
     "@aws-cdk/cloudformation-diff": "0.0.0",
diff --git a/packages/@aws-cdk/assertions/package.json b/packages/@aws-cdk/assertions/package.json
index 3c2533d04ae9d..f93da67271e60 100644
--- a/packages/@aws-cdk/assertions/package.json
+++ b/packages/@aws-cdk/assertions/package.json
@@ -68,7 +68,7 @@
     "@types/jest": "^27.4.1",
     "constructs": "^3.3.69",
     "jest": "^27.5.1",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "dependencies": {
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
diff --git a/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json b/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json
index 73d033977f520..75c89369c8199 100644
--- a/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json
+++ b/packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json
@@ -44,6 +44,6 @@
     "lambda-tester": "^3.6.0",
     "sinon": "^9.2.4",
     "nock": "^13.2.4",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   }
 }
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/package.json b/packages/@aws-cdk/aws-codepipeline-actions/package.json
index ada3c67d5f75e..b9d312c04ae38 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/package.json
+++ b/packages/@aws-cdk/aws-codepipeline-actions/package.json
@@ -84,7 +84,7 @@
     "@aws-cdk/cx-api": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.180",
+    "@types/lodash": "^4.14.181",
     "jest": "^27.5.1",
     "lodash": "^4.17.21"
   },
diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json
index 35af146c269fb..1b30eb1a07e6d 100644
--- a/packages/@aws-cdk/aws-dynamodb/package.json
+++ b/packages/@aws-cdk/aws-dynamodb/package.json
@@ -91,7 +91,7 @@
     "aws-sdk-mock": "5.6.0",
     "jest": "^27.5.1",
     "sinon": "^9.2.4",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "dependencies": {
     "@aws-cdk/aws-applicationautoscaling": "0.0.0",
diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json
index 4d152b3185a48..6585171d0ea0c 100644
--- a/packages/@aws-cdk/aws-eks/package.json
+++ b/packages/@aws-cdk/aws-eks/package.json
@@ -89,8 +89,8 @@
     "@types/sinon": "^9.0.11",
     "@types/yaml": "1.9.6",
     "aws-sdk": "^2.848.0",
-    "cdk8s": "^1.5.48",
-    "cdk8s-plus-21": "^1.0.0-beta.117",
+    "cdk8s": "^1.5.56",
+    "cdk8s-plus-21": "^1.0.0-beta.124",
     "jest": "^27.5.1",
     "sinon": "^9.2.4"
   },
diff --git a/packages/@aws-cdk/aws-lambda-nodejs/package.json b/packages/@aws-cdk/aws-lambda-nodejs/package.json
index 07b7240689e0c..f838c991dbcea 100644
--- a/packages/@aws-cdk/aws-lambda-nodejs/package.json
+++ b/packages/@aws-cdk/aws-lambda-nodejs/package.json
@@ -78,7 +78,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.1",
     "delay": "5.0.0",
-    "esbuild": "^0.14.27"
+    "esbuild": "^0.14.29"
   },
   "dependencies": {
     "@aws-cdk/aws-lambda": "0.0.0",
diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json
index abc009a1a7ece..3476070c68ac2 100644
--- a/packages/@aws-cdk/aws-lambda/package.json
+++ b/packages/@aws-cdk/aws-lambda/package.json
@@ -91,7 +91,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/aws-lambda": "^8.10.93",
     "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.180",
+    "@types/lodash": "^4.14.181",
     "jest": "^27.5.1",
     "lodash": "^4.17.21"
   },
diff --git a/packages/@aws-cdk/aws-sam/package.json b/packages/@aws-cdk/aws-sam/package.json
index bb86f7d0fceca..d8295d5f1aef8 100644
--- a/packages/@aws-cdk/aws-sam/package.json
+++ b/packages/@aws-cdk/aws-sam/package.json
@@ -86,7 +86,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.1",
     "jest": "^27.5.1",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",
diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json
index 6abf535167369..270fb182e3b1b 100644
--- a/packages/@aws-cdk/cloudformation-diff/package.json
+++ b/packages/@aws-cdk/cloudformation-diff/package.json
@@ -38,7 +38,7 @@
     "@types/string-width": "^4.0.1",
     "fast-check": "^2.23.2",
     "jest": "^27.5.1",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",
diff --git a/packages/@aws-cdk/cloudformation-include/package.json b/packages/@aws-cdk/cloudformation-include/package.json
index a5db6fec31576..9ea7741368e29 100644
--- a/packages/@aws-cdk/cloudformation-include/package.json
+++ b/packages/@aws-cdk/cloudformation-include/package.json
@@ -460,7 +460,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.1",
     "jest": "^27.5.1",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "bundledDependencies": [
     "yaml"
diff --git a/packages/@aws-cdk/core/package.json b/packages/@aws-cdk/core/package.json
index edc9d7450158e..35cdfcc8d0d46 100644
--- a/packages/@aws-cdk/core/package.json
+++ b/packages/@aws-cdk/core/package.json
@@ -181,7 +181,7 @@
     "@types/aws-lambda": "^8.10.93",
     "@types/fs-extra": "^8.1.2",
     "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.180",
+    "@types/lodash": "^4.14.181",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^10.17.60",
     "@types/sinon": "^9.0.11",
diff --git a/packages/@monocdk-experiment/assert/package.json b/packages/@monocdk-experiment/assert/package.json
index afbce52f06eb8..f32fe08ef148f 100644
--- a/packages/@monocdk-experiment/assert/package.json
+++ b/packages/@monocdk-experiment/assert/package.json
@@ -41,7 +41,7 @@
     "jest": "^27.5.1",
     "monocdk": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "ts-jest": "^27.1.3"
+    "ts-jest": "^27.1.4"
   },
   "dependencies": {
     "@aws-cdk/cloudformation-diff": "0.0.0"
diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
index 632d8357b9976..f73f17f8c6c52 100644
--- a/packages/aws-cdk-lib/package.json
+++ b/packages/aws-cdk-lib/package.json
@@ -356,7 +356,7 @@
     "@types/fs-extra": "^8.1.2",
     "@types/node": "^10.17.60",
     "constructs": "^3.3.69",
-    "esbuild": "^0.14.27",
+    "esbuild": "^0.14.29",
     "fs-extra": "^9.1.0",
     "ts-node": "^9.1.1",
     "typescript": "~3.8.3"
diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES
index f092db2c48acc..633c8be1c5002 100644
--- a/packages/aws-cdk/THIRD_PARTY_LICENSES
+++ b/packages/aws-cdk/THIRD_PARTY_LICENSES
@@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** aws-sdk@2.1098.0 - https://www.npmjs.com/package/aws-sdk/v/2.1098.0 | Apache-2.0
+** aws-sdk@2.1103.0 - https://www.npmjs.com/package/aws-sdk/v/2.1103.0 | Apache-2.0
 AWS SDK for JavaScript
 Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json
index 352948fa9b356..10f11cca662e6 100644
--- a/packages/aws-cdk/package.json
+++ b/packages/aws-cdk/package.json
@@ -83,10 +83,10 @@
     "nock": "^13.2.4",
     "@aws-cdk/pkglint": "0.0.0",
     "sinon": "^9.2.4",
-    "ts-jest": "^27.1.3",
+    "ts-jest": "^27.1.4",
     "ts-mock-imports": "^1.3.8",
     "xml-js": "^1.6.11",
-    "axios": "^0.25.0"
+    "axios": "^0.26.1"
   },
   "dependencies": {
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json
index c1ea6569169da..5a058eeacc90c 100644
--- a/tools/@aws-cdk/cdk-build-tools/package.json
+++ b/tools/@aws-cdk/cdk-build-tools/package.json
@@ -63,7 +63,7 @@
     "markdownlint-cli": "^0.31.1",
     "nyc": "^15.1.0",
     "semver": "^7.3.5",
-    "ts-jest": "^27.1.3",
+    "ts-jest": "^27.1.4",
     "typescript": "~3.9.10",
     "yargs": "^16.2.0"
   },
diff --git a/tools/@aws-cdk/cfn2ts/package.json b/tools/@aws-cdk/cfn2ts/package.json
index 43e1998fda404..cbe19657ab021 100644
--- a/tools/@aws-cdk/cfn2ts/package.json
+++ b/tools/@aws-cdk/cfn2ts/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "@aws-cdk/cfnspec": "0.0.0",
     "codemaker": "^1.55.1",
-    "fast-json-patch": "^3.1.0",
+    "fast-json-patch": "^3.1.1",
     "fs-extra": "^9.1.0",
     "yargs": "^16.2.0"
   },
diff --git a/tools/@aws-cdk/node-bundle/package.json b/tools/@aws-cdk/node-bundle/package.json
index 4661fc8ba3880..08ab165f2897f 100644
--- a/tools/@aws-cdk/node-bundle/package.json
+++ b/tools/@aws-cdk/node-bundle/package.json
@@ -41,13 +41,13 @@
     "jest-junit": "^13",
     "json-schema": "^0.4.0",
     "npm-check-updates": "^12",
-    "projen": "^0.53.8",
+    "projen": "^0.54.1",
     "standard-version": "^9",
-    "ts-jest": "^27.1.3",
+    "ts-jest": "^27.1.4",
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "esbuild": "^0.14.27",
+    "esbuild": "^0.14.29",
     "fs-extra": "^10.0.1",
     "license-checker": "^25.0.1",
     "madge": "^5.0.1",
diff --git a/yarn.lock b/yarn.lock
index 2ab94621685d5..dddaf06264d5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1843,9 +1843,9 @@
     pretty-format "^27.0.0"
 
 "@types/json-schema@*", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.9":
-  version "7.0.10"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23"
-  integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A==
+  version "7.0.11"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -1857,10 +1857,10 @@
   resolved "https://registry.npmjs.org/@types/license-checker/-/license-checker-25.0.3.tgz#fbe80df33f1ac9d4bc2d4c167da3c2fd2999eb73"
   integrity sha512-sFkIgeXh6HJR79DbTrZrsHWhfyr3q8v2Gswj3y0tRPEo57OEPVgDF/z/ePybHUGuSCwiDiAt/3YMta9ujUxQpQ==
 
-"@types/lodash@^4.14.180":
-  version "4.14.180"
-  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz#4ab7c9ddfc92ec4a887886483bc14c79fb380670"
-  integrity sha512-XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==
+"@types/lodash@^4.14.181":
+  version "4.14.181"
+  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz#d1d3740c379fda17ab175165ba04e2d03389385d"
+  integrity sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==
 
 "@types/madge@^5.0.0":
   version "5.0.0"
@@ -1902,9 +1902,9 @@
   integrity sha512-uv53RrNdhbkV/3VmVCtfImfYCWC3GTTRn3R11Whni3EJ+gb178tkZBVNj2edLY5CMrB749dQi+SJkg87jsN8UQ==
 
 "@types/node@*", "@types/node@>= 8":
-  version "17.0.22"
-  resolved "https://registry.npmjs.org/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e"
-  integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw==
+  version "17.0.23"
+  resolved "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
+  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
 
 "@types/node@^10.17.60":
   version "10.17.60"
@@ -1966,9 +1966,9 @@
     "@types/sinonjs__fake-timers" "*"
 
 "@types/sinonjs__fake-timers@*":
-  version "8.1.1"
-  resolved "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
-  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
+  version "8.1.2"
+  resolved "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e"
+  integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==
 
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
@@ -2052,13 +2052,13 @@
     tsutils "^3.21.0"
 
 "@typescript-eslint/eslint-plugin@^5":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.16.0.tgz#78f246dd8d1b528fc5bfca99a8a64d4023a3d86d"
-  integrity sha512-SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw==
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67"
+  integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.16.0"
-    "@typescript-eslint/type-utils" "5.16.0"
-    "@typescript-eslint/utils" "5.16.0"
+    "@typescript-eslint/scope-manager" "5.17.0"
+    "@typescript-eslint/type-utils" "5.17.0"
+    "@typescript-eslint/utils" "5.17.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -2089,13 +2089,13 @@
     debug "^4.3.1"
 
 "@typescript-eslint/parser@^5":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.16.0.tgz#e4de1bde4b4dad5b6124d3da227347616ed55508"
-  integrity sha512-fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA==
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5"
+  integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.16.0"
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/typescript-estree" "5.16.0"
+    "@typescript-eslint/scope-manager" "5.17.0"
+    "@typescript-eslint/types" "5.17.0"
+    "@typescript-eslint/typescript-estree" "5.17.0"
     debug "^4.3.2"
 
 "@typescript-eslint/scope-manager@4.33.0":
@@ -2106,20 +2106,20 @@
     "@typescript-eslint/types" "4.33.0"
     "@typescript-eslint/visitor-keys" "4.33.0"
 
-"@typescript-eslint/scope-manager@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz#7e7909d64bd0c4d8aef629cdc764b9d3e1d3a69a"
-  integrity sha512-P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ==
+"@typescript-eslint/scope-manager@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
+  integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==
   dependencies:
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/visitor-keys" "5.16.0"
+    "@typescript-eslint/types" "5.17.0"
+    "@typescript-eslint/visitor-keys" "5.17.0"
 
-"@typescript-eslint/type-utils@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.16.0.tgz#b482bdde1d7d7c0c7080f7f2f67ea9580b9e0692"
-  integrity sha512-SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ==
+"@typescript-eslint/type-utils@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672"
+  integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==
   dependencies:
-    "@typescript-eslint/utils" "5.16.0"
+    "@typescript-eslint/utils" "5.17.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
@@ -2128,10 +2128,10 @@
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
   integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==
 
-"@typescript-eslint/types@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee"
-  integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g==
+"@typescript-eslint/types@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
+  integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==
 
 "@typescript-eslint/typescript-estree@4.33.0", "@typescript-eslint/typescript-estree@^4.33.0":
   version "4.33.0"
@@ -2146,28 +2146,28 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz#32259459ec62f5feddca66adc695342f30101f61"
-  integrity sha512-SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ==
+"@typescript-eslint/typescript-estree@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488"
+  integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==
   dependencies:
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/visitor-keys" "5.16.0"
+    "@typescript-eslint/types" "5.17.0"
+    "@typescript-eslint/visitor-keys" "5.17.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.16.0.tgz#42218b459d6d66418a4eb199a382bdc261650679"
-  integrity sha512-iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ==
+"@typescript-eslint/utils@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306"
+  integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.16.0"
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/typescript-estree" "5.16.0"
+    "@typescript-eslint/scope-manager" "5.17.0"
+    "@typescript-eslint/types" "5.17.0"
+    "@typescript-eslint/typescript-estree" "5.17.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -2179,12 +2179,12 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz#f27dc3b943e6317264c7492e390c6844cd4efbbb"
-  integrity sha512-jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g==
+"@typescript-eslint/visitor-keys@5.17.0":
+  version "5.17.0"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
+  integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==
   dependencies:
-    "@typescript-eslint/types" "5.16.0"
+    "@typescript-eslint/types" "5.17.0"
     eslint-visitor-keys "^3.0.0"
 
 "@xmldom/xmldom@^0.8.1":
@@ -2571,9 +2571,9 @@ aws-sdk-mock@5.6.0:
     traverse "^0.6.6"
 
 aws-sdk@^2.1093.0, aws-sdk@^2.596.0, aws-sdk@^2.848.0, aws-sdk@^2.928.0:
-  version "2.1098.0"
-  resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1098.0.tgz#54f8c1592b57e545c3d010f68dc70f5c2ee9ebb5"
-  integrity sha512-h81SAgqAxij1db9zbFAXEneaC1LNcx/xIIf13tF/IutdYOzd7mQ3lHFCgjp+fB1Msl8z73Vs0VGstyrhK7+zPw==
+  version "2.1103.0"
+  resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1103.0.tgz#b0c69b8fd0a31729860bd9218f3c691d06240fcb"
+  integrity sha512-naSAcfoLs55byP8djBHXgZQF3pcsgyX815HSPYjqkzmlukbE9mCVoguUp5rbqLYbLgcnMw4tp2N4ohpBB3voIg==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -2602,12 +2602,12 @@ axios@^0.21.1:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
-  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+axios@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
+  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
   dependencies:
-    follow-redirects "^1.14.7"
+    follow-redirects "^1.14.8"
 
 babel-jest@^27.5.1:
   version "27.5.1"
@@ -2740,7 +2740,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.1, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2814,6 +2814,13 @@ builtins@^1.0.3:
   resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
+builtins@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/builtins/-/builtins-5.0.0.tgz#20d87e7f95d46481b1abe4adc616a9cb6b492cba"
+  integrity sha512-aizhtbxgT1Udg0Fj6GssXshAVK+nxbtCV+1OtTrMNy67jffDFBY6CUBAkhO4owbleAx6fdbnWdpsmmcXydbzNw==
+  dependencies:
+    semver "^7.0.0"
+
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
@@ -2853,7 +2860,7 @@ cacache@^15.0.5, cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^16.0.0:
+cacache@^16.0.0, cacache@^16.0.2:
   version "16.0.3"
   resolved "https://registry.npmjs.org/cacache/-/cacache-16.0.3.tgz#0b6314bde969bd4098b03a5f90a351e8a1483f48"
   integrity sha512-eC7wYodNCVb97kuHGk5P+xZsvUJHkhSEOyNwkenqQPAsOtrTjvWOE5vSPNBpz9d8X3acIf6w2Ub5s4rvOCTs4g==
@@ -2933,9 +2940,9 @@ camelcase@^6.2.0, camelcase@^6.3.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001317:
-  version "1.0.30001319"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f"
-  integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw==
+  version "1.0.30001322"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001322.tgz#2e4c09d11e1e8f852767dab287069a8d0c29d623"
+  integrity sha512-neRmrmIrCGuMnxGSoh+x7zYtQFFgnSY2jaomjU56sCkTA6JINqQrxutF459JpWcWRajvoyn95sOXq4Pqrnyjew==
 
 case@1.6.3, case@^1.6.3:
   version "1.6.3"
@@ -2959,17 +2966,17 @@ cdk-generate-synthetic-examples@^0.1.8:
     jsii-rosetta "^1.54.0"
     yargs "^17.3.1"
 
-cdk8s-plus-21@^1.0.0-beta.117:
-  version "1.0.0-beta.117"
-  resolved "https://registry.npmjs.org/cdk8s-plus-21/-/cdk8s-plus-21-1.0.0-beta.117.tgz#f85966b1c319f69b7c6083b85527f3d01490276a"
-  integrity sha512-JG4Es2cUNOqIESZTEa+Wt5NiBdSKitdT+ChYht8eiyUEJPEeBLSV3JunwJ2/djU+zISlxBSeMyllIcz0dH/+FQ==
+cdk8s-plus-21@^1.0.0-beta.124:
+  version "1.0.0-beta.124"
+  resolved "https://registry.npmjs.org/cdk8s-plus-21/-/cdk8s-plus-21-1.0.0-beta.124.tgz#46d02484aeedc9061a32060623ab9df060e52e97"
+  integrity sha512-ZOcx3pPdozpeY1wVoLeibrv5Scy+GpkDM7t9e/oufDtqRylcLr2zmJpWaHXH7FWH6qszt0FY3WSxMa+Cu7o5fw==
   dependencies:
     minimatch "^3.1.2"
 
-cdk8s@^1.5.48:
-  version "1.5.48"
-  resolved "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.48.tgz#3f7d22e8b7ed70fc7368ab937b2ad808cebc05a1"
-  integrity sha512-MK2aeCypFAIHo3/IUksr5qGqcaYTlm8IUCY4Ku02lRUfRzGEDCKWxOR3cVQkXr913kxZsMXX41eW/e9tsI6liw==
+cdk8s@^1.5.56:
+  version "1.5.56"
+  resolved "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.56.tgz#644ffddd1f2185e9679ad9ffae774f177e6e0371"
+  integrity sha512-CDbwGpLk7eopLgLY2IjxXmmWH34sg44/pRY5506ixzjBykLVR9nCqFTwtdcOuU+y3Hf+20kJV/MOijgzbaC7aA==
   dependencies:
     fast-json-patch "^2.2.1"
     follow-redirects "^1.14.9"
@@ -3318,9 +3325,9 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constructs@^3.3.69:
-  version "3.3.246"
-  resolved "https://registry.npmjs.org/constructs/-/constructs-3.3.246.tgz#8ca8ab9ca78e5173825db31f97a75fc03eaca383"
-  integrity sha512-Oxn8VTY7j0tZujcZhQM1WWYuwDsPlImnnFfGUEq8SPxIyPMywxlYUwNLtEYhuyXUHBR/BTxWyCPE8s6/0kkrRA==
+  version "3.3.253"
+  resolved "https://registry.npmjs.org/constructs/-/constructs-3.3.253.tgz#6f849901a035faddb2d9e187f4cfe337b5722870"
+  integrity sha512-GUdGIi27TtyQ4yvnodOkwyJpbNjnSAudbE3keexrDCeggP/7ZKjANXBH3FLPsca/5tEggK/iJDQdAI6pZ+PHMw==
 
 conventional-changelog-angular@^5.0.12:
   version "5.0.13"
@@ -4082,9 +4089,9 @@ ecc-jsbn@~0.1.1:
     safer-buffer "^2.1.0"
 
 electron-to-chromium@^1.4.84:
-  version "1.4.90"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.90.tgz#4a518590f118828d54fff045728f547fef08143f"
-  integrity sha512-ZwKgSA0mQMyEhz+NR0F8dRzkrCLeHLzLkjx/CWf16+zV85hQ6meXPQbKanvhnpkYb7b2uJNj+enQJ/N877ND4Q==
+  version "1.4.101"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.101.tgz#71f3a10065146d7445ba5d4c06ba2cc063b0817a"
+  integrity sha512-XJH+XmJjACx1S7ASl/b//KePcda5ocPnFH2jErztXcIS8LpP0SE6rX8ZxiY5/RaDPnaF1rj0fPaHfppzb0e2Aw==
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -4158,9 +4165,9 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+  version "1.19.2"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f"
+  integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
@@ -4168,15 +4175,15 @@ es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1:
     get-intrinsic "^1.1.1"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
     internal-slot "^1.0.3"
     is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
+    is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.1"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
     string.prototype.trimend "^1.0.4"
@@ -4247,131 +4254,131 @@ es6-weak-map@^2.0.3:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
-esbuild-android-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.27.tgz#b868bbd9955a92309c69df628d8dd1945478b45c"
-  integrity sha512-LuEd4uPuj/16Y8j6kqy3Z2E9vNY9logfq8Tq+oTE2PZVuNs3M1kj5Qd4O95ee66yDGb3isaOCV7sOLDwtMfGaQ==
-
-esbuild-android-arm64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.27.tgz#e7d6430555e8e9c505fd87266bbc709f25f1825c"
-  integrity sha512-E8Ktwwa6vX8q7QeJmg8yepBYXaee50OdQS3BFtEHKrzbV45H4foMOeEE7uqdjGQZFBap5VAqo7pvjlyA92wznQ==
-
-esbuild-darwin-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.27.tgz#4dc7484127564e89b4445c0a560a3cb50b3d68e1"
-  integrity sha512-czw/kXl/1ZdenPWfw9jDc5iuIYxqUxgQ/Q+hRd4/3udyGGVI31r29LCViN2bAJgGvQkqyLGVcG03PJPEXQ5i2g==
-
-esbuild-darwin-arm64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.27.tgz#469e59c665f84a8ed323166624c5e7b9b2d22ac1"
-  integrity sha512-BEsv2U2U4o672oV8+xpXNxN9bgqRCtddQC6WBh4YhXKDcSZcdNh7+6nS+DM2vu7qWIWNA4JbRG24LUUYXysimQ==
-
-esbuild-freebsd-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.27.tgz#895df03bf5f87094a56c9a5815bf92e591903d70"
-  integrity sha512-7FeiFPGBo+ga+kOkDxtPmdPZdayrSzsV9pmfHxcyLKxu+3oTcajeZlOO1y9HW+t5aFZPiv7czOHM4KNd0tNwCA==
-
-esbuild-freebsd-arm64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.27.tgz#0b72a41a6b8655e9a8c5608f2ec1afdcf6958441"
-  integrity sha512-8CK3++foRZJluOWXpllG5zwAVlxtv36NpHfsbWS7TYlD8S+QruXltKlXToc/5ZNzBK++l6rvRKELu/puCLc7jA==
-
-esbuild-linux-32@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.27.tgz#43b8ba3803b0bbe7f051869c6a8bf6de1e95de28"
-  integrity sha512-qhNYIcT+EsYSBClZ5QhLzFzV5iVsP1YsITqblSaztr3+ZJUI+GoK8aXHyzKd7/CKKuK93cxEMJPpfi1dfsOfdw==
-
-esbuild-linux-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.27.tgz#dc8072097327ecfadba1735562824ce8c05dd0bd"
-  integrity sha512-ESjck9+EsHoTaKWlFKJpPZRN26uiav5gkI16RuI8WBxUdLrrAlYuYSndxxKgEn1csd968BX/8yQZATYf/9+/qg==
-
-esbuild-linux-arm64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.27.tgz#c52b58cbe948426b1559910f521b0a3f396f10b8"
-  integrity sha512-no6Mi17eV2tHlJnqBHRLekpZ2/VYx+NfGxKcBE/2xOMYwctsanCaXxw4zapvNrGE9X38vefVXLz6YCF8b1EHiQ==
-
-esbuild-linux-arm@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.27.tgz#df869dbd67d4ee3a04b3c7273b6bd2b233e78a18"
-  integrity sha512-JnnmgUBdqLQO9hoNZQqNHFWlNpSX82vzB3rYuCJMhtkuaWQEmQz6Lec1UIxJdC38ifEghNTBsF9bbe8dFilnCw==
-
-esbuild-linux-mips64le@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.27.tgz#a2b646d9df368b01aa970a7b8968be6dd6b01d19"
-  integrity sha512-NolWP2uOvIJpbwpsDbwfeExZOY1bZNlWE/kVfkzLMsSgqeVcl5YMen/cedRe9mKnpfLli+i0uSp7N+fkKNU27A==
-
-esbuild-linux-ppc64le@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.27.tgz#9a21af766a0292578a3009c7408b8509cac7cefd"
-  integrity sha512-/7dTjDvXMdRKmsSxKXeWyonuGgblnYDn0MI1xDC7J1VQXny8k1qgNp6VmrlsawwnsymSUUiThhkJsI+rx0taNA==
-
-esbuild-linux-riscv64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.27.tgz#344a27f91568056a5903ad5841b447e00e78d740"
-  integrity sha512-D+aFiUzOJG13RhrSmZgrcFaF4UUHpqj7XSKrIiCXIj1dkIkFqdrmqMSOtSs78dOtObWiOrFCDDzB24UyeEiNGg==
-
-esbuild-linux-s390x@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.27.tgz#73a7309bd648a07ef58f069658f989a5096130db"
-  integrity sha512-CD/D4tj0U4UQjELkdNlZhQ8nDHU5rBn6NGp47Hiz0Y7/akAY5i0oGadhEIg0WCY/HYVXFb3CsSPPwaKcTOW3bg==
-
-esbuild-netbsd-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.27.tgz#482a587cdbd18a6c264a05136596927deb46c30a"
-  integrity sha512-h3mAld69SrO1VoaMpYl3a5FNdGRE/Nqc+E8VtHOag4tyBwhCQXxtvDDOAKOUQexBGca0IuR6UayQ4ntSX5ij1Q==
-
-esbuild-openbsd-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.27.tgz#e99f8cdc63f1628747b63edd124d53cf7796468d"
-  integrity sha512-xwSje6qIZaDHXWoPpIgvL+7fC6WeubHHv18tusLYMwL+Z6bEa4Pbfs5IWDtQdHkArtfxEkIZz77944z8MgDxGw==
-
-esbuild-sunos-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.27.tgz#8611d825bcb8239c78d57452e83253a71942f45c"
-  integrity sha512-/nBVpWIDjYiyMhuqIqbXXsxBc58cBVH9uztAOIfWShStxq9BNBik92oPQPJ57nzWXRNKQUEFWr4Q98utDWz7jg==
-
-esbuild-windows-32@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.27.tgz#c06374206d4d92dd31d4fda299b09f51a35e82f6"
-  integrity sha512-Q9/zEjhZJ4trtWhFWIZvS/7RUzzi8rvkoaS9oiizkHTTKd8UxFwn/Mm2OywsAfYymgUYm8+y2b+BKTNEFxUekw==
-
-esbuild-windows-64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.27.tgz#756631c1d301dfc0d1a887deed2459ce4079582f"
-  integrity sha512-b3y3vTSl5aEhWHK66ngtiS/c6byLf6y/ZBvODH1YkBM+MGtVL6jN38FdHUsZasCz9gFwYs/lJMVY9u7GL6wfYg==
-
-esbuild-windows-arm64@0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.27.tgz#ad7e187193dcd18768b16065a950f4441d7173f4"
-  integrity sha512-I/reTxr6TFMcR5qbIkwRGvldMIaiBu2+MP0LlD7sOlNXrfqIl9uNjsuxFPGEG4IRomjfQ5q8WT+xlF/ySVkqKg==
-
-esbuild@^0.14.27:
-  version "0.14.27"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.14.27.tgz#41fe0f1b6b68b9f77cac025009bc54bb96e616f1"
-  integrity sha512-MZQt5SywZS3hA9fXnMhR22dv0oPGh6QtjJRIYbgL1AeqAoQZE+Qn5ppGYQAoHv/vq827flj4tIJ79Mrdiwk46Q==
+esbuild-android-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.29.tgz#c0960c84c9b832bade20831515e89d32549d4769"
+  integrity sha512-tJuaN33SVZyiHxRaVTo1pwW+rn3qetJX/SRuc/83rrKYtyZG0XfsQ1ao1nEudIt9w37ZSNXR236xEfm2C43sbw==
+
+esbuild-android-arm64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.29.tgz#8eceb3abe5abde5489d6a5cbe6a7c1044f71115f"
+  integrity sha512-D74dCv6yYnMTlofVy1JKiLM5JdVSQd60/rQfJSDP9qvRAI0laPXIG/IXY1RG6jobmFMUfL38PbFnCqyI/6fPXg==
+
+esbuild-darwin-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.29.tgz#26f3f14102310ecb8f2d9351c5b7a47a60d2cc8a"
+  integrity sha512-+CJaRvfTkzs9t+CjGa0Oa28WoXa7EeLutQhxus+fFcu0MHhsBhlmeWHac3Cc/Sf/xPi1b2ccDFfzGYJCfV0RrA==
+
+esbuild-darwin-arm64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.29.tgz#6d2d89dfd937992649239711ed5b86e51b13bd89"
+  integrity sha512-5Wgz/+zK+8X2ZW7vIbwoZ613Vfr4A8HmIs1XdzRmdC1kG0n5EG5fvKk/jUxhNlrYPx1gSY7XadQ3l4xAManPSw==
+
+esbuild-freebsd-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.29.tgz#2cb41a0765d0040f0838280a213c81bbe62d6394"
+  integrity sha512-VTfS7Bm9QA12JK1YXF8+WyYOfvD7WMpbArtDj6bGJ5Sy5xp01c/q70Arkn596aGcGj0TvQRplaaCIrfBG1Wdtg==
+
+esbuild-freebsd-arm64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.29.tgz#e1b79fbb63eaeff324cf05519efa7ff12ce4586a"
+  integrity sha512-WP5L4ejwLWWvd3Fo2J5mlXvG3zQHaw5N1KxFGnUc4+2ZFZknP0ST63i0IQhpJLgEJwnQpXv2uZlU1iWZjFqEIg==
+
+esbuild-linux-32@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.29.tgz#a4a5a0b165b15081bc3227986e10dd4943edb7d6"
+  integrity sha512-4myeOvFmQBWdI2U1dEBe2DCSpaZyjdQtmjUY11Zu2eQg4ynqLb8Y5mNjNU9UN063aVsCYYfbs8jbken/PjyidA==
+
+esbuild-linux-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.29.tgz#4c450088c84f8bfd22c51d116f59416864b85481"
+  integrity sha512-iaEuLhssReAKE7HMwxwFJFn7D/EXEs43fFy5CJeA4DGmU6JHh0qVJD2p/UP46DvUXLRKXsXw0i+kv5TdJ1w5pg==
+
+esbuild-linux-arm64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.29.tgz#d1a23993b26cb1f63f740329b2fc09218e498bd1"
+  integrity sha512-KYf7s8wDfUy+kjKymW3twyGT14OABjGHRkm9gPJ0z4BuvqljfOOUbq9qT3JYFnZJHOgkr29atT//hcdD0Pi7Mw==
+
+esbuild-linux-arm@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.29.tgz#a7e2fea558525eab812b1fe27d7a2659cd1bb723"
+  integrity sha512-OXa9D9QL1hwrAnYYAHt/cXAuSCmoSqYfTW/0CEY0LgJNyTxJKtqc5mlwjAZAvgyjmha0auS/sQ0bXfGf2wAokQ==
+
+esbuild-linux-mips64le@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.29.tgz#e708c527f0785574e400828cdbed3d9b17b5ddff"
+  integrity sha512-05jPtWQMsZ1aMGfHOvnR5KrTvigPbU35BtuItSSWLI2sJu5VrM8Pr9Owym4wPvA4153DFcOJ1EPN/2ujcDt54g==
+
+esbuild-linux-ppc64le@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.29.tgz#0137d1b38beae36a57176ef45e90740e734df502"
+  integrity sha512-FYhBqn4Ir9xG+f6B5VIQVbRuM4S6qwy29dDNYFPoxLRnwTEKToIYIUESN1qHyUmIbfO0YB4phG2JDV2JDN9Kgw==
+
+esbuild-linux-riscv64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.29.tgz#a2f73235347a58029dcacf0fb91c9eb8bebc8abb"
+  integrity sha512-eqZMqPehkb4nZcffnuOpXJQdGURGd6GXQ4ZsDHSWyIUaA+V4FpMBe+5zMPtXRD2N4BtyzVvnBko6K8IWWr36ew==
+
+esbuild-linux-s390x@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.29.tgz#0f7310ff1daec463ead9b9e26b7aa083a9f9f1ee"
+  integrity sha512-o7EYajF1rC/4ho7kpSG3gENVx0o2SsHm7cJ5fvewWB/TEczWU7teDgusGSujxCYcMottE3zqa423VTglNTYhjg==
+
+esbuild-netbsd-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.29.tgz#ba9a0d9cb8aed73b684825126927f75d4fe44ff9"
+  integrity sha512-/esN6tb6OBSot6+JxgeOZeBk6P8V/WdR3GKBFeFpSqhgw4wx7xWUqPrdx4XNpBVO7X4Ipw9SAqgBrWHlXfddww==
+
+esbuild-openbsd-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.29.tgz#36dbe2c32d899106791b5f3af73f359213f71b8a"
+  integrity sha512-jUTdDzhEKrD0pLpjmk0UxwlfNJNg/D50vdwhrVcW/D26Vg0hVbthMfb19PJMatzclbK7cmgk1Nu0eNS+abzoHw==
+
+esbuild-sunos-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.29.tgz#e5f857c121441ec63bf9b399a2131409a7d344e5"
+  integrity sha512-EfhQN/XO+TBHTbkxwsxwA7EfiTHFe+MNDfxcf0nj97moCppD9JHPq48MLtOaDcuvrTYOcrMdJVeqmmeQ7doTcg==
+
+esbuild-windows-32@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.29.tgz#9c2f1ab071a828f3901d1d79d205982a74bdda6e"
+  integrity sha512-uoyb0YAJ6uWH4PYuYjfGNjvgLlb5t6b3zIaGmpWPOjgpr1Nb3SJtQiK4YCPGhONgfg2v6DcJgSbOteuKXhwqAw==
+
+esbuild-windows-64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.29.tgz#85fbce7c2492521896451b98d649a7db93e52667"
+  integrity sha512-X9cW/Wl95QjsH8WUyr3NqbmfdU72jCp71cH3pwPvI4CgBM2IeOUDdbt6oIGljPu2bf5eGDIo8K3Y3vvXCCTd8A==
+
+esbuild-windows-arm64@0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.29.tgz#0aa7a9a1bc43a63350bcf574d94b639176f065b5"
+  integrity sha512-+O/PI+68fbUZPpl3eXhqGHTGK7DjLcexNnyJqtLZXOFwoAjaXlS5UBCvVcR3o2va+AqZTj8o6URaz8D2K+yfQQ==
+
+esbuild@^0.14.29:
+  version "0.14.29"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.14.29.tgz#24ad09c0674cbcb4aa2fe761485524eb1f6b1419"
+  integrity sha512-SQS8cO8xFEqevYlrHt6exIhK853Me4nZ4aMW6ieysInLa0FMAL+AKs87HYNRtR2YWRcEIqoXAHh+Ytt5/66qpg==
   optionalDependencies:
-    esbuild-android-64 "0.14.27"
-    esbuild-android-arm64 "0.14.27"
-    esbuild-darwin-64 "0.14.27"
-    esbuild-darwin-arm64 "0.14.27"
-    esbuild-freebsd-64 "0.14.27"
-    esbuild-freebsd-arm64 "0.14.27"
-    esbuild-linux-32 "0.14.27"
-    esbuild-linux-64 "0.14.27"
-    esbuild-linux-arm "0.14.27"
-    esbuild-linux-arm64 "0.14.27"
-    esbuild-linux-mips64le "0.14.27"
-    esbuild-linux-ppc64le "0.14.27"
-    esbuild-linux-riscv64 "0.14.27"
-    esbuild-linux-s390x "0.14.27"
-    esbuild-netbsd-64 "0.14.27"
-    esbuild-openbsd-64 "0.14.27"
-    esbuild-sunos-64 "0.14.27"
-    esbuild-windows-32 "0.14.27"
-    esbuild-windows-64 "0.14.27"
-    esbuild-windows-arm64 "0.14.27"
+    esbuild-android-64 "0.14.29"
+    esbuild-android-arm64 "0.14.29"
+    esbuild-darwin-64 "0.14.29"
+    esbuild-darwin-arm64 "0.14.29"
+    esbuild-freebsd-64 "0.14.29"
+    esbuild-freebsd-arm64 "0.14.29"
+    esbuild-linux-32 "0.14.29"
+    esbuild-linux-64 "0.14.29"
+    esbuild-linux-arm "0.14.29"
+    esbuild-linux-arm64 "0.14.29"
+    esbuild-linux-mips64le "0.14.29"
+    esbuild-linux-ppc64le "0.14.29"
+    esbuild-linux-riscv64 "0.14.29"
+    esbuild-linux-s390x "0.14.29"
+    esbuild-netbsd-64 "0.14.29"
+    esbuild-openbsd-64 "0.14.29"
+    esbuild-sunos-64 "0.14.29"
+    esbuild-windows-32 "0.14.29"
+    esbuild-windows-64 "0.14.29"
+    esbuild-windows-arm64 "0.14.29"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -4607,9 +4614,9 @@ eslint@^7.32.0:
     v8-compile-cache "^2.0.3"
 
 eslint@^8:
-  version "8.11.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37"
-  integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==
+  version "8.12.0"
+  resolved "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e"
+  integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==
   dependencies:
     "@eslint/eslintrc" "^1.2.1"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -4831,10 +4838,10 @@ fast-json-patch@^2.2.1:
   dependencies:
     fast-deep-equal "^2.0.1"
 
-fast-json-patch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz#ec8cd9b9c4c564250ec8b9140ef7a55f70acaee6"
-  integrity sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==
+fast-json-patch@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
+  integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
 
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -4991,16 +4998,11 @@ flatten@^1.0.2:
   resolved "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.9:
+follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.14.9:
   version "1.14.9"
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
   integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
 
-follow-redirects@^1.14.7:
-  version "1.14.8"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
-  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
-
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -5139,9 +5141,9 @@ functional-red-black-tree@^1.0.1:
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
 gauge@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz#286cf105c1962c659f0963058fb05116c1b82d3f"
-  integrity sha512-ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw==
+  version "4.0.4"
+  resolved "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
     color-support "^1.1.3"
@@ -5471,7 +5473,7 @@ has-flag@^4.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2:
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -5891,7 +5893,7 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-negative-zero@^2.0.1:
+is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
@@ -6067,7 +6069,7 @@ is-weakmap@^2.0.1:
   resolved "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
   integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
-is-weakref@^1.0.1:
+is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
@@ -7283,9 +7285,9 @@ lru-cache@^6.0.0:
     yallist "^4.0.0"
 
 lru-cache@^7.3.1, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.7.1"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz#03d2846b1ad2dcc7931a9340b8711d9798fcb0c6"
-  integrity sha512-cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==
+  version "7.7.2"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.2.tgz#9a31f924b96e0e238c1f981bf3fcc2563aafb5f0"
+  integrity sha512-WkdIOIF7HkfVHXxKLjhH6lyAxSFoSO5NZpZS9cH8Oe5rAI2ZDrVmIweDAZUHqIhl0zasQUprVVR8uv2yggYYvw==
 
 lru-queue@^0.1.0:
   version "0.1.0"
@@ -7348,17 +7350,17 @@ make-error@1.x, make-error@^1.1.1:
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
-  version "10.0.6"
-  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.6.tgz#671269de09cc51208413460898efb7b36adf5534"
-  integrity sha512-4Gfh6lV3TLXmj7qz79hBFuvVqjYSMW6v2+sxtdX4LFQU0rK3V/txRjE0DoZb7X0IF3t9f8NO3CxPSWlvdckhVA==
+  version "10.1.1"
+  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz#d93e9241e580ebe0b2b7294b2d1b79ab4e5adfa4"
+  integrity sha512-3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==
   dependencies:
     agentkeepalive "^4.2.1"
-    cacache "^16.0.0"
+    cacache "^16.0.2"
     http-cache-semantics "^4.1.0"
     http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.5.1"
+    lru-cache "^7.7.1"
     minipass "^3.1.6"
     minipass-collect "^1.0.2"
     minipass-fetch "^2.0.3"
@@ -7537,12 +7539,12 @@ merge2@^1.3.0, merge2@^1.4.1:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
 mime-db@1.52.0:
   version "1.52.0"
@@ -7630,9 +7632,9 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
     encoding "^0.1.12"
 
 minipass-fetch@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.3.tgz#688bbd0c2b019642778dc808b6950dd908d192b3"
-  integrity sha512-VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ==
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
+  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
   dependencies:
     minipass "^3.1.6"
     minipass-sized "^1.0.3"
@@ -7791,9 +7793,9 @@ mute-stream@0.0.8, mute-stream@~0.0.4:
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 nanoid@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
-  integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
+  version "3.3.2"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557"
+  integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -8075,13 +8077,13 @@ npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-pack
     validate-npm-package-name "^3.0.0"
 
 npm-package-arg@^9.0.0, npm-package-arg@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.1.tgz#db9c6379c45d79db88ee6dd40d3ec6a9d9a4d13a"
-  integrity sha512-Xs9wznfEAmZAR61qsYH3iN24V/qMYYkvAR5CRQNMvC6PjN2fHtO8y9XP/xdp5K+Icx+u1wMBMgWRPCmAEChSog==
+  version "9.0.2"
+  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.2.tgz#f3ef7b1b3b02e82564af2d5228b4c36567dcd389"
+  integrity sha512-v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g==
   dependencies:
     hosted-git-info "^5.0.0"
     semver "^7.3.5"
-    validate-npm-package-name "^3.0.0"
+    validate-npm-package-name "^4.0.0"
 
 npm-packlist@^2.1.4:
   version "2.2.2"
@@ -8249,7 +8251,7 @@ object-assign@^4.1.0:
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
+object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
@@ -8751,7 +8753,7 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -8886,9 +8888,9 @@ printj@~1.3.1:
   integrity sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==
 
 proc-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/proc-log/-/proc-log-2.0.0.tgz#25f8cb346a5d08e27f2422b3ca6ba8379bcbf8ba"
-  integrity sha512-I/35MfCX2H8jBUhKN8JB8nmqvQo/nKdrBodBY7L3RhDSPPyvOHwLYNmPuhwuJq7a7C3vgFKWGQM+ecPStcvOHA==
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -8907,10 +8909,10 @@ progress@^2.0.0, progress@^2.0.3:
   resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-projen@^0.53.8:
-  version "0.53.8"
-  resolved "https://registry.npmjs.org/projen/-/projen-0.53.8.tgz#516d40d4eeecb5f84be3785f1888c6d94eb86b8a"
-  integrity sha512-Td9hmC6SLfV9aZBuZ2+u2N9jU4QcYAbigIGiGFzcAfe9XCApJ23Jrhm8NDN83hQb4UIovhpWxlhYmhKWoZsqvw==
+projen@^0.54.1:
+  version "0.54.1"
+  resolved "https://registry.npmjs.org/projen/-/projen-0.54.1.tgz#c231e34b44c1bc27f694e9fc2d7572dc8efc1ccc"
+  integrity sha512-xIbfzGeuUKMtTNU5DHg5aMFpdwiBca7O53e6IYtj2oEMOoMKz74TrpegXq2Plez9pOwlJQqOUh8WiDPvzVSbtQ==
   dependencies:
     "@iarna/toml" "^2.2.5"
     case "^1.6.3"
@@ -9585,7 +9587,7 @@ semver-utils@^1.1.4:
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -10380,10 +10382,10 @@ trim-newlines@^3.0.0:
   resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-ts-jest@^27.1.3:
-  version "27.1.3"
-  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.3.tgz#1f723e7e74027c4da92c0ffbd73287e8af2b2957"
-  integrity sha512-6Nlura7s6uM9BVUAoqLH7JHyMXjz8gluryjpPXxr3IxZdAXnU6FhjvVLHFtfd1vsE1p8zD1OJfskkc0jhTSnkA==
+ts-jest@^27.1.4:
+  version "27.1.4"
+  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.4.tgz#84d42cf0f4e7157a52e7c64b1492c46330943e00"
+  integrity sha512-qjkZlVPWVctAezwsOD1OPzbZ+k7zA5z3oxII4dGdZo5ggX/PL7kvwTM0pXTr10fAtbiVpJaL3bWd502zAhpgSQ==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
@@ -10564,9 +10566,9 @@ typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7, typescript@~3.9.10:
   integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
 
 typescript@^4.5.5:
-  version "4.6.2"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
-  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
+  version "4.6.3"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
 typescript@~3.8.3:
   version "3.8.3"
@@ -10779,6 +10781,13 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+  dependencies:
+    builtins "^5.0.0"
+
 vandium-utils@^1.1.1:
   version "1.2.0"
   resolved "https://registry.npmjs.org/vandium-utils/-/vandium-utils-1.2.0.tgz#44735de4b7641a05de59ebe945f174e582db4f59"
@@ -11143,9 +11152,9 @@ yaml@2.0.0-7:
   integrity sha512-RbI2Tm3hl9AoHY4wWyWvGvJfFIbHOzuzaxum6ez1A0vve+uXgNor03Wys4t+2sgjJSVSe+B2xerd1/dnvqHlOA==
 
 yaml@next:
-  version "2.0.0-10"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-2.0.0-10.tgz#d5b59e2d14b8683313a534f2bbc648e211a2753e"
-  integrity sha512-FHV8s5ODFFQXX/enJEU2EkanNl1UDBUz8oa4k5Qo/sR+Iq7VmhCDkRMb0/mjJCNeAWQ31W8WV6PYStDE4d9EIw==
+  version "2.0.0-11"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-2.0.0-11.tgz#269af42637a41ec1ebf2abb546a28949545f0cbb"
+  integrity sha512-5kGSQrzDyjCk0BLuFfjkoUE9vYcoyrwZIZ+GnpOSM9vhkvPjItYiWJ1jpRSo0aU4QmsoNrFwDT4O7XS2UGcBQg==
 
 yargs-parser@20.2.4:
   version "20.2.4"

From a81a0a45d72bf297c60ad01c7e5f84ea11b8cb61 Mon Sep 17 00:00:00 2001
From: Christopher Rybicki <rybickic@amazon.com>
Date: Wed, 30 Mar 2022 11:34:25 -0700
Subject: [PATCH 12/19] docs(ec2): remove references to deprecated
 allowAllTraffic parameter (#18970)

allowAllTraffic is not available in CDK v2 (and it has been deprecated in CDK v1), so the example code snippets should refer to the newer parameter defaultAllowedTraffic instead.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-ec2/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/@aws-cdk/aws-ec2/README.md b/packages/@aws-cdk/aws-ec2/README.md
index 20b9dab23c434..1e0f2919573db 100644
--- a/packages/@aws-cdk/aws-ec2/README.md
+++ b/packages/@aws-cdk/aws-ec2/README.md
@@ -199,15 +199,16 @@ MachineImage.genericLinux({ ... })` and configure the right AMI ID for the
 regions you want to deploy to.
 
 By default, the NAT instances will route all traffic. To control what traffic
-gets routed, pass `allowAllTraffic: false` and access the
-`NatInstanceProvider.connections` member after having passed it to the VPC:
+gets routed, pass a custom value for `defaultAllowedTraffic` and access the
+`NatInstanceProvider.connections` member after having passed the NAT provider to
+the VPC:
 
 ```ts
 declare const instanceType: ec2.InstanceType;
 
 const provider = ec2.NatProvider.instance({
   instanceType,
-  allowAllTraffic: false,
+  defaultAllowedTraffic: ec2.NatTrafficDirection.OUTBOUND_ONLY,
 });
 new ec2.Vpc(this, 'TheVPC', {
   natGatewayProvider: provider,

From e7f43d1a3bb52bbf589d7472c9a9b89e3c1cc8c1 Mon Sep 17 00:00:00 2001
From: Cory Hall <43035978+corymhall@users.noreply.github.com>
Date: Wed, 30 Mar 2022 15:45:38 -0400
Subject: [PATCH 13/19] feat: add new integration test runner (#19529)

Creating this PR so that we can iterate on the design of the integration
test runner.

We will create two packages (names up for debate)

1. `@aws-cdk/integ-runner` (this PR)
CLI tool that will execute integration tests

2. `@aws-cdk/integ-tests` (future PR)
Library that is used to create integration test cases. This library will
synthesize an assembly file that will be consumed by the runner.

This PR does not yet implement running new style integration tests (generated from the `@aws-cdk/integ-tests` library).
The initial implementation of the runner will only work on the legacy (i.e. existing) integration tests.


----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../cloud-assembly-schema/lib/index.ts        |   1 +
 .../lib/integ-tests/commands/common.ts        | 202 ++++++
 .../lib/integ-tests/commands/deploy.ts        |  97 +++
 .../lib/integ-tests/commands/destroy.ts       |  20 +
 .../lib/integ-tests/commands/index.ts         |   3 +
 .../lib/integ-tests/index.ts                  |   3 +
 .../lib/integ-tests/schema.ts                 |  26 +
 .../lib/integ-tests/test-case.ts              | 186 ++++++
 .../cloud-assembly-schema/lib/manifest.ts     |  24 +-
 .../schema/cloud-assembly.version.json        |   2 +-
 .../schema/integ.schema.json                  | 474 ++++++++++++++
 .../scripts/update-schema.ts                  |   1 +
 .../test/integ-tests.test.ts                  | 137 ++++
 packages/@aws-cdk/integ-runner/.eslintrc.js   |   3 +
 packages/@aws-cdk/integ-runner/.gitignore     |  28 +
 packages/@aws-cdk/integ-runner/.npmignore     |  30 +
 packages/@aws-cdk/integ-runner/LICENSE        | 201 ++++++
 packages/@aws-cdk/integ-runner/NOTICE         |   2 +
 packages/@aws-cdk/integ-runner/README.md      | 161 +++++
 .../@aws-cdk/integ-runner/bin/integ-runner    |   2 +
 .../@aws-cdk/integ-runner/bin/integ-runner.ts | 169 +++++
 packages/@aws-cdk/integ-runner/jest.config.js |  10 +
 .../integ-runner/lib/runner/integ-tests.ts    |  76 +++
 .../lib/runner/private/canonicalize-assets.ts |  71 ++
 .../lib/runner/private/cloud-assembly.ts      |  66 ++
 .../lib/runner/private/integ-manifest.ts      |  76 +++
 .../integ-runner/lib/runner/private/logger.ts |  20 +
 .../integ-runner/lib/runner/runners.ts        | 606 ++++++++++++++++++
 .../integ-runner/lib/workers/common.ts        | 119 ++++
 .../lib/workers/extract_worker.ts             |  35 +
 .../lib/workers/integ-snapshot-worker.ts      |  51 ++
 .../lib/workers/integ-test-worker.ts          | 124 ++++
 packages/@aws-cdk/integ-runner/package.json   |  79 +++
 .../test/runner/integration-tests.test.ts     |  15 +
 .../integ-runner/test/runner/runners.test.ts  | 324 ++++++++++
 .../cdk.out                                   |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  54 ++
 .../tree.json                                 | 114 ++++
 .../cdk.out                                   |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  54 ++
 .../tree.json                                 | 114 ++++
 .../cdk-integ.out.test-with-snapshot/cdk.out  |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  54 ++
 .../tree.json                                 | 114 ++++
 .../test/test-data/integ.integ-test1.ts       |   2 +
 .../test/test-data/integ.integ-test2.ts       |   1 +
 .../integ.test-with-snapshot-assets-diff.ts   |   1 +
 .../integ.test-with-snapshot-assets.ts        |   1 +
 .../test-data/integ.test-with-snapshot.ts     |   2 +
 .../test/test-data/not.integ-test.ts          |   0
 .../cdk.out                                   |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  68 ++
 .../tree.json                                 | 114 ++++
 .../cdk.out                                   |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  68 ++
 .../tree.json                                 | 114 ++++
 .../cdk.out                                   |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  54 ++
 .../tree.json                                 | 114 ++++
 .../test-with-snapshot.integ.snapshot/cdk.out |   1 +
 .../manifest.json                             |  57 ++
 .../test-stack.template.json                  |  54 ++
 .../tree.json                                 | 114 ++++
 .../test/workers/mock-extract_worker.ts       |  15 +
 .../integ-runner/test/workers/workers.test.ts | 266 ++++++++
 packages/@aws-cdk/integ-runner/tsconfig.json  |  28 +
 packages/cdk-cli-wrapper/lib/cdk-wrapper.ts   |  22 +-
 .../cdk-cli-wrapper/lib/commands/common.ts    |  15 +-
 .../cdk-cli-wrapper/test/cdk-wrapper.test.ts  |  18 +-
 .../cdk-build-tools/lib/package-info.ts       |   1 +
 yarn.lock                                     |   7 +
 77 files changed, 5413 insertions(+), 20 deletions(-)
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/common.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/deploy.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/destroy.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/index.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/index.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/schema.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/test-case.ts
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/schema/integ.schema.json
 create mode 100644 packages/@aws-cdk/cloud-assembly-schema/test/integ-tests.test.ts
 create mode 100644 packages/@aws-cdk/integ-runner/.eslintrc.js
 create mode 100644 packages/@aws-cdk/integ-runner/.gitignore
 create mode 100644 packages/@aws-cdk/integ-runner/.npmignore
 create mode 100644 packages/@aws-cdk/integ-runner/LICENSE
 create mode 100644 packages/@aws-cdk/integ-runner/NOTICE
 create mode 100644 packages/@aws-cdk/integ-runner/README.md
 create mode 100755 packages/@aws-cdk/integ-runner/bin/integ-runner
 create mode 100644 packages/@aws-cdk/integ-runner/bin/integ-runner.ts
 create mode 100644 packages/@aws-cdk/integ-runner/jest.config.js
 create mode 100644 packages/@aws-cdk/integ-runner/lib/runner/integ-tests.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/runner/private/canonicalize-assets.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/runner/private/cloud-assembly.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/runner/private/integ-manifest.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/runner/private/logger.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/runner/runners.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/workers/common.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/workers/extract_worker.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/workers/integ-snapshot-worker.ts
 create mode 100644 packages/@aws-cdk/integ-runner/lib/workers/integ-test-worker.ts
 create mode 100644 packages/@aws-cdk/integ-runner/package.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/runner/integration-tests.test.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/runner/runners.test.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test1.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test2.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets-diff.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/not.integ-test.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/cdk.out
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/manifest.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/test-stack.template.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/tree.json
 create mode 100644 packages/@aws-cdk/integ-runner/test/workers/mock-extract_worker.ts
 create mode 100644 packages/@aws-cdk/integ-runner/test/workers/workers.test.ts
 create mode 100644 packages/@aws-cdk/integ-runner/tsconfig.json

diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/index.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/index.ts
index 50c2dc35a5eab..5fd6eb6ceda07 100644
--- a/packages/@aws-cdk/cloud-assembly-schema/lib/index.ts
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/index.ts
@@ -1,3 +1,4 @@
 export * from './cloud-assembly';
 export * from './assets';
 export * from './manifest';
+export * from './integ-tests';
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/common.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/common.ts
new file mode 100644
index 0000000000000..01ab969b63098
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/common.ts
@@ -0,0 +1,202 @@
+/**
+ * In what scenarios should the CLI ask for approval
+ */
+export enum RequireApproval {
+  /**
+   * Never ask for approval
+   */
+  NEVER = 'never',
+
+  /**
+   * Prompt for approval for any type  of change to the stack
+   */
+  ANYCHANGE = 'any-change',
+
+  /**
+   * Only prompt for approval if there are security related changes
+   */
+  BROADENING = 'broadening'
+}
+
+/**
+ * Default CDK CLI options that apply to all commands
+ */
+export interface DefaultCdkOptions {
+  /**
+   * List of stacks to deploy
+   *
+   * Requried if `all` is not set
+   *
+   * @default - []
+   */
+  readonly stacks?: string[];
+
+  /**
+   * Deploy all stacks
+   *
+   * Requried if `stacks` is not set
+   *
+   * @default - false
+   */
+  readonly all?: boolean;
+
+  /**
+   * command-line for executing your app or a cloud assembly directory
+   * e.g. "node bin/my-app.js"
+   * or
+   * "cdk.out"
+   *
+   * @default - read from cdk.json
+   */
+  readonly app?: string;
+
+
+  /**
+   * Role to pass to CloudFormation for deployment
+   *
+   * @default - use the bootstrap cfn-exec role
+   */
+  readonly roleArn?: string;
+
+  /**
+   * Additional context
+   *
+   * @default - no additional context
+   */
+  readonly context?: { [name: string]: string };
+
+  /**
+   * Print trace for stack warnings
+   *
+   * @default false
+   */
+  readonly trace?: boolean;
+
+  /**
+   * Do not construct stacks with warnings
+   *
+   * @default false
+   */
+  readonly strict?: boolean;
+
+  /**
+   * Perform context lookups.
+   *
+   * Synthesis fails if this is disabled and context lookups need
+   * to be performed
+   *
+   * @default true
+   */
+  readonly lookups?: boolean;
+
+  /**
+    * Ignores synthesis errors, which will likely produce an invalid output
+   *
+   * @default false
+   */
+  readonly ignoreErrors?: boolean;
+
+  /**
+   * Use JSON output instead of YAML when templates are printed
+   * to STDOUT
+   *
+   * @default false
+   */
+  readonly json?: boolean;
+
+  /**
+   * show debug logs
+   *
+   * @default false
+   */
+  readonly verbose?: boolean;
+
+  /**
+   * enable emission of additional debugging information, such as creation stack
+   * traces of tokens
+   *
+   * @default false
+   */
+  readonly debug?: boolean;
+
+  /**
+   * Use the indicated AWS profile as the default environment
+   *
+   * @default - no profile is used
+   */
+  readonly profile?: string;
+
+  /**
+   * Use the indicated proxy. Will read from
+   * HTTPS_PROXY environment if specified
+   *
+   * @default - no proxy
+   */
+  readonly proxy?: string;
+
+  /**
+   * Path to CA certificate to use when validating HTTPS
+   * requests.
+   *
+   * @default - read from AWS_CA_BUNDLE environment variable
+   */
+  readonly caBundlePath?: string;
+
+  /**
+   * Force trying to fetch EC2 instance credentials
+   *
+   * @default - guess EC2 instance status
+   */
+  readonly ec2Creds?: boolean;
+
+  /**
+   * Include "AWS::CDK::Metadata" resource in synthesized templates
+   *
+   * @default true
+   */
+  readonly versionReporting?: boolean;
+
+  /**
+   * Include "aws:cdk:path" CloudFormation metadata for each resource
+   *
+   * @default true
+   */
+  readonly pathMetadata?: boolean;
+
+  /**
+   * Include "aws:asset:*" CloudFormation metadata for resources that use assets
+   *
+   * @default true
+   */
+  readonly assetMetadata?: boolean;
+
+  /**
+   * Copy assets to the output directory
+   *
+   * Needed for local debugging the source files with SAM CLI
+   *
+   * @default false
+   */
+  readonly staging?: boolean;
+
+  /**
+   * Emits the synthesized cloud assembly into a directory
+   *
+   * @default cdk.out
+   */
+  readonly output?: string;
+
+  /**
+   * Show relevant notices
+   *
+   * @default true
+   */
+  readonly notices?: boolean;
+
+  /**
+   * Show colors and other style from console output
+   *
+   * @default true
+   */
+  readonly color?: boolean;
+}
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/deploy.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/deploy.ts
new file mode 100644
index 0000000000000..09a20c610f12d
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/deploy.ts
@@ -0,0 +1,97 @@
+import { DefaultCdkOptions, RequireApproval } from './common';
+
+/**
+ * Options to use with cdk deploy
+ */
+export interface DeployOptions extends DefaultCdkOptions {
+  /**
+   * Only perform action on the given stack
+   *
+   * @default false
+   */
+  readonly exclusively?: boolean;
+
+  /**
+   * Name of the toolkit stack to use/deploy
+   *
+   * @default CDKToolkit
+   */
+  readonly toolkitStackName?: string;
+
+  /**
+   * Reuse the assets with the given asset IDs
+   *
+   * @default - do not reuse assets
+   */
+  readonly reuseAssets?: string[];
+
+  /**
+   * Optional name to use for the CloudFormation change set.
+   * If not provided, a name will be generated automatically.
+   *
+   * @default - auto generate a name
+   */
+  readonly changeSetName?: string;
+
+  /**
+   * Always deploy, even if templates are identical.
+   * @default false
+   */
+  readonly force?: boolean;
+
+  /**
+   * Rollback failed deployments
+   *
+   * @default true
+   */
+  readonly rollback?: boolean;
+
+  /**
+   * ARNs of SNS topics that CloudFormation will notify with stack related events
+   *
+   * @default - no notifications
+   */
+  readonly notificationArns?: string[];
+
+  /**
+   * What kind of security changes require approval
+   *
+   * @default RequireApproval.Never
+   */
+  readonly requireApproval?: RequireApproval;
+
+  /**
+   * Whether to execute the ChangeSet
+   * Not providing `execute` parameter will result in execution of ChangeSet
+   * @default true
+   */
+  readonly execute?: boolean;
+
+  /**
+   * Additional parameters for CloudFormation at deploy time
+   * @default {}
+   */
+  readonly parameters?: { [name: string]: string };
+
+  /**
+   * Use previous values for unspecified parameters
+   *
+   * If not set, all parameters must be specified for every deployment.
+   *
+   * @default true
+   */
+  readonly usePreviousParameters?: boolean;
+
+  /**
+   * Path to file where stack outputs will be written after a successful deploy as JSON
+   * @default - Outputs are not written to any file
+   */
+  readonly outputsFile?: string;
+
+  /**
+   * Whether we are on a CI system
+   *
+   * @default false
+   */
+  readonly ci?: boolean;
+}
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/destroy.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/destroy.ts
new file mode 100644
index 0000000000000..9dfe8f267c6db
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/destroy.ts
@@ -0,0 +1,20 @@
+import { DefaultCdkOptions } from './common';
+
+/**
+ * Options to use with cdk destroy
+ */
+export interface DestroyOptions extends DefaultCdkOptions {
+  /**
+   * Do not ask for permission before destroying stacks
+   *
+   * @default false
+   */
+  readonly force?: boolean;
+
+  /**
+   * Only destroy the given stack
+   *
+   * @default false
+   */
+  readonly exclusively?: boolean;
+}
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/index.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/index.ts
new file mode 100644
index 0000000000000..528980446938b
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/commands/index.ts
@@ -0,0 +1,3 @@
+export * from './common';
+export * from './deploy';
+export * from './destroy';
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/index.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/index.ts
new file mode 100644
index 0000000000000..5a08e62a47958
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/index.ts
@@ -0,0 +1,3 @@
+export * from './schema';
+export * from './commands';
+export * from './test-case';
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/schema.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/schema.ts
new file mode 100644
index 0000000000000..4eccc8a6422b4
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/schema.ts
@@ -0,0 +1,26 @@
+import { TestCase } from './test-case';
+/**
+ * Definitions for the integration testing manifest
+ */
+export interface IntegManifest {
+  /**
+   * Version of the manifest
+   */
+  readonly version: string;
+
+  /**
+   * Enable lookups for this test. If lookups are enabled
+   * then `stackUpdateWorkflow` must be set to false.
+   * Lookups should only be enabled when you are explicitely testing
+   * lookups.
+   *
+   * @default false
+   */
+  readonly enableLookups?: boolean;
+
+  /**
+   * test cases
+   */
+  readonly testCases: { [testName: string]: TestCase };
+}
+
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/test-case.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/test-case.ts
new file mode 100644
index 0000000000000..6d3ecc05c626e
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/integ-tests/test-case.ts
@@ -0,0 +1,186 @@
+import { DeployOptions, DestroyOptions } from './commands';
+
+/**
+ * Represents an integration test test case
+ */
+export interface TestCase {
+  /**
+   * Stacks that should be tested as part of this test case
+   * The stackNames will be passed as args to the cdk commands
+   * so dependent stacks will be automatically deployed unless
+   * `exclusively` is passed
+   */
+  readonly stacks: string[];
+
+  /**
+   * Run update workflow on this test case
+   * This should only be set to false to test scenarios
+   * that are not possible to test as part of the update workflow
+   *
+   * @default true
+   */
+  readonly stackUpdateWorkflow?: boolean;
+
+  /**
+   * Additional options to use for each CDK command
+   *
+   * @default - runner default options
+   */
+  readonly cdkCommandOptions?: CdkCommands;
+
+  /**
+   * Additional commands to run at predefined points in the test workflow
+   *
+   * e.g. { postDeploy: ['yarn', 'test'] }
+   *
+   * @default - no hooks
+   */
+  readonly hooks?: Hooks;
+
+  /**
+   * Whether or not to include asset hashes in the diff
+   * Asset hashes can introduces a lot of unneccessary noise into tests,
+   * but there are some cases where asset hashes _should_ be included. For example
+   * any tests involving custom resources or bundling
+   *
+   * @default false
+   */
+  readonly diffAssets?: boolean;
+
+  /**
+   * List of CloudFormation resource types in this stack that can
+   * be destroyed as part of an update without failing the test.
+   *
+   * This list should only include resources that for this specific
+   * integration test we are sure will not cause errors or an outage if
+   * destroyed. For example, maybe we know that a new resource will be created
+   * first before the old resource is destroyed which prevents any outage.
+   *
+   * e.g. ['AWS::IAM::Role']
+   *
+   * @default - do not allow destruction of any resources on update
+   */
+  readonly allowDestroy?: string[];
+
+  /**
+   * Limit deployment to these regions
+   *
+   * @default - can run in any region
+   */
+  readonly regions?: string[];
+}
+
+/**
+ * Commands to run at predefined points during the
+ * integration test workflow
+ */
+export interface Hooks {
+  /**
+   * Commands to run prior to deploying the cdk stacks
+   * in the integration test
+   *
+   * @default - no commands
+   */
+  readonly preDeploy?: string[];
+
+  /**
+   * Commands to run prior after deploying the cdk stacks
+   * in the integration test
+   *
+   * @default - no commands
+   */
+  readonly postDeploy?: string[];
+
+  /**
+   * Commands to run prior to destroying the cdk stacks
+   * in the integration test
+   *
+   * @default - no commands
+   */
+  readonly preDestroy?: string[];
+
+  /**
+   * Commands to run after destroying the cdk stacks
+   * in the integration test
+   *
+   * @default - no commands
+   */
+  readonly postDestroy?: string[];
+}
+
+/**
+ * Represents a cdk command
+ * i.e. `synth`, `deploy`, & `destroy`
+ */
+export interface CdkCommand {
+  /**
+   * Whether or not to run this command as part of the workflow
+   * This can be used if you only want to test some of the workflow
+   * for example enable `synth` and disable `deploy` & `destroy` in order
+   * to limit the test to synthesis
+   *
+   * @default true
+   */
+  readonly enabled?: boolean;
+
+  /**
+   * If the runner should expect this command to fail
+   *
+   * @default false
+   */
+  readonly expectError?: boolean;
+
+  /**
+   * This can be used in combination with `expectedError`
+   * to validate that a specific message is returned.
+   *
+   * @default - do not validate message
+   */
+  readonly expectedMessage?: string;
+}
+
+/**
+ * Represents a cdk deploy command
+ */
+export interface DeployCommand extends CdkCommand {
+  /**
+   * Additional arguments to pass to the command
+   * This can be used to test specific CLI functionality
+   *
+   * @default - only default args are used
+   */
+  readonly args?: DeployOptions;
+}
+
+/**
+ * Represents a cdk destroy command
+ */
+export interface DestroyCommand extends CdkCommand {
+  /**
+   * Additional arguments to pass to the command
+   * This can be used to test specific CLI functionality
+   *
+   * @default - only default args are used
+   */
+  readonly args?: DestroyOptions;
+}
+
+/**
+ * Options for specific cdk commands that are run
+ * as part of the integration test workflow
+ */
+export interface CdkCommands {
+  /**
+   * Options to for the cdk deploy command
+   *
+   * @default - default deploy options
+   */
+  readonly deploy?: DeployCommand;
+
+  /**
+   * Options to for the cdk destroy command
+   *
+   * @default - default destroy options
+   */
+  readonly destroy?: DestroyCommand;
+}
diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/manifest.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/manifest.ts
index d2ceb45685678..62f7894a54dd3 100644
--- a/packages/@aws-cdk/cloud-assembly-schema/lib/manifest.ts
+++ b/packages/@aws-cdk/cloud-assembly-schema/lib/manifest.ts
@@ -3,6 +3,7 @@ import * as jsonschema from 'jsonschema';
 import * as semver from 'semver';
 import * as assets from './assets';
 import * as assembly from './cloud-assembly';
+import * as integ from './integ-tests';
 
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-require-imports */
@@ -21,6 +22,8 @@ const ASSEMBLY_SCHEMA = require('../schema/cloud-assembly.schema.json');
  */
 const SCHEMA_VERSION = require('../schema/cloud-assembly.version.json').version;
 
+const INTEG_SCHEMA = require('../schema/integ.schema.json');
+
 /**
  * Options for the loadManifest operation
  */
@@ -89,6 +92,25 @@ export class Manifest {
     return this.loadManifest(filePath, ASSETS_SCHEMA);
   }
 
+  /**
+   * Validates and saves the integ manifest to file.
+   *
+   * @param manifest - manifest.
+   * @param filePath - output file path.
+   */
+  public static saveIntegManifest(manifest: integ.IntegManifest, filePath: string) {
+    Manifest.saveManifest(manifest, filePath, INTEG_SCHEMA);
+  }
+
+  /**
+   * Load and validates the integ manifest from file.
+   *
+   * @param filePath - path to the manifest file.
+   */
+  public static loadIntegManifest(filePath: string): integ.IntegManifest {
+    return this.loadManifest(filePath, INTEG_SCHEMA);
+  }
+
   /**
    * Fetch the current schema version number.
    */
@@ -251,4 +273,4 @@ function noUndefined<A extends object>(xs: A): A {
 
 function stripEnumErrors(errors: jsonschema.ValidationError[]) {
   return errors.filter(e => typeof e.schema ==='string' || !('enum' in e.schema));
-}
\ No newline at end of file
+}
diff --git a/packages/@aws-cdk/cloud-assembly-schema/schema/cloud-assembly.version.json b/packages/@aws-cdk/cloud-assembly-schema/schema/cloud-assembly.version.json
index ae7a33e962d0b..90bef2e09ad39 100644
--- a/packages/@aws-cdk/cloud-assembly-schema/schema/cloud-assembly.version.json
+++ b/packages/@aws-cdk/cloud-assembly-schema/schema/cloud-assembly.version.json
@@ -1 +1 @@
-{"version":"16.0.0"}
+{"version":"17.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/cloud-assembly-schema/schema/integ.schema.json b/packages/@aws-cdk/cloud-assembly-schema/schema/integ.schema.json
new file mode 100644
index 0000000000000..676c1bdab91dd
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/schema/integ.schema.json
@@ -0,0 +1,474 @@
+{
+    "$ref": "#/definitions/IntegManifest",
+    "definitions": {
+        "IntegManifest": {
+            "description": "Definitions for the integration testing manifest",
+            "type": "object",
+            "properties": {
+                "version": {
+                    "description": "Version of the manifest",
+                    "type": "string"
+                },
+                "enableLookups": {
+                    "description": "Enable lookups for this test. If lookups are enabled\nthen `stackUpdateWorkflow` must be set to false.\nLookups should only be enabled when you are explicitely testing\nlookups.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "testCases": {
+                    "description": "test cases",
+                    "type": "object",
+                    "additionalProperties": {
+                        "$ref": "#/definitions/TestCase"
+                    }
+                }
+            },
+            "required": [
+                "testCases",
+                "version"
+            ]
+        },
+        "TestCase": {
+            "description": "Represents an integration test test case",
+            "type": "object",
+            "properties": {
+                "stacks": {
+                    "description": "Stacks that should be tested as part of this test case\nThe stackNames will be passed as args to the cdk commands\nso dependent stacks will be automatically deployed unless\n`exclusively` is passed",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "stackUpdateWorkflow": {
+                    "description": "Run update workflow on this test case\nThis should only be set to false to test scenarios\nthat are not possible to test as part of the update workflow (Default true)",
+                    "type": "boolean"
+                },
+                "cdkCommandOptions": {
+                    "description": "Additional options to use for each CDK command (Default - runner default options)",
+                    "$ref": "#/definitions/CdkCommands"
+                },
+                "hooks": {
+                    "description": "Additional commands to run at predefined points in the test workflow\n\ne.g. { postDeploy: ['yarn', 'test'] } (Default - no hooks)",
+                    "$ref": "#/definitions/Hooks"
+                },
+                "diffAssets": {
+                    "description": "Whether or not to include asset hashes in the diff\nAsset hashes can introduces a lot of unneccessary noise into tests,\nbut there are some cases where asset hashes _should_ be included. For example\nany tests involving custom resources or bundling",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "allowDestroy": {
+                    "description": "List of CloudFormation resource types in this stack that can\nbe destroyed as part of an update without failing the test.\n\nThis list should only include resources that for this specific\nintegration test we are sure will not cause errors or an outage if\ndestroyed. For example, maybe we know that a new resource will be created\nfirst before the old resource is destroyed which prevents any outage.\n\ne.g. ['AWS::IAM::Role'] (Default - do not allow destruction of any resources on update)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "regions": {
+                    "description": "Limit deployment to these regions (Default - can run in any region)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "stacks"
+            ]
+        },
+        "CdkCommands": {
+            "description": "Options for specific cdk commands that are run\nas part of the integration test workflow",
+            "type": "object",
+            "properties": {
+                "deploy": {
+                    "description": "Options to for the cdk deploy command (Default - default deploy options)",
+                    "$ref": "#/definitions/DeployCommand"
+                },
+                "destroy": {
+                    "description": "Options to for the cdk destroy command (Default - default destroy options)",
+                    "$ref": "#/definitions/DestroyCommand"
+                }
+            }
+        },
+        "DeployCommand": {
+            "description": "Represents a cdk deploy command",
+            "type": "object",
+            "properties": {
+                "args": {
+                    "description": "Additional arguments to pass to the command\nThis can be used to test specific CLI functionality (Default - only default args are used)",
+                    "$ref": "#/definitions/DeployOptions"
+                },
+                "enabled": {
+                    "description": "Whether or not to run this command as part of the workflow\nThis can be used if you only want to test some of the workflow\nfor example enable `synth` and disable `deploy` & `destroy` in order\nto limit the test to synthesis (Default true)",
+                    "type": "boolean"
+                },
+                "expectError": {
+                    "description": "If the runner should expect this command to fail",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "expectedMessage": {
+                    "description": "This can be used in combination with `expectedError`\nto validate that a specific message is returned. (Default - do not validate message)",
+                    "type": "string"
+                }
+            }
+        },
+        "DeployOptions": {
+            "description": "Options to use with cdk deploy",
+            "type": "object",
+            "properties": {
+                "exclusively": {
+                    "description": "Only perform action on the given stack",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "toolkitStackName": {
+                    "description": "Name of the toolkit stack to use/deploy (Default CDKToolkit)",
+                    "type": "string"
+                },
+                "reuseAssets": {
+                    "description": "Reuse the assets with the given asset IDs (Default - do not reuse assets)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "changeSetName": {
+                    "description": "Optional name to use for the CloudFormation change set.\nIf not provided, a name will be generated automatically. (Default - auto generate a name)",
+                    "type": "string"
+                },
+                "force": {
+                    "description": "Always deploy, even if templates are identical.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "rollback": {
+                    "description": "Rollback failed deployments (Default true)",
+                    "type": "boolean"
+                },
+                "notificationArns": {
+                    "description": "ARNs of SNS topics that CloudFormation will notify with stack related events (Default - no notifications)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "requireApproval": {
+                    "description": "What kind of security changes require approval (Default RequireApproval.Never)",
+                    "enum": [
+                        "any-change",
+                        "broadening",
+                        "never"
+                    ],
+                    "type": "string"
+                },
+                "execute": {
+                    "description": "Whether to execute the ChangeSet\nNot providing `execute` parameter will result in execution of ChangeSet (Default true)",
+                    "type": "boolean"
+                },
+                "parameters": {
+                    "description": "Additional parameters for CloudFormation at deploy time (Default [object Object])",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
+                "usePreviousParameters": {
+                    "description": "Use previous values for unspecified parameters\n\nIf not set, all parameters must be specified for every deployment. (Default true)",
+                    "type": "boolean"
+                },
+                "outputsFile": {
+                    "description": "Path to file where stack outputs will be written after a successful deploy as JSON (Default - Outputs are not written to any file)",
+                    "type": "string"
+                },
+                "ci": {
+                    "description": "Whether we are on a CI system",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "stacks": {
+                    "description": "List of stacks to deploy\n\nRequried if `all` is not set (Default - [])",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "all": {
+                    "description": "Deploy all stacks\n\nRequried if `stacks` is not set (Default - false)",
+                    "type": "boolean"
+                },
+                "app": {
+                    "description": "command-line for executing your app or a cloud assembly directory\ne.g. \"node bin/my-app.js\"\nor\n\"cdk.out\" (Default - read from cdk.json)",
+                    "type": "string"
+                },
+                "roleArn": {
+                    "description": "Role to pass to CloudFormation for deployment (Default - use the bootstrap cfn-exec role)",
+                    "type": "string"
+                },
+                "context": {
+                    "description": "Additional context (Default - no additional context)",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
+                "trace": {
+                    "description": "Print trace for stack warnings",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "strict": {
+                    "description": "Do not construct stacks with warnings",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "lookups": {
+                    "description": "Perform context lookups.\n\nSynthesis fails if this is disabled and context lookups need\nto be performed (Default true)",
+                    "type": "boolean"
+                },
+                "ignoreErrors": {
+                    "description": "Ignores synthesis errors, which will likely produce an invalid output",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "json": {
+                    "description": "Use JSON output instead of YAML when templates are printed\nto STDOUT",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "verbose": {
+                    "description": "show debug logs",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "debug": {
+                    "description": "enable emission of additional debugging information, such as creation stack\ntraces of tokens",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "profile": {
+                    "description": "Use the indicated AWS profile as the default environment (Default - no profile is used)",
+                    "type": "string"
+                },
+                "proxy": {
+                    "description": "Use the indicated proxy. Will read from\nHTTPS_PROXY environment if specified (Default - no proxy)",
+                    "type": "string"
+                },
+                "caBundlePath": {
+                    "description": "Path to CA certificate to use when validating HTTPS\nrequests. (Default - read from AWS_CA_BUNDLE environment variable)",
+                    "type": "string"
+                },
+                "ec2Creds": {
+                    "description": "Force trying to fetch EC2 instance credentials (Default - guess EC2 instance status)",
+                    "type": "boolean"
+                },
+                "versionReporting": {
+                    "description": "Include \"AWS::CDK::Metadata\" resource in synthesized templates (Default true)",
+                    "type": "boolean"
+                },
+                "pathMetadata": {
+                    "description": "Include \"aws:cdk:path\" CloudFormation metadata for each resource (Default true)",
+                    "type": "boolean"
+                },
+                "assetMetadata": {
+                    "description": "Include \"aws:asset:*\" CloudFormation metadata for resources that use assets (Default true)",
+                    "type": "boolean"
+                },
+                "staging": {
+                    "description": "Copy assets to the output directory\n\nNeeded for local debugging the source files with SAM CLI",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "output": {
+                    "description": "Emits the synthesized cloud assembly into a directory (Default cdk.out)",
+                    "type": "string"
+                },
+                "notices": {
+                    "description": "Show relevant notices (Default true)",
+                    "type": "boolean"
+                },
+                "color": {
+                    "description": "Show colors and other style from console output (Default true)",
+                    "type": "boolean"
+                }
+            }
+        },
+        "DestroyCommand": {
+            "description": "Represents a cdk destroy command",
+            "type": "object",
+            "properties": {
+                "args": {
+                    "description": "Additional arguments to pass to the command\nThis can be used to test specific CLI functionality (Default - only default args are used)",
+                    "$ref": "#/definitions/DestroyOptions"
+                },
+                "enabled": {
+                    "description": "Whether or not to run this command as part of the workflow\nThis can be used if you only want to test some of the workflow\nfor example enable `synth` and disable `deploy` & `destroy` in order\nto limit the test to synthesis (Default true)",
+                    "type": "boolean"
+                },
+                "expectError": {
+                    "description": "If the runner should expect this command to fail",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "expectedMessage": {
+                    "description": "This can be used in combination with `expectedError`\nto validate that a specific message is returned. (Default - do not validate message)",
+                    "type": "string"
+                }
+            }
+        },
+        "DestroyOptions": {
+            "description": "Options to use with cdk destroy",
+            "type": "object",
+            "properties": {
+                "force": {
+                    "description": "Do not ask for permission before destroying stacks",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "exclusively": {
+                    "description": "Only destroy the given stack",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "stacks": {
+                    "description": "List of stacks to deploy\n\nRequried if `all` is not set (Default - [])",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "all": {
+                    "description": "Deploy all stacks\n\nRequried if `stacks` is not set (Default - false)",
+                    "type": "boolean"
+                },
+                "app": {
+                    "description": "command-line for executing your app or a cloud assembly directory\ne.g. \"node bin/my-app.js\"\nor\n\"cdk.out\" (Default - read from cdk.json)",
+                    "type": "string"
+                },
+                "roleArn": {
+                    "description": "Role to pass to CloudFormation for deployment (Default - use the bootstrap cfn-exec role)",
+                    "type": "string"
+                },
+                "context": {
+                    "description": "Additional context (Default - no additional context)",
+                    "type": "object",
+                    "additionalProperties": {
+                        "type": "string"
+                    }
+                },
+                "trace": {
+                    "description": "Print trace for stack warnings",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "strict": {
+                    "description": "Do not construct stacks with warnings",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "lookups": {
+                    "description": "Perform context lookups.\n\nSynthesis fails if this is disabled and context lookups need\nto be performed (Default true)",
+                    "type": "boolean"
+                },
+                "ignoreErrors": {
+                    "description": "Ignores synthesis errors, which will likely produce an invalid output",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "json": {
+                    "description": "Use JSON output instead of YAML when templates are printed\nto STDOUT",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "verbose": {
+                    "description": "show debug logs",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "debug": {
+                    "description": "enable emission of additional debugging information, such as creation stack\ntraces of tokens",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "profile": {
+                    "description": "Use the indicated AWS profile as the default environment (Default - no profile is used)",
+                    "type": "string"
+                },
+                "proxy": {
+                    "description": "Use the indicated proxy. Will read from\nHTTPS_PROXY environment if specified (Default - no proxy)",
+                    "type": "string"
+                },
+                "caBundlePath": {
+                    "description": "Path to CA certificate to use when validating HTTPS\nrequests. (Default - read from AWS_CA_BUNDLE environment variable)",
+                    "type": "string"
+                },
+                "ec2Creds": {
+                    "description": "Force trying to fetch EC2 instance credentials (Default - guess EC2 instance status)",
+                    "type": "boolean"
+                },
+                "versionReporting": {
+                    "description": "Include \"AWS::CDK::Metadata\" resource in synthesized templates (Default true)",
+                    "type": "boolean"
+                },
+                "pathMetadata": {
+                    "description": "Include \"aws:cdk:path\" CloudFormation metadata for each resource (Default true)",
+                    "type": "boolean"
+                },
+                "assetMetadata": {
+                    "description": "Include \"aws:asset:*\" CloudFormation metadata for resources that use assets (Default true)",
+                    "type": "boolean"
+                },
+                "staging": {
+                    "description": "Copy assets to the output directory\n\nNeeded for local debugging the source files with SAM CLI",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "output": {
+                    "description": "Emits the synthesized cloud assembly into a directory (Default cdk.out)",
+                    "type": "string"
+                },
+                "notices": {
+                    "description": "Show relevant notices (Default true)",
+                    "type": "boolean"
+                },
+                "color": {
+                    "description": "Show colors and other style from console output (Default true)",
+                    "type": "boolean"
+                }
+            }
+        },
+        "Hooks": {
+            "description": "Commands to run at predefined points during the\nintegration test workflow",
+            "type": "object",
+            "properties": {
+                "preDeploy": {
+                    "description": "Commands to run prior to deploying the cdk stacks\nin the integration test (Default - no commands)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "postDeploy": {
+                    "description": "Commands to run prior after deploying the cdk stacks\nin the integration test (Default - no commands)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "preDestroy": {
+                    "description": "Commands to run prior to destroying the cdk stacks\nin the integration test (Default - no commands)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "postDestroy": {
+                    "description": "Commands to run after destroying the cdk stacks\nin the integration test (Default - no commands)",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    },
+    "$schema": "http://json-schema.org/draft-07/schema#"
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/cloud-assembly-schema/scripts/update-schema.ts b/packages/@aws-cdk/cloud-assembly-schema/scripts/update-schema.ts
index e92083d34b0a6..13a410cd4a36f 100644
--- a/packages/@aws-cdk/cloud-assembly-schema/scripts/update-schema.ts
+++ b/packages/@aws-cdk/cloud-assembly-schema/scripts/update-schema.ts
@@ -17,6 +17,7 @@ const SCHEMA_DIR = path.resolve(__dirname, '../schema');
 const SCHEMA_DEFINITIONS: { [schemaName: string]: { rootTypeName: string } } = {
   'assets': { rootTypeName: 'AssetManifest' },
   'cloud-assembly': { rootTypeName: 'AssemblyManifest' },
+  'integ': { rootTypeName: 'IntegManifest' },
 };
 
 export const SCHEMAS = Object.keys(SCHEMA_DEFINITIONS);
diff --git a/packages/@aws-cdk/cloud-assembly-schema/test/integ-tests.test.ts b/packages/@aws-cdk/cloud-assembly-schema/test/integ-tests.test.ts
new file mode 100644
index 0000000000000..3baefc89d750f
--- /dev/null
+++ b/packages/@aws-cdk/cloud-assembly-schema/test/integ-tests.test.ts
@@ -0,0 +1,137 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { Manifest } from '../lib';
+
+describe('Integration test', () => {
+  test('valid input', () => {
+    expect(() => {
+      validate({
+        version: Manifest.version(),
+        testCases: {
+          testCase1: {
+            stacks: ['stack1', 'stack2'],
+            stackUpdateWorkflow: true,
+            cdkCommandOptions: {
+              deploy: {
+                enabled: true,
+                expectError: false,
+                expectedMessage: 'some message',
+                args: {
+                  exclusively: true,
+                  toolkitStackName: 'Stack',
+                  reuseAssets: ['asset1', 'asset2'],
+                  changeSetName: 'changeset',
+                  force: true,
+                  rollback: false,
+                  notificationArns: ['arn1', 'arn2'],
+                  execute: true,
+                  parameters: {
+                    'MYPARAM': 'Value',
+                    'Stack1:OtherParam': 'OtherValue',
+                  },
+                  usePreviousParameters: true,
+                  outputsFile: 'outputs.json',
+                  ci: true,
+                  requireApproval: 'never',
+                  app: 'node bin/my-app.js',
+                  roleArn: 'roleArn',
+                  context: {
+                    KEY: 'value',
+                  },
+                  trace: true,
+                  strict: true,
+                  lookups: true,
+                  ignoreErrors: true,
+                  json: true,
+                  verbose: true,
+                  debug: true,
+                  profile: 'profile',
+                  proxy: 'https://proxy',
+                  caBundlePath: 'path/to/bundle',
+                  ec2Creds: true,
+                  versionReporting: false,
+                  pathMetadata: false,
+                  assetMetadata: true,
+                  staging: false,
+                  output: true,
+                  notices: true,
+                  color: false,
+                },
+              },
+              synth: {
+                enabled: true,
+                expectError: false,
+                expectedMessage: 'some message',
+                args: {
+                  quiet: true,
+                  exclusively: true,
+                  validation: true,
+                },
+              },
+              destroy: {
+                enabled: true,
+                expectError: false,
+                expectedMessage: 'some message',
+                args: {
+                  force: true,
+                  exclusively: true,
+                },
+              },
+            },
+            hooks: {
+              preDeploy: ['yarn test'],
+              postDeploy: ['some other command'],
+              preDestroy: ['command1', 'command2'],
+              postDestroy: ['command3', 'command4'],
+            },
+            diffAssets: true,
+            allowDestroy: ['AWS::IAM::Role'],
+            region: ['us-east-1', 'us-east-2'],
+          },
+        },
+      });
+    });
+  });
+
+  test('invalid input', () => {
+    expect(() => {
+      validate({
+        version: Manifest.version(),
+        testCases: {
+          stacks: true,
+        },
+      });
+    }).toThrow(/instance\.testCases\.stacks is not of a type\(s\) object/);
+  });
+
+  test('without command options', () => {
+    expect(() => {
+      validate({
+        version: Manifest.version(),
+        testCases: {
+          testCase1: {
+            stacks: ['stack1', 'stack2'],
+            stackUpdateWorkflow: true,
+            hooks: {
+              preDeploy: ['yarn test'],
+            },
+            diffAssets: true,
+          },
+        },
+      });
+    });
+  });
+});
+
+function validate(manifest: any) {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'integ.test.'));
+  const filePath = path.join(dir, 'manifest.json');
+  fs.writeFileSync(filePath, JSON.stringify(manifest, undefined, 2));
+  try {
+    Manifest.loadIntegManifest(filePath);
+  } finally {
+    fs.unlinkSync(filePath);
+    fs.rmdirSync(dir);
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/.eslintrc.js b/packages/@aws-cdk/integ-runner/.eslintrc.js
new file mode 100644
index 0000000000000..2658ee8727166
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/.eslintrc.js
@@ -0,0 +1,3 @@
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
+baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
+module.exports = baseConfig;
diff --git a/packages/@aws-cdk/integ-runner/.gitignore b/packages/@aws-cdk/integ-runner/.gitignore
new file mode 100644
index 0000000000000..d24092a6feda2
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/.gitignore
@@ -0,0 +1,28 @@
+*.js
+*.js.map
+*.d.ts
+!lib/init-templates/**/javascript/**/*
+node_modules
+dist
+
+# Generated by generate.sh
+build-info.json
+
+.LAST_BUILD
+.nyc_output
+coverage
+nyc.config.js
+.LAST_PACKAGE
+*.snk
+
+!test/integ/run-wrappers/dist
+!test/integ/cli/**/*
+assets.json
+npm-shrinkwrap.json
+!.eslintrc.js
+!jest.config.js
+
+junit.xml
+
+# Ignore this symlink, we recreate it at test time
+test/test-archive-follow/data/linked
diff --git a/packages/@aws-cdk/integ-runner/.npmignore b/packages/@aws-cdk/integ-runner/.npmignore
new file mode 100644
index 0000000000000..45b8808bdd7ac
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/.npmignore
@@ -0,0 +1,30 @@
+# Don't include original .ts files when doing `npm pack`
+*.ts
+!*.template.ts
+!*.d.ts
+coverage
+.nyc_output
+*.tgz
+
+dist
+.LAST_PACKAGE
+.LAST_BUILD
+*.snk
+
+!lib/init-templates/*/*/tsconfig.json
+!test/integ/cli/**/*.js
+!test/integ/run-wrappers/dist
+
+*.tsbuildinfo
+
+tsconfig.json
+
+# init templates include default tsconfig.json files which we need
+!lib/init-templates/**/tsconfig.json
+.eslintrc.js
+jest.config.js
+
+# exclude cdk artifacts
+**/cdk.out
+junit.xml
+test/
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/LICENSE b/packages/@aws-cdk/integ-runner/LICENSE
new file mode 100644
index 0000000000000..82ad00bb02d0b
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/packages/@aws-cdk/integ-runner/NOTICE b/packages/@aws-cdk/integ-runner/NOTICE
new file mode 100644
index 0000000000000..1b7adbb891265
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/NOTICE
@@ -0,0 +1,2 @@
+AWS Cloud Development Kit (AWS CDK)
+Copyright 2018-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
diff --git a/packages/@aws-cdk/integ-runner/README.md b/packages/@aws-cdk/integ-runner/README.md
new file mode 100644
index 0000000000000..e67a64282a42b
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/README.md
@@ -0,0 +1,161 @@
+# integ-runner
+
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![cdk-constructs: Experimental](https://img.shields.io/badge/cdk--constructs-experimental-important.svg?style=for-the-badge)
+
+> The APIs of higher level constructs in this module are experimental and under active development.
+> They are subject to non-backward compatible changes or removal in any future version. These are
+> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be
+> announced in the release notes. This means that while you may use them, you may need to update
+> your source code when upgrading to a newer version of this package.
+
+---
+
+<!--END STABILITY BANNER-->
+
+
+## Overview
+
+
+## Usage
+
+- Run all integration tests in `test` directory
+
+```bash
+integ-runner [ARGS] [TEST...]
+```
+
+This will look for all files that match the naming convention of `/integ.*.ts$/`. Each of these files will be expected
+to be a self contained CDK app. The runner will execute the following for each file (app):
+
+1. Check if a snapshot file exists (i.e. `/integ.*.expected.snapshot$/`)
+2. If the snapshot does not exist
+	2a. Synth the integ app which will produce the `integ.json` file
+3. Read the `integ.json` file which contains instructions on what the runner should do.
+4. Execute instructions
+
+### Options
+
+- `--update-on-failed` (default=false)
+  Rerun integration tests if snapshot fails
+- `--clean` (default=`true`)
+  Destroy stacks after deploy (use `--no-clean` for debugging)
+- `--verbose` (default=`false`)
+  verbose logging
+- `--parallel` (default=`false`)
+  Run tests in parallel across default regions
+- `--parallel-regions`
+  List of regions to run tests in. If this is provided then all tests will
+  be run in parallel across these regions
+- `--directory` (default=`test`)
+  Search for integration tests recursively from this starting directory
+- `--force` (default=`false`)
+  Rerun integration test even if the test passes
+- `--file`
+  Read the list of tests from this file
+
+Example:
+
+```bash
+integ-runner --update --parallel --parallel-regions us-east-1 --parallel-regions us-east-2 --parallel-regions us-west-2 --directory ./
+```
+
+This will search for integration tests recursively from the current directory and then execute them in parallel across `us-east-1`, `us-east-2`, & `us-west-2`.
+
+### integ.json schema
+
+See [@aws-cdk/cloud-assembly-schema/lib/integ-tests/schema.ts](../cloud-assembly-schema/lib/integ-tests/schema.ts)
+
+### defining an integration test
+
+In most cases an integration test will be an instance of a stack
+
+```ts
+import { Function, FunctionOptions } from '../lib';
+
+interface MyIntegTestProps extends StackOptions {
+  functionProps?: FunctionOptions;
+}
+class MyIntegTest extends Stack {
+  constructor(scope: Construct, id: string, props: MyIntegTestProps) {
+    super(scope, id, props);
+	
+	new Function(this, 'Handler', {
+	  runtime: Runtime.NODEJS_12_X,
+	  handler: 'index.handler',
+	  code: Code.fromAsset(path.join(__dirname, 'lambda-handler')),
+	  ...props.functionProps,
+	});
+  }
+}
+```
+
+You would then use the `IntegTest` construct to create your test cases
+
+```ts
+new IntegTeset(app, 'ArmTest', {
+  stacks: [
+    new MyIntegTest(app, 'Stack1', {
+	  functionProps: {
+	    architecture: lambda.Architecture.ARM_64,
+	  },
+	}),
+  ],
+  diffAssets: true,
+  update: true,
+  cdkCommandOptions: {
+    deploy: {
+	  args: {
+	    requireApproval: RequireApproval.NEVER,
+		json: true,
+	  },
+	},
+	destroy: {
+	  args: {
+	    force: true,
+	  },
+	},
+  },
+});
+
+new IntegTeset(app, 'AmdTest', {
+  stacks: [
+    new MyIntegTest(app, 'Stack2', {
+	  functionProps: {
+	    architecture: lambda.Architecture.X86_64,
+	  },
+	}),
+  ],
+});
+```
+
+This will synthesize an `integ.json` file with the following contents
+
+```json
+{
+  "ArmTest": {
+    "stacks": ["Stack1"],
+	"diffAssets": true,
+	"update": true,
+	"cdkCommands": {
+	  "deploy": {
+	    "args": {
+		  "requireApproval": "never",
+		  "json": true
+		}
+	  },
+	  "destroy": {
+	    "args": {
+		  "force": true
+		}
+	  }
+	}
+  },
+  "AmdTest": {
+    "stacks": ["Stack2"]
+  }
+}
+```
diff --git a/packages/@aws-cdk/integ-runner/bin/integ-runner b/packages/@aws-cdk/integ-runner/bin/integ-runner
new file mode 100755
index 0000000000000..20ace56b80449
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/bin/integ-runner
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('./integ-runner.js');
diff --git a/packages/@aws-cdk/integ-runner/bin/integ-runner.ts b/packages/@aws-cdk/integ-runner/bin/integ-runner.ts
new file mode 100644
index 0000000000000..ca343920f91cb
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/bin/integ-runner.ts
@@ -0,0 +1,169 @@
+#!/usr/bin/env node
+// Exercise all integ stacks and if they deploy, update the expected synth files
+import * as os from 'os';
+import * as path from 'path';
+import * as chalk from 'chalk';
+import * as workerpool from 'workerpool';
+import * as yargs from 'yargs';
+import { IntegrationTests, IntegTestConfig } from '../lib/runner/integ-tests';
+import * as logger from '../lib/runner/private/logger';
+import { IntegBatchResponse, printResults } from '../lib/workers/common';
+import { SnapshotBatchRequest } from '../lib/workers/extract_worker';
+import { runIntegrationTestsInParallel, IntegTestRunOptions } from '../lib/workers/integ-test-worker';
+
+
+/**
+ * Split a list of snapshot tests into batches that can be run using a workerpool.
+ */
+function batchTests(tests: IntegTestConfig[]): SnapshotBatchRequest[] {
+  let batchSize = 3;
+  const ret: SnapshotBatchRequest[] = [];
+  for (let i = 0; i < tests.length; i += batchSize) {
+    ret.push({
+      tests: tests.slice(i, i + batchSize),
+    });
+  }
+  return ret;
+}
+
+export function printSummary(total: number, failed: number): void {
+  if (failed > 0) {
+    logger.print('%s:    %s %s, %s total', chalk.bold('Tests'), chalk.red(failed), chalk.red('failed'), total);
+  } else {
+    logger.print('%s:    %s %s, %s total', chalk.bold('Tests'), chalk.green(total), chalk.green('passed'), total);
+  }
+}
+
+/**
+ * Run Integration tests.
+ */
+async function runIntegrationTests(options: IntegTestRunOptions): Promise<void> {
+  logger.highlight('\nRunning integration tests for failed tests...\n');
+  logger.print('Running in parallel across: %s', options.regions.join(', '));
+  const totalTests = options.tests.length;
+  const failedTests: IntegTestConfig[] = [];
+
+  const responses = await runIntegrationTestsInParallel(options);
+  for (const response of responses) {
+    failedTests.push(...response.failedTests);
+  }
+  logger.highlight('\nTest Results: \n');
+  printSummary(totalTests, failedTests.length);
+}
+
+/**
+ * Run Snapshot tests
+ * First batch up the tests. By default there will be 3 tests per batch.
+ * Use a workerpool to run the batches in parallel.
+ */
+async function runSnapshotTests(pool: workerpool.WorkerPool, tests: IntegTestConfig[]): Promise<IntegTestConfig[]> {
+  const testsToRun: IntegTestConfig[] = [];
+  const requests = batchTests(tests);
+  logger.highlight('\nVerifying integration test snapshots...\n');
+  const responses: IntegBatchResponse[] = await Promise.all(
+    requests.map((request) => pool.exec('snapshotTestBatch', [request], {
+      on: printResults,
+    })),
+  );
+  for (const response of responses) {
+    testsToRun.push(...response.failedTests);
+  }
+
+  logger.highlight('\nSnapshot Results: \n');
+  printSummary(tests.length, testsToRun.length);
+  return testsToRun;
+}
+
+async function main() {
+  const argv = yargs
+    .usage('Usage: integ-runner [TEST...]')
+    .option('list', { type: 'boolean', default: false, desc: 'List tests instead of running them' })
+    .option('clean', { type: 'boolean', default: true, desc: 'Skips stack clean up after test is completed (use --no-clean to negate)' })
+    .option('verbose', { type: 'boolean', default: false, alias: 'v', desc: 'Verbose logs' })
+    .option('dry-run', { type: 'boolean', default: false, desc: 'do not actually deploy the stack. just update the snapshot (not recommended!)' })
+    .option('update-on-failed', { type: 'boolean', default: false, desc: 'rerun integration tests and update snapshots for failed tests.' })
+    .option('force', { type: 'boolean', default: false, desc: 'Rerun all integration tests even if tests are passing' })
+    .option('parallel', { type: 'boolean', default: false, desc: 'run integration tests in parallel' })
+    .option('parallel-regions', { type: 'array', desc: 'if --parallel is used then these regions are used to run tests in parallel', nargs: 1, default: [] })
+    .options('directory', { type: 'string', default: 'test', desc: 'starting directory to discover integration tests' })
+    .argv;
+
+  // Cap to a reasonable top-level limit to prevent thrash on machines with many, many cores.
+  const maxWorkers = parseInt(process.env.CDK_INTEG_MAX_WORKER_COUNT ?? '16');
+  const N = Math.min(maxWorkers, Math.max(1, Math.ceil(os.cpus().length / 2)));
+  const pool = workerpool.pool(path.join(__dirname, '../lib/workers/extract_worker.js'), {
+    maxWorkers: N,
+  });
+
+  // list of integration tests that will be executed
+  const testsToRun: IntegTestConfig[] = [];
+  const testsFromArgs: IntegTestConfig[] = [];
+  const parallelRegions = arrayFromYargs(argv['parallel-regions']);
+  const testRegions: string[] = parallelRegions ?? ['us-east-1', 'us-east-2', 'us-west-2'];
+  const runUpdateOnFailed = argv['update-on-failed'] ?? false;
+
+
+  try {
+    if (argv.list) {
+      const tests = await new IntegrationTests(argv.directory).fromCliArgs();
+      process.stdout.write(tests.map(t => t.fileName).join('\n') + '\n');
+      return;
+    }
+
+    if (argv._.length === 0) {
+      testsFromArgs.push(...(await new IntegrationTests(argv.directory).fromCliArgs()));
+    } else {
+      testsFromArgs.push(...(await new IntegrationTests(argv.directory).fromCliArgs(argv._.map(x => x.toString()))));
+    }
+
+    // If `--force` is not used then first validate the snapshots and gather
+    // the failed snapshot tests. If `--force` is used then we will skip snapshot
+    // tests and run integration tests for all tests
+    if (!argv.force) {
+      const failedSnapshots = await runSnapshotTests(pool, testsFromArgs);
+      testsToRun.push(...failedSnapshots);
+    } else {
+      testsToRun.push(...testsFromArgs);
+    }
+
+
+    // run integration tests if `--update-on-failed` OR `--force` is used
+    if (runUpdateOnFailed || argv.force) {
+      await runIntegrationTests({
+        pool,
+        tests: testsToRun,
+        regions: testRegions,
+        clean: argv.clean,
+        dryRun: argv['dry-run'],
+        verbose: argv.verbose,
+      });
+
+      if (argv.clean === false) {
+        logger.warning('Not cleaning up stacks since "--no-clean" was used');
+      }
+    }
+
+  } finally {
+    void pool.terminate();
+  }
+}
+
+/**
+ * Translate a Yargs input array to something that makes more sense in a programming language
+ * model (telling the difference between absence and an empty array)
+ *
+ * - An empty array is the default case, meaning the user didn't pass any arguments. We return
+ *   undefined.
+ * - If the user passed a single empty string, they did something like `--array=`, which we'll
+ *   take to mean they passed an empty array.
+ */
+function arrayFromYargs(xs: string[]): string[] | undefined {
+  if (xs.length === 0) { return undefined; }
+  return xs.filter(x => x !== '');
+}
+
+main().catch(e => {
+  // eslint-disable-next-line no-console
+  console.error(e);
+  process.exit(1);
+});
diff --git a/packages/@aws-cdk/integ-runner/jest.config.js b/packages/@aws-cdk/integ-runner/jest.config.js
new file mode 100644
index 0000000000000..d052cbb29f05d
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/jest.config.js
@@ -0,0 +1,10 @@
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
+module.exports = {
+    ...baseConfig,
+    coverageThreshold: {
+        global: {
+            ...baseConfig.coverageThreshold.global,
+            branches: 60,
+        },
+    },
+};
diff --git a/packages/@aws-cdk/integ-runner/lib/runner/integ-tests.ts b/packages/@aws-cdk/integ-runner/lib/runner/integ-tests.ts
new file mode 100644
index 0000000000000..0fd648c31c5d1
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/runner/integ-tests.ts
@@ -0,0 +1,76 @@
+import * as path from 'path';
+import * as fs from 'fs-extra';
+
+/**
+ * Represents a single integration test
+ */
+export interface IntegTestConfig {
+  readonly directory: string;
+  readonly fileName: string;
+}
+
+/**
+ * Discover integration tests
+ */
+export class IntegrationTests {
+  constructor(private readonly directory: string) {
+  }
+
+  /**
+   * Takes an optional list of tests to look for, otherwise
+   * it will look for all tests from the directory
+   */
+  public async fromCliArgs(tests?: string[]): Promise<IntegTestConfig[]> {
+    let allTests = await this.discover();
+    const all = allTests.map(x => x.fileName);
+    let foundAll = true;
+
+    if (tests && tests.length > 0) {
+      // Pare down found tests to filter
+      allTests = allTests.filter(t => {
+        const parts = path.parse(t.fileName);
+        return (tests.includes(t.fileName) || tests.includes(parts.base));
+      });
+
+      const selectedNames = allTests.map(t => path.parse(t.fileName).base);
+      for (const unmatched of tests.filter(t => !selectedNames.includes(t))) {
+        process.stderr.write(`No such integ test: ${unmatched}\n`);
+        foundAll = false;
+      }
+    }
+
+    if (!foundAll) {
+      process.stderr.write(`Available tests: ${all.join(' ')}\n`);
+      return [];
+    }
+
+    return allTests;
+  }
+
+  private async discover(): Promise<IntegTestConfig[]> {
+    const files = await this.readTree();
+    const integs = files.filter(fileName => path.basename(fileName).startsWith('integ.') && path.basename(fileName).endsWith('.js'));
+    return this.request(integs);
+  }
+
+  private request(files: string[]): IntegTestConfig[] {
+    return files.map(fileName => { return { directory: this.directory, fileName }; });
+  }
+
+  private async readTree(): Promise<string[]> {
+    const ret = new Array<string>();
+
+    async function recurse(dir: string) {
+      const files = await fs.readdir(dir);
+      for (const file of files) {
+        const fullPath = path.join(dir, file);
+        const statf = await fs.stat(fullPath);
+        if (statf.isFile()) { ret.push(fullPath); }
+        if (statf.isDirectory()) { await recurse(path.join(fullPath)); }
+      }
+    }
+
+    await recurse(this.directory);
+    return ret;
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/lib/runner/private/canonicalize-assets.ts b/packages/@aws-cdk/integ-runner/lib/runner/private/canonicalize-assets.ts
new file mode 100644
index 0000000000000..9cee3d4742b3c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/runner/private/canonicalize-assets.ts
@@ -0,0 +1,71 @@
+/**
+ * Reduce template to a normal form where asset references have been normalized
+ *
+ * This makes it possible to compare templates if all that's different between
+ * them is the hashes of the asset values.
+ *
+ * Currently only handles parameterized assets, but can (and should)
+ * be adapted to handle convention-mode assets as well when we start using
+ * more of those.
+ */
+export function canonicalizeTemplate(template: any): any {
+  // For the weird case where we have an array of templates...
+  if (Array.isArray(template)) {
+    return template.map(canonicalizeTemplate);
+  }
+
+  // Find assets via parameters
+  const stringSubstitutions = new Array<[RegExp, string]>();
+  const paramRe = /^AssetParameters([a-zA-Z0-9]{64})(S3Bucket|S3VersionKey|ArtifactHash)([a-zA-Z0-9]{8})$/;
+
+  const assetsSeen = new Set<string>();
+  for (const paramName of Object.keys(template?.Parameters || {})) {
+    const m = paramRe.exec(paramName);
+    if (!m) { continue; }
+    if (assetsSeen.has(m[1])) { continue; }
+
+    assetsSeen.add(m[1]);
+    const ix = assetsSeen.size;
+
+    // Full parameter reference
+    stringSubstitutions.push([
+      new RegExp(`AssetParameters${m[1]}(S3Bucket|S3VersionKey|ArtifactHash)([a-zA-Z0-9]{8})`),
+      `Asset${ix}$1`,
+    ]);
+    // Substring asset hash reference
+    stringSubstitutions.push([
+      new RegExp(`${m[1]}`),
+      `Asset${ix}Hash`,
+    ]);
+  }
+
+  // Substitute them out
+  return substitute(template);
+
+  function substitute(what: any): any {
+    if (Array.isArray(what)) {
+      return what.map(substitute);
+    }
+
+    if (typeof what === 'object' && what !== null) {
+      const ret: any = {};
+      for (const [k, v] of Object.entries(what)) {
+        ret[stringSub(k)] = substitute(v);
+      }
+      return ret;
+    }
+
+    if (typeof what === 'string') {
+      return stringSub(what);
+    }
+
+    return what;
+  }
+
+  function stringSub(x: string) {
+    for (const [re, replacement] of stringSubstitutions) {
+      x = x.replace(re, replacement);
+    }
+    return x;
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/lib/runner/private/cloud-assembly.ts b/packages/@aws-cdk/integ-runner/lib/runner/private/cloud-assembly.ts
new file mode 100644
index 0000000000000..99626ea53bdb2
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/runner/private/cloud-assembly.ts
@@ -0,0 +1,66 @@
+import * as path from 'path';
+import { AssemblyManifest, Manifest, ArtifactType, AwsCloudFormationStackProperties } from '@aws-cdk/cloud-assembly-schema';
+import * as fs from 'fs-extra';
+
+/**
+ * Reads a Cloud Assembly manifest
+ */
+export class AssemblyManifestReader {
+  public static readonly DEFAULT_FILENAME = 'manifest.json';
+
+  /**
+   * Reads a Cloud Assembly manifest from a file
+   */
+  public static fromFile(fileName: string): AssemblyManifestReader {
+    try {
+      const obj = Manifest.loadAssemblyManifest(fileName);
+      return new AssemblyManifestReader(path.dirname(fileName), obj);
+
+    } catch (e) {
+      throw new Error(`Cannot read integ manifest '${fileName}': ${e.message}`);
+    }
+  }
+
+  /**
+   * Reads a Cloud Assembly manifest from a file or a directory
+   * If the given filePath is a directory then it will look for
+   * a file within the directory with the DEFAULT_FILENAME
+   */
+  public static fromPath(filePath: string): AssemblyManifestReader {
+    let st;
+    try {
+      st = fs.statSync(filePath);
+    } catch (e) {
+      throw new Error(`Cannot read integ manifest at '${filePath}': ${e.message}`);
+    }
+    if (st.isDirectory()) {
+      return AssemblyManifestReader.fromFile(path.join(filePath, AssemblyManifestReader.DEFAULT_FILENAME));
+    }
+    return AssemblyManifestReader.fromFile(filePath);
+  }
+
+  /**
+   * The directory where the manifest was found
+   */
+  public readonly directory: string;
+
+  constructor(directory: string, private readonly manifest: AssemblyManifest) {
+    this.directory = directory;
+  }
+
+  /**
+   * Get the stacks from the manifest
+   * returns a map of artifactId to CloudFormation template
+   */
+  public get stacks(): Record<string, any> {
+    const stacks: Record<string, any> = {};
+    for (const [artifactId, artifact] of Object.entries(this.manifest.artifacts ?? {})) {
+      if (artifact.type !== ArtifactType.AWS_CLOUDFORMATION_STACK) { continue; }
+      const props = artifact.properties as AwsCloudFormationStackProperties;
+
+      const template = fs.readJSONSync(path.resolve(this.directory, props.templateFile));
+      stacks[artifactId] = template;
+    }
+    return stacks;
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/lib/runner/private/integ-manifest.ts b/packages/@aws-cdk/integ-runner/lib/runner/private/integ-manifest.ts
new file mode 100644
index 0000000000000..80b567dbb69ce
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/runner/private/integ-manifest.ts
@@ -0,0 +1,76 @@
+import * as path from 'path';
+import { IntegManifest, Manifest, TestCase } from '@aws-cdk/cloud-assembly-schema';
+import * as fs from 'fs-extra';
+
+/**
+ * Test case configuration read from the integ manifest
+ */
+export interface IntegTestConfig {
+  /**
+   * Test cases contained in this integration test
+   */
+  readonly testCases: { [testCaseName: string]: TestCase };
+
+  /**
+   * Whether to enable lookups for this test
+   *
+   * @default false
+   */
+  readonly enableLookups: boolean;
+}
+
+/**
+ * Reads an integration tests manifest
+ */
+export class IntegManifestReader {
+  public static readonly DEFAULT_FILENAME = 'integ.json';
+
+  /**
+   * Reads an integration test manifest from the specified file
+   */
+  public static fromFile(fileName: string): IntegManifestReader {
+    try {
+      const obj = Manifest.loadIntegManifest(fileName);
+      return new IntegManifestReader(path.dirname(fileName), obj);
+
+    } catch (e) {
+      throw new Error(`Cannot read integ manifest '${fileName}': ${e.message}`);
+    }
+  }
+
+  /**
+   * Reads a Integration test manifest from a file or a directory
+   * If the given filePath is a directory then it will look for
+   * a file within the directory with the DEFAULT_FILENAME
+   */
+  public static fromPath(filePath: string): IntegManifestReader {
+    let st;
+    try {
+      st = fs.statSync(filePath);
+    } catch (e) {
+      throw new Error(`Cannot read integ manifest at '${filePath}': ${e.message}`);
+    }
+    if (st.isDirectory()) {
+      return IntegManifestReader.fromFile(path.join(filePath, IntegManifestReader.DEFAULT_FILENAME));
+    }
+    return IntegManifestReader.fromFile(filePath);
+  }
+
+  /**
+   * The directory where the manifest was found
+   */
+  public readonly directory: string;
+  constructor(directory: string, private readonly manifest: IntegManifest) {
+    this.directory = directory;
+  }
+
+  /**
+   * List of integration tests in the manifest
+   */
+  public get tests(): IntegTestConfig {
+    return {
+      testCases: this.manifest.testCases,
+      enableLookups: this.manifest.enableLookups ?? false,
+    };
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/lib/runner/private/logger.ts b/packages/@aws-cdk/integ-runner/lib/runner/private/logger.ts
new file mode 100644
index 0000000000000..55c7f80b24365
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/runner/private/logger.ts
@@ -0,0 +1,20 @@
+import { Writable } from 'stream';
+import * as util from 'util';
+import * as chalk from 'chalk';
+
+type StyleFn = (str: string) => string;
+const { stderr } = process;
+
+const logger = (stream: Writable, styles?: StyleFn[]) => (fmt: string, ...args: any[]) => {
+  let str = util.format(fmt, ...args);
+  if (styles && styles.length) {
+    str = styles.reduce((a, style) => style(a), str);
+  }
+  stream.write(str + '\n');
+};
+
+export const print = logger(stderr);
+export const error = logger(stderr, [chalk.red]);
+export const warning = logger(stderr, [chalk.yellow]);
+export const success = logger(stderr, [chalk.green]);
+export const highlight = logger(stderr, [chalk.bold]);
diff --git a/packages/@aws-cdk/integ-runner/lib/runner/runners.ts b/packages/@aws-cdk/integ-runner/lib/runner/runners.ts
new file mode 100644
index 0000000000000..747d240c8f04d
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/runner/runners.ts
@@ -0,0 +1,606 @@
+import * as path from 'path';
+import { Writable, WritableOptions } from 'stream';
+import { StringDecoder, NodeStringDecoder } from 'string_decoder';
+import { TestCase, RequireApproval, DefaultCdkOptions } from '@aws-cdk/cloud-assembly-schema';
+import { diffTemplate, formatDifferences } from '@aws-cdk/cloudformation-diff';
+import { AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY, FUTURE_FLAGS, TARGET_PARTITIONS } from '@aws-cdk/cx-api';
+import { CdkCliWrapper, ICdk } from 'cdk-cli-wrapper';
+import * as fs from 'fs-extra';
+import { Diagnostic, DiagnosticReason } from '../workers/common';
+import { canonicalizeTemplate } from './private/canonicalize-assets';
+import { AssemblyManifestReader } from './private/cloud-assembly';
+import { IntegManifestReader } from './private/integ-manifest';
+
+const CDK_OUTDIR_PREFIX = 'cdk-integ.out';
+const CDK_INTEG_STACK_PRAGMA = '/// !cdk-integ';
+const PRAGMA_PREFIX = 'pragma:';
+const SET_CONTEXT_PRAGMA_PREFIX = 'pragma:set-context:';
+const VERIFY_ASSET_HASHES = 'pragma:include-assets-hashes';
+const ENABLE_LOOKUPS_PRAGMA = 'pragma:enable-lookups';
+
+/**
+ * Options for creating an integration test runner
+ */
+export interface IntegRunnerOptions {
+  /**
+   * The name of the file that contains the integration test
+   * This should be a JavaScript file
+   */
+  readonly fileName: string,
+
+  /**
+   * Additional environment variables that will be available
+   * to the CDK CLI
+   *
+   * @default - no additional environment variables
+   */
+  readonly env?: { [name: string]: string },
+
+  /**
+   * tmp cdk.out directory
+   *
+   * @default - directory will be `cdk-integ.out.${testName}`
+   */
+  readonly integOutDir?: string,
+
+  /**
+   * Instance of the CDK CLI to use
+   *
+   * @default - CdkCliWrapper
+   */
+  readonly cdk?: ICdk;
+}
+
+/**
+ * Represents an Integration test runner
+ */
+export abstract class IntegRunner {
+  /**
+   * The directory where the snapshot will be stored
+   */
+  public readonly snapshotDir: string;
+
+  /**
+   * An instance of the CDK  CLI
+   */
+  public readonly cdk: ICdk;
+
+  /**
+   * Pretty name of the test
+   */
+  public readonly testName: string;
+
+  /**
+   * The path to the integration test file
+   */
+  protected readonly sourceFilePath: string;
+
+  /**
+   * The value used in the '--app' CLI parameter
+   */
+  protected readonly cdkApp: string;
+
+  /**
+   * The path where the `cdk.context.json` file
+   * will be created
+   */
+  protected readonly cdkContextPath: string;
+
+  /**
+   * The relative path from the cwd to the snapshot directory
+   */
+  protected readonly relativeSnapshotDir: string;
+
+  /**
+   * The integration tests that this runner will execute
+   */
+  protected _tests?: { [testName: string]: TestCase };
+
+  /**
+   * The working directory that the integration tests will be
+   * executed from
+   */
+  protected readonly directory: string;
+
+  /**
+   * Default options to pass to the CDK CLI
+   */
+  protected readonly defaultArgs: DefaultCdkOptions = {
+    pathMetadata: false,
+    assetMetadata: false,
+    versionReporting: false,
+  }
+
+  private _enableLookups?: boolean;
+
+  /**
+   * The directory where the CDK will be synthed to
+   */
+  protected readonly cdkOutDir: string;
+
+  constructor(options: IntegRunnerOptions) {
+    const parsed = path.parse(options.fileName);
+    this.directory = parsed.dir;
+    this.testName = parsed.name.slice(6);
+    this.snapshotDir = path.join(this.directory, `${this.testName}.integ.snapshot`);
+    this.relativeSnapshotDir = `${this.testName}.integ.snapshot`;
+    this.sourceFilePath = path.join(this.directory, parsed.base);
+    this.cdkContextPath = path.join(this.directory, 'cdk.context.json');
+    this.cdk = options.cdk ?? new CdkCliWrapper({
+      directory: this.directory,
+      env: options.env,
+    });
+    this.cdkOutDir = options.integOutDir ?? `${CDK_OUTDIR_PREFIX}.${this.testName}`;
+    this.cdkApp = `node ${parsed.base}`;
+    if (this.hasSnapshot()) {
+      this.loadManifest();
+    }
+  }
+
+  /**
+   * Whether or not lookups are enabled for a given test case
+   */
+  protected get enableLookups(): boolean {
+    return this._enableLookups ?? false;
+  }
+
+  /**
+   * Return this list of test cases for this integration test
+   */
+  public get tests(): { [testName: string]: TestCase } | undefined {
+    return this._tests;
+  }
+
+  /**
+   * Returns true if a snapshot already exists for this test
+   */
+  public hasSnapshot(): boolean {
+    if (fs.existsSync(this.snapshotDir)) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  protected loadManifest(dir?: string): void {
+    try {
+      const reader = IntegManifestReader.fromPath(dir ?? this.snapshotDir);
+      this._tests = reader.tests.testCases;
+      this._enableLookups = reader.tests.enableLookups;
+    } catch (e) {
+      this._tests = this.renderTestCasesForLegacyTests();
+      this._enableLookups = this.pragmas().includes(ENABLE_LOOKUPS_PRAGMA);
+    }
+  }
+
+  protected cleanup(): void {
+    const cdkOutPath = path.join(this.directory, this.cdkOutDir);
+    if (fs.existsSync(cdkOutPath)) {
+      fs.removeSync(cdkOutPath);
+    }
+  }
+
+  protected createSnapshot(): void {
+    if (fs.existsSync(this.snapshotDir)) {
+      fs.removeSync(this.snapshotDir);
+    }
+
+    // if lookups are enabled then we need to synth again
+    // using dummy context and save that as the snapshot
+    if (this.enableLookups) {
+      this.writeContext();
+      this.cdk.synth({
+        ...this.defaultArgs,
+        all: true,
+        app: this.cdkApp,
+        output: this.relativeSnapshotDir,
+        // TODO: figure out if we need this...
+        // env: {
+        //   ...DEFAULT_SYNTH_OPTIONS.env,
+        // },
+      });
+      this.cleanupContextFile();
+    } else {
+      fs.moveSync(path.join(this.directory, this.cdkOutDir), this.snapshotDir, { overwrite: true });
+    }
+  }
+
+  /**
+   * Returns the single test stack to use.
+   *
+   * If the test has a single stack, it will be chosen. Otherwise a pragma is expected within the
+   * test file the name of the stack:
+   *
+   * @example
+   *
+   *    /// !cdk-integ <stack-name>
+   *
+   */
+  private renderTestCasesForLegacyTests(): { [testName: string]: TestCase } {
+    const tests: TestCase = {
+      stacks: [],
+    };
+    const pragma = this.readStackPragma();
+    if (pragma.length > 0) {
+      tests.stacks.push(...pragma);
+    } else {
+      const stacks = (this.cdk.list({
+        ...this.defaultArgs,
+        all: true,
+        app: this.cdkApp,
+        output: this.cdkOutDir,
+      })).split('\n');
+      if (stacks.length !== 1) {
+        throw new Error('"cdk-integ" can only operate on apps with a single stack.\n\n' +
+          '  If your app has multiple stacks, specify which stack to select by adding this to your test source:\n\n' +
+          `      ${CDK_INTEG_STACK_PRAGMA} STACK ...\n\n` +
+          `  Available stacks: ${stacks.join(' ')} (wildcards are also supported)\n`);
+      }
+      tests.stacks.push(...stacks);
+    }
+
+    return {
+      [this.testName]: tests,
+    };
+  }
+
+  /**
+   * Reads stack names from the "!cdk-integ" pragma.
+   *
+   * Every word that's NOT prefixed by "pragma:" is considered a stack name.
+   *
+   * @example
+   *
+   *    /// !cdk-integ <stack-name>
+   */
+  private readStackPragma(): string[] {
+    return (this.readIntegPragma()).filter(p => !p.startsWith(PRAGMA_PREFIX));
+  }
+
+  /**
+   * Read arbitrary cdk-integ pragma directives
+   *
+   * Reads the test source file and looks for the "!cdk-integ" pragma. If it exists, returns it's
+   * contents. This allows integ tests to supply custom command line arguments to "cdk deploy" and "cdk synth".
+   *
+   * @example
+   *
+   *    /// !cdk-integ [...]
+   */
+  private readIntegPragma(): string[] {
+    const source = fs.readFileSync(this.sourceFilePath, { encoding: 'utf-8' });
+    const pragmaLine = source.split('\n').find(x => x.startsWith(CDK_INTEG_STACK_PRAGMA + ' '));
+    if (!pragmaLine) {
+      return [];
+    }
+
+    const args = pragmaLine.substring(CDK_INTEG_STACK_PRAGMA.length).trim().split(' ');
+    if (args.length === 0) {
+      throw new Error(`Invalid syntax for cdk-integ pragma. Usage: "${CDK_INTEG_STACK_PRAGMA} [STACK] [pragma:PRAGMA] [...]"`);
+    }
+    return args;
+  }
+
+  /**
+   * Return the non-stack pragmas
+   *
+   * These are all pragmas that start with "pragma:".
+   *
+   * For backwards compatibility reasons, all pragmas that DON'T start with this
+   * string are considered to be stack names.
+   */
+  protected pragmas(): string[] {
+    return (this.readIntegPragma()).filter(p => p.startsWith(PRAGMA_PREFIX));
+  }
+
+  /**
+   * There is not currently a way to pass structured context to the CLI
+   * so to workaround this we write the context to a file
+   */
+  protected writeContext(additionalContext?: Record<string, any>): void {
+    const ctxPragmaContext: Record<string, any> = {};
+
+    // apply context from set-context pragma
+    // usage: pragma:set-context:key=value
+    const ctxPragmas = (this.pragmas()).filter(p => p.startsWith(SET_CONTEXT_PRAGMA_PREFIX));
+    for (const p of ctxPragmas) {
+      const instruction = p.substring(SET_CONTEXT_PRAGMA_PREFIX.length);
+      const [key, value] = instruction.split('=');
+      if (key == null || value == null) {
+        throw new Error(`invalid "set-context" pragma syntax. example: "pragma:set-context:@aws-cdk/core:newStyleStackSynthesis=true" got: ${p}`);
+      }
+
+      ctxPragmaContext[key] = value;
+    }
+    const context: Record<string, any> = {
+      ...DEFAULT_SYNTH_OPTIONS.context,
+      ...ctxPragmaContext,
+      ...additionalContext,
+    };
+    fs.writeFileSync(this.cdkContextPath, JSON.stringify(context, undefined, 2), { encoding: 'utf-8' });
+  }
+
+  protected cleanupContextFile() {
+    if (fs.existsSync(this.cdkContextPath)) {
+      fs.unlinkSync(this.cdkContextPath);
+    }
+  }
+}
+
+/**
+ * Options for the integration test runner
+ */
+export interface IntegTestRunOptions {
+  /**
+   * The test case to execute
+   */
+  readonly testCase: TestCase;
+
+  /**
+   * Whether or not to run `cdk destroy` and cleanup the
+   * integration test stacks.
+   *
+   * Set this to false if you need to perform any validation
+   * or troubleshooting after deployment.
+   *
+   * @default true
+   */
+  readonly clean?: boolean;
+
+  /**
+   * If set to true, the integration test will not deploy
+   * anything and will simply update the snapshot.
+   *
+   * You should NOT use this method since you are essentially
+   * bypassing the integration test.
+   *
+   * @default false
+   */
+  readonly dryRun?: boolean;
+}
+
+/**
+ * An integration test runner that orchestrates executing
+ * integration tests
+ */
+export class IntegTestRunner extends IntegRunner {
+  constructor(options: IntegRunnerOptions) {
+    super(options);
+  }
+
+  /**
+   * Orchestrates running integration tests. Currently this includes
+   *
+   * 1. Deploying the integration test stacks
+   * 2. Saving the snapshot
+   * 3. Destroying the integration test stacks
+   */
+  public runIntegTestCase(options: IntegTestRunOptions): void {
+    const clean = options.clean ?? true;
+    try {
+      if (!options.dryRun) {
+        this.cdk.deploy({
+          ...this.defaultArgs,
+          stacks: options.testCase.stacks,
+          requireApproval: RequireApproval.NEVER,
+          output: this.cdkOutDir,
+          app: this.cdkApp,
+          lookups: this.enableLookups,
+        });
+      } else {
+        this.cdk.synth({
+          ...this.defaultArgs,
+          stacks: options.testCase.stacks,
+          output: this.cdkOutDir,
+          app: this.cdkApp,
+          lookups: this.enableLookups,
+        });
+      }
+      this.createSnapshot();
+    } catch (e) {
+      throw e;
+    } finally {
+      if (!options.dryRun) {
+        if (clean) {
+          this.cdk.destroy({
+            ...this.defaultArgs,
+            stacks: options.testCase.stacks,
+            force: true,
+            app: this.cdkApp,
+            output: this.cdkOutDir,
+          });
+        }
+      }
+      this.cleanup();
+    }
+  }
+
+  /**
+   * Generate a snapshot if one does not exist
+   * This will synth and then load the integration test manifest
+   */
+  public generateSnapshot(): void {
+    if (this.hasSnapshot()) {
+      throw new Error(`${this.testName} already has a snapshot: ${this.snapshotDir}`);
+    }
+
+    this.cdk.synth({
+      ...this.defaultArgs,
+      all: true,
+      app: this.cdkApp,
+      output: this.cdkOutDir,
+    });
+    this.loadManifest(this.cdkOutDir);
+  }
+}
+
+/**
+ * Runner for snapshot tests. This handles orchestrating
+ * the validation of the integration test snapshots
+ */
+export class IntegSnapshotRunner extends IntegRunner {
+  constructor(options: IntegRunnerOptions) {
+    super(options);
+  }
+
+  /**
+   * Synth the integration tests and compare the templates
+   * to the existing snapshot.
+   */
+  public testSnapshot(): Diagnostic[] {
+    try {
+      // read the existing snapshot
+      const expectedStacks = this.readAssembly(this.snapshotDir);
+
+      // if lookups are enabled then write the dummy context file
+      if (this.enableLookups) {
+        this.writeContext();
+      }
+      // synth the integration test
+      this.cdk.synth({
+        ...this.defaultArgs,
+        all: true,
+        app: this.cdkApp,
+        output: this.cdkOutDir,
+        lookups: this.enableLookups,
+      });
+      const actualStacks = this.readAssembly(path.join(this.directory, this.cdkOutDir));
+
+      // diff the existing snapshot (expected) with the integration test (actual)
+      const diagnostics = this.diffAssembly(expectedStacks, actualStacks);
+      return diagnostics;
+    } catch (e) {
+      throw e;
+    } finally {
+      this.cleanupContextFile();
+      this.cleanup();
+    }
+  }
+
+  private diffAssembly(existing: Record<string, any>, actual: Record<string, any>): Diagnostic[] {
+    const verifyHashes = this.pragmas().includes(VERIFY_ASSET_HASHES);
+    const failures: Diagnostic[] = [];
+    for (const templateId of Object.keys(existing)) {
+      if (!actual.hasOwnProperty(templateId)) {
+        failures.push({
+          testName: this.testName,
+          reason: DiagnosticReason.SNAPSHOT_FAILED,
+          message: `${templateId} exists in snapshot, but not in actual`,
+        });
+      }
+    }
+
+    for (const templateId of Object.keys(actual)) {
+      if (!existing.hasOwnProperty(templateId)) {
+        failures.push({
+          testName: this.testName,
+          reason: DiagnosticReason.SNAPSHOT_FAILED,
+          message: `${templateId} does not exist in snapshot, but does in actual`,
+        });
+      } else {
+        let actualTemplate = actual[templateId];
+        let expectedTemplate = existing[templateId];
+
+        if (!verifyHashes) {
+          actualTemplate = canonicalizeTemplate(actualTemplate);
+          expectedTemplate = canonicalizeTemplate(expectedTemplate);
+        }
+        const diff = diffTemplate(expectedTemplate, actualTemplate);
+        if (!diff.isEmpty) {
+          const writable = new StringWritable({});
+          formatDifferences(writable, diff);
+          failures.push({
+            reason: DiagnosticReason.SNAPSHOT_FAILED,
+            message: writable.data,
+            testName: this.testName,
+          });
+        }
+      }
+    }
+
+    return failures;
+  }
+
+  private readAssembly(dir: string): Record<string, any> {
+    const assembly = AssemblyManifestReader.fromPath(dir);
+    const stacks = assembly.stacks;
+
+    return stacks;
+  }
+}
+
+class StringWritable extends Writable {
+  public data: string;
+  private _decoder: NodeStringDecoder;
+  constructor(options: WritableOptions) {
+    super(options);
+    this._decoder = new StringDecoder();
+    this.data = '';
+  }
+
+  _write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void {
+    if (encoding === 'buffer') {
+      chunk = this._decoder.write(chunk);
+    }
+
+    this.data += chunk;
+    callback();
+  }
+
+  _final(callback: (error?: Error | null) => void): void {
+    this.data += this._decoder.end();
+    callback();
+  }
+}
+
+// Default context we run all integ tests with, so they don't depend on the
+// account of the exercising user.
+const DEFAULT_SYNTH_OPTIONS = {
+  context: {
+    [AVAILABILITY_ZONE_FALLBACK_CONTEXT_KEY]: ['test-region-1a', 'test-region-1b', 'test-region-1c'],
+    'availability-zones:account=12345678:region=test-region': ['test-region-1a', 'test-region-1b', 'test-region-1c'],
+    'ssm:account=12345678:parameterName=/aws/service/ami-amazon-linux-latest/amzn-ami-hvm-x86_64-gp2:region=test-region': 'ami-1234',
+    'ssm:account=12345678:parameterName=/aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2:region=test-region': 'ami-1234',
+    'ssm:account=12345678:parameterName=/aws/service/ecs/optimized-ami/amazon-linux/recommended:region=test-region': '{"image_id": "ami-1234"}',
+    // eslint-disable-next-line max-len
+    'ami:account=12345678:filters.image-type.0=machine:filters.name.0=amzn-ami-vpc-nat-*:filters.state.0=available:owners.0=amazon:region=test-region': 'ami-1234',
+    'vpc-provider:account=12345678:filter.isDefault=true:region=test-region:returnAsymmetricSubnets=true': {
+      vpcId: 'vpc-60900905',
+      subnetGroups: [
+        {
+          type: 'Public',
+          name: 'Public',
+          subnets: [
+            {
+              subnetId: 'subnet-e19455ca',
+              availabilityZone: 'us-east-1a',
+              routeTableId: 'rtb-e19455ca',
+            },
+            {
+              subnetId: 'subnet-e0c24797',
+              availabilityZone: 'us-east-1b',
+              routeTableId: 'rtb-e0c24797',
+            },
+            {
+              subnetId: 'subnet-ccd77395',
+              availabilityZone: 'us-east-1c',
+              routeTableId: 'rtb-ccd77395',
+            },
+          ],
+        },
+      ],
+    },
+    // Enable feature flags for all integ tests
+    ...FUTURE_FLAGS,
+
+    // Restricting to these target partitions makes most service principals synthesize to
+    // `service.${URL_SUFFIX}`, which is technically *incorrect* (it's only `amazonaws.com`
+    // or `amazonaws.com.cn`, never UrlSuffix for any of the restricted regions) but it's what
+    // most existing integ tests contain, and we want to disturb as few as possible.
+    [TARGET_PARTITIONS]: ['aws', 'aws-cn'],
+  },
+  env: {
+    CDK_INTEG_ACCOUNT: '12345678',
+    CDK_INTEG_REGION: 'test-region',
+  },
+};
diff --git a/packages/@aws-cdk/integ-runner/lib/workers/common.ts b/packages/@aws-cdk/integ-runner/lib/workers/common.ts
new file mode 100644
index 0000000000000..db196cc809937
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/workers/common.ts
@@ -0,0 +1,119 @@
+import { IntegTestConfig } from '../runner/integ-tests';
+import * as logger from '../runner/private/logger';
+
+/**
+ * Integration test results
+ */
+export interface IntegBatchResponse {
+  failedTests: IntegTestConfig[];
+}
+
+/**
+ * Common options for running integration tests
+ */
+export interface IntegTestOptions {
+  /**
+   * A list of integration tests to run
+   * in this batch
+   */
+  readonly tests: IntegTestConfig[];
+
+  /**
+   * Whether or not to destroy the stacks at the
+   * end of the test
+   *
+   * @default true
+   */
+  readonly clean?: boolean;
+
+  /**
+   * When this is set to `true` the snapshot will
+   * be created _without_ running the integration test
+   * The resulting snapshot SHOULD NOT be checked in
+   *
+   * @default false
+   */
+  readonly dryRun?: boolean;
+
+  /**
+   * Whether to enable verbose logging
+   *
+   * @default false
+   */
+  readonly verbose?: boolean;
+}
+
+/**
+ * Represents possible reasons for a diagnostic
+ */
+export enum DiagnosticReason {
+  /**
+   * The integration test failed because there
+   * is not existing snapshot
+   */
+  NO_SNAPSHOT = 'NO_SNAPSHOT',
+
+  /**
+   * The integration test failed
+   */
+  TEST_FAILED = 'TEST_FAILED',
+
+  /**
+   * The snapshot test failed because the actual
+   * snapshot was different than the expected snapshot
+   */
+  SNAPSHOT_FAILED = 'SNAPSHOT_FAILED',
+
+  /**
+   * The snapshot test succeeded
+   */
+  SNAPSHOT_SUCCESS = 'SNAPSHOT_SUCCESS',
+
+  /**
+   * The integration test succeeded
+   */
+  TEST_SUCCESS = 'TEST_SUCCESS',
+}
+
+/**
+ * Integration test diagnostics
+ * This is used to report back the status of each test
+ */
+export interface Diagnostic {
+  /**
+   * The name of the test
+   */
+  readonly testName: string;
+
+  /**
+   * The diagnostic message
+   */
+  readonly message: string;
+
+  /**
+   * The reason for the diagnostic
+   */
+  readonly reason: DiagnosticReason;
+}
+
+/**
+ * Print out the results from tests
+ */
+export function printResults(diagnostic: Diagnostic): void {
+  switch (diagnostic.reason) {
+    case DiagnosticReason.SNAPSHOT_SUCCESS:
+      logger.success('  %s No Change!', diagnostic.testName);
+      break;
+    case DiagnosticReason.TEST_SUCCESS:
+      logger.success('  %s Test Succeeded!', diagnostic.testName);
+      break;
+    case DiagnosticReason.NO_SNAPSHOT:
+      logger.error('  %s - No Snapshot!', diagnostic.testName);
+      break;
+    case DiagnosticReason.SNAPSHOT_FAILED:
+      logger.error('  %s - Snapshot changed!\n%s', diagnostic.testName, diagnostic.message);
+      break;
+    case DiagnosticReason.TEST_FAILED:
+      logger.error('  %s - Failed!\n%s', diagnostic.testName, diagnostic.message);
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/lib/workers/extract_worker.ts b/packages/@aws-cdk/integ-runner/lib/workers/extract_worker.ts
new file mode 100644
index 0000000000000..42b0e63b1f9af
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/workers/extract_worker.ts
@@ -0,0 +1,35 @@
+import * as workerpool from 'workerpool';
+import { IntegTestConfig } from '../runner/integ-tests';
+import { Diagnostic, IntegBatchResponse } from './common';
+import { singleThreadedSnapshotRunner } from './integ-snapshot-worker';
+import { singleThreadedTestRunner, IntegTestBatchRequest } from './integ-test-worker';
+
+/**
+ * Options for running snapshot tests
+ */
+export interface SnapshotBatchRequest {
+  readonly tests: IntegTestConfig[];
+}
+
+/**
+ * Snapshot test results
+ */
+export interface SnapshotBatchResponse {
+  diagnostics: Diagnostic[];
+  failedTests: IntegTestConfig[];
+}
+
+function integTestBatch(request: IntegTestBatchRequest): IntegBatchResponse {
+  const result = singleThreadedTestRunner(request);
+  return result;
+}
+
+function snapshotTestBatch(request: SnapshotBatchRequest): IntegBatchResponse {
+  const result = singleThreadedSnapshotRunner(request.tests);
+  return result;
+}
+
+workerpool.worker({
+  snapshotTestBatch,
+  integTestBatch,
+});
diff --git a/packages/@aws-cdk/integ-runner/lib/workers/integ-snapshot-worker.ts b/packages/@aws-cdk/integ-runner/lib/workers/integ-snapshot-worker.ts
new file mode 100644
index 0000000000000..f92efe543746a
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/workers/integ-snapshot-worker.ts
@@ -0,0 +1,51 @@
+import * as workerpool from 'workerpool';
+import { IntegTestConfig } from '../runner/integ-tests';
+import { IntegSnapshotRunner } from '../runner/runners';
+import { DiagnosticReason, IntegBatchResponse } from './common';
+
+/**
+ * Runs a single snapshot test batch request.
+ * For each integration test this will check to see
+ * if there is an existing snapshot, and if there is will
+ * check if there are any changes
+ */
+export function singleThreadedSnapshotRunner(tests: IntegTestConfig[]): IntegBatchResponse {
+  const failedTests = new Array<IntegTestConfig>();
+  for (const test of tests) {
+    const runner = new IntegSnapshotRunner({ fileName: test.fileName });
+    try {
+      if (!runner.hasSnapshot()) {
+        workerpool.workerEmit({
+          reason: DiagnosticReason.NO_SNAPSHOT,
+          testName: runner.testName,
+          message: 'No Snapshot',
+        });
+        failedTests.push(test);
+      } else {
+        const snapshotDiagnostics = runner.testSnapshot();
+        if (snapshotDiagnostics.length > 0) {
+          snapshotDiagnostics.forEach(diagnostic => workerpool.workerEmit(diagnostic));
+          failedTests.push(test);
+        } else {
+          workerpool.workerEmit({
+            reason: DiagnosticReason.SNAPSHOT_SUCCESS,
+            testName: runner.testName,
+            message: 'Success',
+          });
+        }
+      }
+    } catch (e) {
+      failedTests.push(test);
+      workerpool.workerEmit({
+        message: e.message,
+        testName: runner.testName,
+        reason: DiagnosticReason.SNAPSHOT_FAILED,
+      });
+    }
+  }
+
+  return {
+    failedTests,
+  };
+}
+
diff --git a/packages/@aws-cdk/integ-runner/lib/workers/integ-test-worker.ts b/packages/@aws-cdk/integ-runner/lib/workers/integ-test-worker.ts
new file mode 100644
index 0000000000000..def9915d91c35
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/lib/workers/integ-test-worker.ts
@@ -0,0 +1,124 @@
+import * as workerpool from 'workerpool';
+import { IntegTestConfig } from '../runner/integ-tests';
+import * as logger from '../runner/private/logger';
+import { IntegTestRunner } from '../runner/runners';
+import { printResults, IntegBatchResponse, IntegTestOptions, DiagnosticReason } from './common';
+
+/**
+ * Options for an integration test batch
+ */
+export interface IntegTestBatchRequest extends IntegTestOptions {
+  /**
+   * The AWS region to run this batch in
+   */
+  readonly region: string;
+}
+
+/**
+ * Options for running all integration tests
+ */
+export interface IntegTestRunOptions extends IntegTestOptions {
+  /**
+   * The regions to run the integration tests across.
+   * This allows the runner to run integration tests in parallel
+   */
+  readonly regions: string[];
+
+  /**
+   * The workerpool to use
+   */
+  readonly pool: workerpool.WorkerPool;
+}
+
+
+/**
+ * Runs a set of integration tests in parallel across a list of AWS regions.
+ * Only a single test can be run at a time in a given region. Once a region
+ * is done running a test, the next test will be pulled from the queue
+ */
+export async function runIntegrationTestsInParallel(
+  options: IntegTestRunOptions,
+): Promise<IntegBatchResponse[]> {
+
+  const queue = options.tests;
+  const results: IntegBatchResponse[] = [];
+
+  async function runTest(region: string): Promise<void> {
+    do {
+      const test = queue.pop();
+      if (!test) break;
+      logger.highlight(`Running test ${test.fileName} in ${region}`);
+      const response: IntegBatchResponse = await options.pool.exec('integTestBatch', [{
+        region,
+        tests: [test],
+        clean: options.clean,
+        dryRun: options.dryRun,
+        verbose: options.verbose,
+      }], {
+        on: printResults,
+      });
+
+      results.push(response);
+    } while (queue.length > 0);
+  }
+
+  const workers = options.regions.map((region) => runTest(region));
+  await Promise.all(workers);
+  return results;
+}
+
+/**
+ * Runs a single integration test batch request.
+ * If the test does not have an existing snapshot,
+ * this will first generate a snapshot and then execute
+ * the integration tests.
+ *
+ * If the tests succeed it will then save the snapshot
+ */
+export function singleThreadedTestRunner(request: IntegTestBatchRequest): IntegBatchResponse {
+  const failures: IntegTestConfig[] = [];
+  for (const test of request.tests) {
+    const runner = new IntegTestRunner({
+      fileName: test.fileName,
+      env: {
+        AWS_REGION: request.region,
+      },
+    });
+    try {
+      if (!runner.hasSnapshot()) {
+        runner.generateSnapshot();
+      }
+
+      if (!runner.tests) {
+        throw new Error(`No tests defined for ${runner.testName}`);
+      }
+      for (const [testName, testCase] of Object.entries(runner.tests)) {
+        try {
+          runner.runIntegTestCase({
+            testCase: testCase,
+            clean: request.clean,
+            dryRun: request.dryRun,
+          });
+          workerpool.workerEmit({
+            reason: DiagnosticReason.TEST_SUCCESS,
+            testName: testName,
+            message: 'Success',
+          });
+        } catch (e) {
+          failures.push(test);
+          workerpool.workerEmit({
+            reason: DiagnosticReason.TEST_FAILED,
+            testName: testName,
+            message: `Integration test failed: ${e}`,
+          });
+        }
+      }
+    } catch (e) {
+      logger.error(`Errors running test cases: ${e}`);
+    }
+  }
+
+  return {
+    failedTests: failures,
+  };
+}
diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
new file mode 100644
index 0000000000000..af90b78aef132
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/package.json
@@ -0,0 +1,79 @@
+{
+  "name": "@aws-cdk/integ-runner",
+  "description": "CDK Integration Testing Tool",
+  "version": "0.0.0",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "bin": {
+    "integ-runner": "bin/integ-runner"
+  },
+  "scripts": {
+    "build": "cdk-build",
+    "lint": "cdk-lint",
+    "package": "cdk-package",
+    "awslint": "cdk-awslint",
+    "pkglint": "pkglint -f",
+    "test": "cdk-test",
+    "watch": "cdk-watch",
+    "build+test": "yarn build && yarn test",
+    "build+test+package": "yarn build+test && yarn package",
+    "compat": "cdk-compat",
+    "build+extract": "yarn build",
+    "build+test+extract": "yarn build+test"
+  },
+  "author": {
+    "name": "Amazon Web Services",
+    "url": "https://aws.amazon.com",
+    "organization": true
+  },
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
+    "@types/fs-extra": "^8.1.2",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^10.17.60",
+    "@types/workerpool": "^6.1.0",
+    "@types/yargs": "^15.0.14",
+    "jest": "^27.5.1"
+  },
+  "dependencies": {
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
+    "@aws-cdk/cloudformation-diff": "0.0.0",
+    "@aws-cdk/cx-api": "0.0.0",
+    "aws-cdk": "0.0.0",
+    "cdk-cli-wrapper": "0.0.0",
+    "chalk": "^4",
+    "fs-extra": "^9.1.0",
+    "workerpool": "^6.2.0",
+    "yargs": "^16.2.0"
+  },
+  "repository": {
+    "url": "https://github.com/aws/aws-cdk.git",
+    "type": "git",
+    "directory": "packages/@aws-cdk/integ-runner"
+  },
+  "keywords": [
+    "aws",
+    "cdk"
+  ],
+  "homepage": "https://github.com/aws/aws-cdk",
+  "engines": {
+    "node": ">= 10.13.0 <13 || >=13.7.0"
+  },
+  "cdk-package": {
+    "shrinkWrap": true
+  },
+  "nozem": {
+    "ostools": [
+      "unzip",
+      "diff",
+      "rm"
+    ]
+  },
+  "stability": "experimental",
+  "maturity": "experimental",
+  "publishConfig": {
+    "tag": "latest"
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/runner/integration-tests.test.ts b/packages/@aws-cdk/integ-runner/test/runner/integration-tests.test.ts
new file mode 100644
index 0000000000000..878f5bf5d2489
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/runner/integration-tests.test.ts
@@ -0,0 +1,15 @@
+import * as path from 'path';
+import { IntegrationTests } from '../../lib/runner/integ-tests';
+
+const directory = path.join(__dirname, '../test-data');
+
+describe('IntegrationTests', () => {
+  test('from cli args', async () => {
+    const tests = new IntegrationTests(directory);
+
+    const integTests = await tests.fromCliArgs(['integ.integ-test1.js']);
+
+    expect(integTests.length).toEqual(1);
+    expect(integTests[0].fileName).toEqual(expect.stringMatching(/integ.integ-test1.js$/));
+  });
+});
diff --git a/packages/@aws-cdk/integ-runner/test/runner/runners.test.ts b/packages/@aws-cdk/integ-runner/test/runner/runners.test.ts
new file mode 100644
index 0000000000000..8894f5ba92843
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/runner/runners.test.ts
@@ -0,0 +1,324 @@
+import * as path from 'path';
+import * as fs from 'fs-extra';
+import { IntegTestRunner, IntegSnapshotRunner } from '../../lib/runner/runners';
+import { DiagnosticReason } from '../../lib/workers/common';
+
+describe('IntegTest runSnapshotTests', () => {
+  let synthMock: jest.SpyInstance;
+  beforeEach(() => {
+    jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(process.stdout, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'moveSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'removeSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { return true; });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+  test('with defaults no diff', () => {
+    // WHEN
+    const integTest = new IntegSnapshotRunner({
+      fileName: path.join(__dirname, '../test-data/integ.test-with-snapshot.js'),
+      integOutDir: 'test-with-snapshot.integ.snapshot',
+    });
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    integTest.testSnapshot();
+
+    // THEN
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      all: true,
+      app: 'node integ.test-with-snapshot.js',
+      output: 'test-with-snapshot.integ.snapshot',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      lookups: false,
+    });
+  });
+
+  test('with defaults and diff', () => {
+    // WHEN
+    const integTest = new IntegSnapshotRunner({
+      fileName: path.join(__dirname, '../test-data/integ.test-with-snapshot.js'),
+      integOutDir: 'test-with-snapshot-diff.integ.snapshot',
+    });
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    const diagnostics = integTest.testSnapshot();
+
+    // THEN
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      all: true,
+      app: 'node integ.test-with-snapshot.js',
+      output: 'test-with-snapshot-diff.integ.snapshot',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      lookups: false,
+    });
+    expect(diagnostics).toEqual(expect.arrayContaining([expect.objectContaining({
+      reason: DiagnosticReason.SNAPSHOT_FAILED,
+      testName: integTest.testName,
+      message: expect.stringContaining('foobar'),
+    })]));
+  });
+
+  test('dont diff asset hashes', () => {
+    // WHEN
+    const integTest = new IntegSnapshotRunner({
+      fileName: path.join(__dirname, '../test-data/integ.test-with-snapshot-assets-diff.js'),
+      integOutDir: 'test-with-snapshot-assets.integ.snapshot',
+    });
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    expect(() => {
+      integTest.testSnapshot();
+    }).not.toThrow();
+
+    // THEN
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      all: true,
+      app: 'node integ.test-with-snapshot-assets-diff.js',
+      output: 'test-with-snapshot-assets.integ.snapshot',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      lookups: true,
+    });
+  });
+
+  test('diff asset hashes', () => {
+    // WHEN
+    const integTest = new IntegSnapshotRunner({
+      fileName: path.join(__dirname, '../test-data/integ.test-with-snapshot-assets.js'),
+      integOutDir: 'test-with-snapshot-assets-diff.integ.snapshot',
+    });
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    const diagnostics = integTest.testSnapshot();
+
+    // THEN
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      all: true,
+      app: 'node integ.test-with-snapshot-assets.js',
+      output: 'test-with-snapshot-assets-diff.integ.snapshot',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      lookups: false,
+    });
+    expect(diagnostics).toEqual(expect.arrayContaining([expect.objectContaining({
+      reason: DiagnosticReason.SNAPSHOT_FAILED,
+      testName: integTest.testName,
+      message: expect.stringContaining('Parameters'),
+    })]));
+  });
+});
+
+describe('IntegTest runIntegTests', () => {
+  let integTest: IntegTestRunner;
+  let deployMock: jest.SpyInstance;
+  let destroyMock: jest.SpyInstance;
+  let synthMock: jest.SpyInstance;
+  let listMock: jest.SpyInstance;
+  // let stderrMock: jest.SpyInstance;
+  beforeEach(() => {
+    integTest = new IntegTestRunner({ fileName: path.join(__dirname, '../test-data/integ.integ-test1.js') });
+    deployMock = jest.spyOn(integTest.cdk, 'deploy').mockImplementation();
+    destroyMock = jest.spyOn(integTest.cdk, 'destroy').mockImplementation();
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    listMock = jest.spyOn(integTest.cdk, 'list').mockImplementation();
+    jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'moveSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'removeSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { return true; });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+  test('with defaults', () => {
+    // WHEN
+    integTest.runIntegTestCase({
+      testCase: {
+        stacks: ['stack1'],
+      },
+    });
+
+    // THEN
+    expect(deployMock).toHaveBeenCalledTimes(1);
+    expect(destroyMock).toHaveBeenCalledTimes(1);
+    expect(synthMock).toHaveBeenCalledTimes(0);
+    expect(deployMock.mock.calls[0][0]).toEqual({
+      app: 'node integ.integ-test1.js',
+      requireApproval: 'never',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      lookups: false,
+      stacks: ['stack1'],
+      output: 'cdk-integ.out.integ-test1',
+    });
+    expect(destroyMock.mock.calls[0][0]).toEqual({
+      app: 'node integ.integ-test1.js',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      force: true,
+      stacks: ['stack1'],
+      output: 'cdk-integ.out.integ-test1',
+    });
+  });
+
+  test('with lookups', () => {
+    // WHEN
+    integTest = new IntegTestRunner({ fileName: path.join(__dirname, '../test-data/integ.test-with-snapshot-assets-diff.js') });
+    deployMock = jest.spyOn(integTest.cdk, 'deploy').mockImplementation();
+    destroyMock = jest.spyOn(integTest.cdk, 'destroy').mockImplementation();
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    listMock = jest.spyOn(integTest.cdk, 'list').mockImplementation();
+    integTest.runIntegTestCase({
+      testCase: {
+        stacks: ['test-stack'],
+      },
+    });
+
+    // THEN
+    expect(deployMock).toHaveBeenCalledTimes(1);
+    expect(destroyMock).toHaveBeenCalledTimes(1);
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(deployMock.mock.calls[0][0]).toEqual({
+      app: 'node integ.test-with-snapshot-assets-diff.js',
+      requireApproval: 'never',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      lookups: true,
+      stacks: ['test-stack'],
+      output: 'cdk-integ.out.test-with-snapshot-assets-diff',
+    });
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      app: 'node integ.test-with-snapshot-assets-diff.js',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      all: true,
+      output: 'test-with-snapshot-assets-diff.integ.snapshot',
+    });
+    expect(destroyMock.mock.calls[0][0]).toEqual({
+      app: 'node integ.test-with-snapshot-assets-diff.js',
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      force: true,
+      stacks: ['test-stack'],
+      output: 'cdk-integ.out.test-with-snapshot-assets-diff',
+    });
+  });
+
+  test('no clean', () => {
+    // WHEN
+    integTest.runIntegTestCase({
+      clean: false,
+      testCase: {
+        stacks: ['stack1'],
+      },
+    });
+
+    // THEN
+    expect(deployMock).toHaveBeenCalledTimes(1);
+    expect(destroyMock).toHaveBeenCalledTimes(0);
+    expect(synthMock).toHaveBeenCalledTimes(0);
+  });
+
+  test('dryrun', () => {
+    // WHEN
+    integTest.runIntegTestCase({
+      dryRun: true,
+      testCase: {
+        stacks: ['stack1'],
+      },
+    });
+
+    // THEN
+    expect(deployMock).toHaveBeenCalledTimes(0);
+    expect(destroyMock).toHaveBeenCalledTimes(0);
+    expect(synthMock).toHaveBeenCalledTimes(1);
+  });
+
+  test('determine test stack via pragma', () => {
+    // WHEN
+    integTest.generateSnapshot();
+
+    // THEN
+    expect(integTest.tests).toEqual(expect.objectContaining({
+      'integ-test1': {
+        stacks: ['stack1'],
+      },
+    }));
+    expect(listMock).toHaveBeenCalledTimes(0);
+  });
+
+  test('generate snapshot', () => {
+    // WHEN
+    integTest.generateSnapshot();
+
+    // THEN
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      all: true,
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      app: 'node integ.integ-test1.js',
+      output: 'cdk-integ.out.integ-test1',
+    });
+  });
+});
+
+describe('IntegTest no pragma', () => {
+  let integTest: IntegTestRunner;
+  let synthMock: jest.SpyInstance;
+  beforeEach(() => {
+    integTest = new IntegTestRunner({ fileName: path.join(__dirname, '../test-data/integ.integ-test2.js') });
+    jest.spyOn(integTest.cdk, 'deploy').mockImplementation();
+    jest.spyOn(integTest.cdk, 'destroy').mockImplementation();
+    synthMock = jest.spyOn(integTest.cdk, 'synth').mockImplementation();
+    jest.spyOn(integTest.cdk, 'list').mockImplementation(() => {
+      return 'stackabc';
+    });
+    jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'moveSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'removeSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { return true; });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+  test('get stacks from list', async () => {
+    // WHEN
+    integTest.generateSnapshot();
+
+    // THEN
+    expect(integTest.tests).toEqual(expect.objectContaining({
+      'integ-test2': {
+        stacks: ['stackabc'],
+      },
+    }));
+    expect(synthMock).toHaveBeenCalledTimes(1);
+    expect(synthMock.mock.calls[0][0]).toEqual({
+      app: 'node integ.integ-test2.js',
+      all: true,
+      pathMetadata: false,
+      assetMetadata: false,
+      versionReporting: false,
+      output: 'cdk-integ.out.integ-test2',
+    });
+  });
+});
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/test-stack.template.json
new file mode 100644
index 0000000000000..40f4c8238c04f
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/test-stack.template.json
@@ -0,0 +1,54 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foo"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets-diff/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/test-stack.template.json
new file mode 100644
index 0000000000000..40f4c8238c04f
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/test-stack.template.json
@@ -0,0 +1,54 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foo"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot-assets/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/test-stack.template.json
new file mode 100644
index 0000000000000..40f4c8238c04f
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/test-stack.template.json
@@ -0,0 +1,54 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foo"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/cdk-integ.out.test-with-snapshot/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test1.ts b/packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test1.ts
new file mode 100644
index 0000000000000..26679b49d93bc
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test1.ts
@@ -0,0 +1,2 @@
+/// !cdk-integ stack1 pragma:ignore-assets
+/// !cdk-integ pragma:ignore-assets
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test2.ts b/packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test2.ts
new file mode 100644
index 0000000000000..bb0eb24f2756d
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/integ.integ-test2.ts
@@ -0,0 +1 @@
+/// !cdk-integ pragma:enable-lookups
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets-diff.ts b/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets-diff.ts
new file mode 100644
index 0000000000000..bcdc92fbcdcf2
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets-diff.ts
@@ -0,0 +1 @@
+/// !cdk-integ test-stack pragma:enable-lookups
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets.ts b/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets.ts
new file mode 100644
index 0000000000000..ff230f9f7e58e
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot-assets.ts
@@ -0,0 +1 @@
+/// !cdk-integ test-stack pragma:include-assets-hashes
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot.ts b/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot.ts
new file mode 100644
index 0000000000000..c3548a8acffcc
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/integ.test-with-snapshot.ts
@@ -0,0 +1,2 @@
+/// !cdk-integ test-stack pragma:ignore-assets
+/// !cdk-integ pragma:ignore-assets
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/not.integ-test.ts b/packages/@aws-cdk/integ-runner/test/test-data/not.integ-test.ts
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/test-stack.template.json
new file mode 100644
index 0000000000000..969780cdf33e5
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/test-stack.template.json
@@ -0,0 +1,68 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foo"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  },
+  "Parameters": {
+    "AssetParametersDec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509S3BucketBF50F97C": {
+      "Type": "String",
+      "Description": "S3 bucket for asset \"Dec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509\""
+    },
+    "AssetParametersDec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509S3VersionKeyF21AC8C1": {
+      "Type": "String",
+      "Description": "S3 key for asset version \"Dec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509\""
+    },
+    "AssetParametersDec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509ArtifactHash5D8C129B": {
+      "Type": "String",
+      "Description": "Artifact hash for asset \"Dec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509\""
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets-diff.integ.snapshot/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/test-stack.template.json
new file mode 100644
index 0000000000000..ed2a09b94be23
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/test-stack.template.json
@@ -0,0 +1,68 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foo"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  },
+  "Parameters": {
+    "AssetParametersfec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509S3BucketBF50F97C": {
+      "Type": "String",
+      "Description": "S3 bucket for asset \"fec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509\""
+    },
+    "AssetParametersfec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509S3VersionKeyF21AC8C1": {
+      "Type": "String",
+      "Description": "S3 key for asset version \"fec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509\""
+    },
+    "AssetParametersfec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509ArtifactHash5D8C129B": {
+      "Type": "String",
+      "Description": "Artifact hash for asset \"fec1c56a3f23d9d27f58815e0c34c810cc02f431ac63a078f9b5d2aa44cc3509\""
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-assets.integ.snapshot/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/test-stack.template.json
new file mode 100644
index 0000000000000..3d62830b46139
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/test-stack.template.json
@@ -0,0 +1,54 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foobar"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot-diff.integ.snapshot/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/cdk.out b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/cdk.out
new file mode 100644
index 0000000000000..2efc89439fab8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"18.0.0"}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/manifest.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/manifest.json
new file mode 100644
index 0000000000000..c0da3afe14484
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/manifest.json
@@ -0,0 +1,57 @@
+{
+  "version": "17.0.0",
+  "artifacts": {
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    },
+    "test-stack": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "test-stack.template.json",
+        "validateOnSynth": false
+      },
+      "metadata": {
+        "/test-stack/MyFunction1/ServiceRole/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction1ServiceRole9852B06B",
+            "trace": [
+              "new Role (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-iam/lib/role.js:50:22)",
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:82:35)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ],
+        "/test-stack/MyFunction1/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyFunction12A744C2E",
+            "trace": [
+              "new Function (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-lambda/lib/function.js:154:26)",
+              "new TestStack (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:10:9)",
+              "Object.<anonymous> (/home/hallcor/work/aws-cdk/integ-test-runner/packages/@aws-cdk/aws-s3objectlambda/test/integ.lambda.js:18:1)",
+              "Module._compile (node:internal/modules/cjs/loader:1103:14)",
+              "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)",
+              "Module.load (node:internal/modules/cjs/loader:981:32)",
+              "Function.Module._load (node:internal/modules/cjs/loader:822:12)",
+              "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)",
+              "node:internal/main/run_main_module:17:47"
+            ]
+          }
+        ]
+      },
+      "displayName": "test-stack"
+    }
+  }
+}
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/test-stack.template.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/test-stack.template.json
new file mode 100644
index 0000000000000..40f4c8238c04f
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/test-stack.template.json
@@ -0,0 +1,54 @@
+{
+  "Resources": {
+    "MyFunction1ServiceRole9852B06B": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "lambda.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "ManagedPolicyArns": [
+          {
+            "Fn::Join": [
+              "",
+              [
+                "arn:",
+                {
+                  "Ref": "AWS::Partition"
+                },
+                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+              ]
+            ]
+          }
+        ]
+      }
+    },
+    "MyFunction12A744C2E": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Code": {
+          "ZipFile": "foo"
+        },
+        "Role": {
+          "Fn::GetAtt": [
+            "MyFunction1ServiceRole9852B06B",
+            "Arn"
+          ]
+        },
+        "Handler": "index.handler",
+        "Runtime": "nodejs14.x"
+      },
+      "DependsOn": [
+        "MyFunction1ServiceRole9852B06B"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/tree.json b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/tree.json
new file mode 100644
index 0000000000000..b664bec74b37c
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/test-data/test-with-snapshot.integ.snapshot/tree.json
@@ -0,0 +1,114 @@
+{
+  "version": "tree-0.1",
+  "tree": {
+    "id": "App",
+    "path": "",
+    "children": {
+      "Tree": {
+        "id": "Tree",
+        "path": "Tree",
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Construct",
+          "version": "0.0.0"
+        }
+      },
+      "test-stack": {
+        "id": "test-stack",
+        "path": "test-stack",
+        "children": {
+          "MyFunction1": {
+            "id": "MyFunction1",
+            "path": "test-stack/MyFunction1",
+            "children": {
+              "ServiceRole": {
+                "id": "ServiceRole",
+                "path": "test-stack/MyFunction1/ServiceRole",
+                "children": {
+                  "Resource": {
+                    "id": "Resource",
+                    "path": "test-stack/MyFunction1/ServiceRole/Resource",
+                    "attributes": {
+                      "aws:cdk:cloudformation:type": "AWS::IAM::Role",
+                      "aws:cdk:cloudformation:props": {
+                        "assumeRolePolicyDocument": {
+                          "Statement": [
+                            {
+                              "Action": "sts:AssumeRole",
+                              "Effect": "Allow",
+                              "Principal": {
+                                "Service": "lambda.amazonaws.com"
+                              }
+                            }
+                          ],
+                          "Version": "2012-10-17"
+                        },
+                        "managedPolicyArns": [
+                          {
+                            "Fn::Join": [
+                              "",
+                              [
+                                "arn:",
+                                {
+                                  "Ref": "AWS::Partition"
+                                },
+                                ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+                              ]
+                            ]
+                          }
+                        ]
+                      }
+                    },
+                    "constructInfo": {
+                      "fqn": "@aws-cdk/aws-iam.CfnRole",
+                      "version": "0.0.0"
+                    }
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-iam.Role",
+                  "version": "0.0.0"
+                }
+              },
+              "Resource": {
+                "id": "Resource",
+                "path": "test-stack/MyFunction1/Resource",
+                "attributes": {
+                  "aws:cdk:cloudformation:type": "AWS::Lambda::Function",
+                  "aws:cdk:cloudformation:props": {
+                    "code": {
+                      "zipFile": "foo"
+                    },
+                    "role": {
+                      "Fn::GetAtt": [
+                        "MyFunction1ServiceRole9852B06B",
+                        "Arn"
+                      ]
+                    },
+                    "handler": "index.handler",
+                    "runtime": "nodejs14.x"
+                  }
+                },
+                "constructInfo": {
+                  "fqn": "@aws-cdk/aws-lambda.CfnFunction",
+                  "version": "0.0.0"
+                }
+              }
+            },
+            "constructInfo": {
+              "fqn": "@aws-cdk/aws-lambda.Function",
+              "version": "0.0.0"
+            }
+          }
+        },
+        "constructInfo": {
+          "fqn": "@aws-cdk/core.Stack",
+          "version": "0.0.0"
+        }
+      }
+    },
+    "constructInfo": {
+      "fqn": "@aws-cdk/core.App",
+      "version": "0.0.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/integ-runner/test/workers/mock-extract_worker.ts b/packages/@aws-cdk/integ-runner/test/workers/mock-extract_worker.ts
new file mode 100644
index 0000000000000..7479d229302b8
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/workers/mock-extract_worker.ts
@@ -0,0 +1,15 @@
+import * as workerpool from 'workerpool';
+import { IntegBatchResponse } from '../../lib/workers/common';
+import { IntegTestBatchRequest } from '../../lib/workers/integ-test-worker';
+
+
+function integTestBatch(request: IntegTestBatchRequest): IntegBatchResponse {
+  return {
+    failedTests: request.tests,
+  };
+}
+
+workerpool.worker({
+  integTestBatch,
+});
+
diff --git a/packages/@aws-cdk/integ-runner/test/workers/workers.test.ts b/packages/@aws-cdk/integ-runner/test/workers/workers.test.ts
new file mode 100644
index 0000000000000..cc0be1ec8a9b0
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/test/workers/workers.test.ts
@@ -0,0 +1,266 @@
+import * as child_process from 'child_process';
+import * as path from 'path';
+import * as fs from 'fs-extra';
+import * as workerpool from 'workerpool';
+import { singleThreadedSnapshotRunner } from '../../lib/workers/integ-snapshot-worker';
+import { singleThreadedTestRunner, runIntegrationTestsInParallel } from '../../lib/workers/integ-test-worker';
+
+const directory = path.join(__dirname, '../test-data');
+describe('Snapshot tests', () => {
+  beforeEach(() => {
+    jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(process.stdout, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'moveSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'removeSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { return true; });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+  test('no snapshot', () => {
+    // WHEN
+    const test = {
+      fileName: path.join(directory, 'integ.integ-test1.js'),
+      directory: directory,
+    };
+    const result = singleThreadedSnapshotRunner([test]);
+
+    // THEN
+    expect(result.failedTests.length).toEqual(1);
+    expect(result.failedTests[0]).toEqual(test);
+  });
+
+  test('has snapshot', () => {
+    // WHEN
+    jest.spyOn(child_process, 'spawnSync').mockResolvedValue;
+    const test = {
+      fileName: path.join(directory, 'integ.test-with-snapshot.js'),
+      directory: directory,
+    };
+    const result = singleThreadedSnapshotRunner([test]);
+
+    // THEN
+    expect(result.failedTests.length).toEqual(0);
+  });
+
+  test('failed snapshot', () => {
+    // WHEN
+    jest.spyOn(child_process, 'spawnSync').mockRejectedValue;
+    const test = {
+      fileName: path.join(directory, 'integ.test-with-snapshot-assets.js'),
+      directory: directory,
+    };
+    const result = singleThreadedSnapshotRunner([test]);
+
+    // THEN
+    expect(result.failedTests.length).toEqual(1);
+    expect(result.failedTests[0]).toEqual(test);
+  });
+});
+
+describe('test runner', () => {
+  beforeEach(() => {
+    jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(process.stdout, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'moveSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'removeSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { return true; });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+
+  test('no snapshot', () => {
+    // WHEN
+    const test = {
+      fileName: path.join(directory, 'integ.integ-test1.js'),
+      directory: directory,
+    };
+    const spawnSyncMock = jest.spyOn(child_process, 'spawnSync').mockImplementation();
+    singleThreadedTestRunner({
+      tests: [test],
+      region: 'us-east-1',
+    });
+
+    expect(spawnSyncMock).toHaveBeenCalledWith(
+      expect.stringMatching(/cdk/),
+      ['synth', '--app', 'node integ.integ-test1.js', '--no-version-reporting', '--no-path-metadata', '--no-asset-metadata', '--output', 'cdk-integ.out.integ-test1', '--all'],
+      expect.anything(),
+    );
+  });
+});
+
+describe('parallel worker', () => {
+  let pool: workerpool.WorkerPool;
+  let stderrMock: jest.SpyInstance;
+  beforeEach(() => {
+    pool = workerpool.pool(path.join(__dirname, './mock-extract_worker.js'));
+    stderrMock = jest.spyOn(process.stderr, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(process.stdout, 'write').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'moveSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'removeSync').mockImplementation(() => { return true; });
+    jest.spyOn(fs, 'writeFileSync').mockImplementation(() => { return true; });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+    void pool.terminate();
+  });
+  test('run tests', async () => {
+    const tests = [{
+      fileName: 'integ.test-with-snapshot.js',
+      directory,
+    }];
+    const results = await runIntegrationTestsInParallel({
+      tests,
+      pool,
+      regions: ['us-east-1'],
+    });
+
+    expect(stderrMock.mock.calls[0][0]).toContain(
+      'Running test integ.test-with-snapshot.js in us-east-1',
+    );
+    expect(results).toEqual([
+      {
+        failedTests: [{
+          fileName: 'integ.test-with-snapshot.js',
+          directory,
+        }],
+      },
+    ]);
+  });
+
+  test('run multiple tests', async () => {
+    const tests = [
+      {
+        fileName: 'integ.test-with-snapshot.js',
+        directory,
+      },
+      {
+        fileName: 'integ.another-test-with-snapshot.js',
+        directory,
+      },
+    ];
+    const results = await runIntegrationTestsInParallel({
+      tests,
+      pool,
+      regions: ['us-east-1', 'us-east-2'],
+    });
+
+    expect(stderrMock.mock.calls[1][0]).toContain(
+      'Running test integ.test-with-snapshot.js in us-east-2',
+    );
+    expect(stderrMock.mock.calls[0][0]).toContain(
+      'Running test integ.another-test-with-snapshot.js in us-east-1',
+    );
+    expect(results).toEqual(expect.arrayContaining([
+      {
+        failedTests: [
+          {
+            fileName: 'integ.test-with-snapshot.js',
+            directory,
+          },
+        ],
+      },
+      {
+        failedTests: [
+          {
+            fileName: 'integ.another-test-with-snapshot.js',
+            directory,
+          },
+        ],
+      },
+    ]));
+  });
+
+  test('more tests than regions', async () => {
+    const tests = [
+      {
+        fileName: 'integ.test-with-snapshot.js',
+        directory,
+      },
+      {
+        fileName: 'integ.another-test-with-snapshot.js',
+        directory,
+      },
+    ];
+    const results = await runIntegrationTestsInParallel({
+      tests,
+      pool,
+      regions: ['us-east-1'],
+    });
+
+    expect(stderrMock.mock.calls[1][0]).toContain(
+      'Running test integ.test-with-snapshot.js in us-east-1',
+    );
+    expect(stderrMock.mock.calls[0][0]).toContain(
+      'Running test integ.another-test-with-snapshot.js in us-east-1',
+    );
+    expect(results).toEqual([
+      {
+        failedTests: [
+          {
+            fileName: 'integ.another-test-with-snapshot.js',
+            directory,
+          },
+        ],
+      },
+      {
+        failedTests: [
+          {
+            fileName: 'integ.test-with-snapshot.js',
+            directory,
+          },
+        ],
+      },
+    ]);
+  });
+
+  test('more regions than tests', async () => {
+    const tests = [
+      {
+        fileName: 'integ.test-with-snapshot.js',
+        directory,
+      },
+      {
+        fileName: 'integ.another-test-with-snapshot.js',
+        directory,
+      },
+    ];
+    const results = await runIntegrationTestsInParallel({
+      tests,
+      pool,
+      regions: ['us-east-1', 'us-east-2', 'us-west-2'],
+    });
+
+    expect(stderrMock.mock.calls[1][0]).toContain(
+      'Running test integ.test-with-snapshot.js in us-east-2',
+    );
+    expect(stderrMock.mock.calls[0][0]).toContain(
+      'Running test integ.another-test-with-snapshot.js in us-east-1',
+    );
+    expect(results).toEqual(expect.arrayContaining([
+      {
+        failedTests: [
+          {
+            fileName: 'integ.another-test-with-snapshot.js',
+            directory,
+          },
+        ],
+      },
+      {
+        failedTests: [
+          {
+            fileName: 'integ.test-with-snapshot.js',
+            directory,
+          },
+        ],
+      },
+    ]));
+  });
+});
diff --git a/packages/@aws-cdk/integ-runner/tsconfig.json b/packages/@aws-cdk/integ-runner/tsconfig.json
new file mode 100644
index 0000000000000..04e0404f04442
--- /dev/null
+++ b/packages/@aws-cdk/integ-runner/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "target": "ES2018",
+        "module": "commonjs",
+        "lib": ["es2018", "dom"],
+        "strict": true,
+        "alwaysStrict": true,
+        "declaration": true,
+        "inlineSourceMap": true,
+        "inlineSources": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitReturns": true,
+        "noFallthroughCasesInSwitch": true,
+        "resolveJsonModule": true,
+        "composite": true,
+        "incremental": true
+      },
+    "include": [
+        "**/*.ts",
+        "**/*.d.ts",
+        "lib/init-templates/*/*/add-project.hook.ts"
+    ],
+    "exclude": [
+        "lib/init-templates/*/typescript/**/*.ts"
+    ]
+}
+
diff --git a/packages/cdk-cli-wrapper/lib/cdk-wrapper.ts b/packages/cdk-cli-wrapper/lib/cdk-wrapper.ts
index 80bc2f407555a..bfcd4983f776d 100644
--- a/packages/cdk-cli-wrapper/lib/cdk-wrapper.ts
+++ b/packages/cdk-cli-wrapper/lib/cdk-wrapper.ts
@@ -110,11 +110,16 @@ export class CdkCliWrapper implements ICdk {
     }
   }
 
+  private validateArgs(options: DefaultCdkOptions): void {
+    if (!options.stacks && !options.all) {
+      throw new Error('one of "app" or "stacks" must be provided');
+    }
+  }
+
   public list(options: ListOptions): string {
     const listCommandArgs: string[] = [
-      ...this.createDefaultArguments(options),
       ...renderBooleanArg('long', options.long),
-      ...options.stacks,
+      ...this.createDefaultArguments(options),
     ];
 
     return exec([this.cdk, 'ls', ...listCommandArgs], {
@@ -128,7 +133,6 @@ export class CdkCliWrapper implements ICdk {
    */
   public deploy(options: DeployOptions): void {
     const deployCommandArgs: string[] = [
-      ...this.createDefaultArguments(options),
       ...renderBooleanArg('ci', options.ci),
       ...renderBooleanArg('execute', options.execute),
       ...renderBooleanArg('exclusively', options.exclusively),
@@ -143,7 +147,7 @@ export class CdkCliWrapper implements ICdk {
       ...options.requireApproval ? ['--require-approval', options.requireApproval] : [],
       ...options.changeSetName ? ['--change-set-name', options.changeSetName] : [],
       ...options.toolkitStackName ? ['--toolkit-stack-name', options.toolkitStackName] : [],
-      ...options.stacks,
+      ...this.createDefaultArguments(options),
     ];
 
     exec([this.cdk, 'deploy', ...deployCommandArgs], {
@@ -158,10 +162,9 @@ export class CdkCliWrapper implements ICdk {
    */
   public destroy(options: DestroyOptions): void {
     const destroyCommandArgs: string[] = [
-      ...this.createDefaultArguments(options),
       ...renderBooleanArg('force', options.force),
       ...renderBooleanArg('exclusively', options.exclusively),
-      ...options.stacks,
+      ...this.createDefaultArguments(options),
     ];
 
     exec([this.cdk, 'destroy', ...destroyCommandArgs], {
@@ -176,11 +179,10 @@ export class CdkCliWrapper implements ICdk {
    */
   public synth(options: SynthOptions): void {
     const synthCommandArgs: string[] = [
-      ...this.createDefaultArguments(options),
       ...renderBooleanArg('validation', options.validation),
       ...renderBooleanArg('quiet', options.quiet),
       ...renderBooleanArg('exclusively', options.exclusively),
-      ...options.stacks,
+      ...this.createDefaultArguments(options),
     ];
 
     exec([this.cdk, 'synth', ...synthCommandArgs], {
@@ -209,6 +211,8 @@ export class CdkCliWrapper implements ICdk {
   }
 
   private createDefaultArguments(options: DefaultCdkOptions): string[] {
+    this.validateArgs(options);
+    const stacks = options.stacks ?? [];
     return [
       ...options.app ? ['--app', options.app] : [],
       ...renderBooleanArg('strict', options.strict),
@@ -230,6 +234,8 @@ export class CdkCliWrapper implements ICdk {
       ...options.caBundlePath ? ['--ca-bundle-path', options.caBundlePath] : [],
       ...options.roleArn ? ['--role-arn', options.roleArn] : [],
       ...options.output ? ['--output', options.output] : [],
+      ...stacks,
+      ...options.all ? ['--all'] : [],
     ];
   }
 }
diff --git a/packages/cdk-cli-wrapper/lib/commands/common.ts b/packages/cdk-cli-wrapper/lib/commands/common.ts
index 78e027cd922ca..01ab969b63098 100644
--- a/packages/cdk-cli-wrapper/lib/commands/common.ts
+++ b/packages/cdk-cli-wrapper/lib/commands/common.ts
@@ -24,8 +24,21 @@ export enum RequireApproval {
 export interface DefaultCdkOptions {
   /**
    * List of stacks to deploy
+   *
+   * Requried if `all` is not set
+   *
+   * @default - []
+   */
+  readonly stacks?: string[];
+
+  /**
+   * Deploy all stacks
+   *
+   * Requried if `stacks` is not set
+   *
+   * @default - false
    */
-  readonly stacks: string[];
+  readonly all?: boolean;
 
   /**
    * command-line for executing your app or a cloud assembly directory
diff --git a/packages/cdk-cli-wrapper/test/cdk-wrapper.test.ts b/packages/cdk-cli-wrapper/test/cdk-wrapper.test.ts
index 2f25054632cae..5cc294f3b5b7b 100644
--- a/packages/cdk-cli-wrapper/test/cdk-wrapper.test.ts
+++ b/packages/cdk-cli-wrapper/test/cdk-wrapper.test.ts
@@ -1,6 +1,6 @@
 import * as child_process from 'child_process';
 import { CdkCliWrapper } from '../lib/cdk-wrapper';
-import { RequireApproval } from '../lib/commands/common';
+import { RequireApproval } from '../lib/commands';
 let spawnSyncMock: jest.SpyInstance;
 
 beforeEach(() => {
@@ -89,8 +89,6 @@ test('deploy with all arguments', () => {
     expect.stringMatching(/aws-cdk\/bin\/cdk/),
     expect.arrayContaining([
       'deploy',
-      '--app',
-      'node bin/my-app.js',
       '--no-strict',
       '--no-trace',
       '--no-lookups',
@@ -122,6 +120,8 @@ test('deploy with all arguments', () => {
       '--change-set-name', 'my-change-set',
       '--toolkit-stack-name', 'Toolkit',
       '--previous-parameters',
+      '--app',
+      'node bin/my-app.js',
       'test-stack1',
     ]),
     expect.objectContaining({
@@ -182,10 +182,10 @@ test('can parse parameters', () => {
     expect.stringMatching(/aws-cdk\/bin\/cdk/),
     [
       'deploy',
-      '--app',
-      'node bin/my-app.js',
       '--parameters', 'myparam=test',
       '--parameters', 'test-stack1:myotherparam=test',
+      '--app',
+      'node bin/my-app.js',
       'test-stack1',
     ],
     expect.objectContaining({
@@ -246,10 +246,10 @@ test('can parse array arguments', () => {
     expect.stringMatching(/aws-cdk\/bin\/cdk/),
     [
       'deploy',
-      '--app',
-      'node bin/my-app.js',
       '--notification-arns', 'arn:aws:us-east-1:1111111111:some:resource',
       '--notification-arns', 'arn:aws:us-east-1:1111111111:some:other-resource',
+      '--app',
+      'node bin/my-app.js',
       'test-stack1',
     ],
     expect.objectContaining({
@@ -355,7 +355,7 @@ test('destroy arguments', () => {
   // THEN
   expect(spawnSyncMock).toHaveBeenCalledWith(
     expect.stringMatching(/aws-cdk\/bin\/cdk/),
-    ['destroy', '--app', 'node bin/my-app.js', '--force', '--no-exclusively', 'test-stack1'],
+    ['destroy', '--force', '--no-exclusively', '--app', 'node bin/my-app.js', 'test-stack1'],
     expect.objectContaining({
       env: expect.objectContaining({
         KEY: 'value',
@@ -416,7 +416,7 @@ test('ls arguments', () => {
   // THEN
   expect(spawnSyncMock).toHaveBeenCalledWith(
     expect.stringMatching(/aws-cdk\/bin\/cdk/),
-    ['ls', '--app', 'node bin/my-app.js', '--long', '*'],
+    ['ls', '--long', '--app', 'node bin/my-app.js', '*'],
     expect.objectContaining({
       env: expect.objectContaining({
         KEY: 'value',
diff --git a/tools/@aws-cdk/cdk-build-tools/lib/package-info.ts b/tools/@aws-cdk/cdk-build-tools/lib/package-info.ts
index afc76b48bdefd..83ca5563887e6 100644
--- a/tools/@aws-cdk/cdk-build-tools/lib/package-info.ts
+++ b/tools/@aws-cdk/cdk-build-tools/lib/package-info.ts
@@ -83,6 +83,7 @@ export async function unitTestFiles(): Promise<File[]> {
 }
 
 export async function hasIntegTests(): Promise<boolean> {
+  if (currentPackageJson().name === '@aws-cdk/integ-runner') return false;
   const files = await listFiles('test', f => f.filename.startsWith('integ.') && f.filename.endsWith('.js'));
   return files.length > 0;
 }
diff --git a/yarn.lock b/yarn.lock
index dddaf06264d5a..469782c499a97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1994,6 +1994,13 @@
   resolved "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
   integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
 
+"@types/workerpool@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.npmjs.org/@types/workerpool/-/workerpool-6.1.0.tgz#16c3b9d3c62a8f6e6ad2e4d6212a68130f0cd3b1"
+  integrity sha512-C+J/c1BHyc351xJuiH2Jbe+V9hjf5mCzRP0UK4KEpF5SpuU+vJ/FC5GLZsCU/PJpp/3I6Uwtfm3DG7Lmrb7LOQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/wrap-ansi@^3.0.0":
   version "3.0.0"
   resolved "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd"

From f1c465d50ed750508e34695ec077e9f99b935742 Mon Sep 17 00:00:00 2001
From: Romain Marcadier <rmuller@amazon.com>
Date: Wed, 30 Mar 2022 13:37:27 -0700
Subject: [PATCH 14/19] chore: apply v2 trove classifier on v2 python packages
 (#19630)

Those are currently incorrectly listed against version 1 of the
Framework :: AWS CDK trove classifier. This changes so the v2 branch
correctly uses version 2 here.


----

### All Submissions:

* [X] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)?
	* [ ] Did you use `cdk-integ` to deploy the infrastructure and generate the snapshot (i.e. `cdk-integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 tools/@aws-cdk/pkglint/lib/rules.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/@aws-cdk/pkglint/lib/rules.ts b/tools/@aws-cdk/pkglint/lib/rules.ts
index 777d6ba8104e7..e1d8e42582b6d 100644
--- a/tools/@aws-cdk/pkglint/lib/rules.ts
+++ b/tools/@aws-cdk/pkglint/lib/rules.ts
@@ -809,7 +809,7 @@ export class JSIIPythonTarget extends ValidationRule {
 
     expectJSON(this.name, pkg, 'jsii.targets.python.distName', moduleName.python.distName);
     expectJSON(this.name, pkg, 'jsii.targets.python.module', moduleName.python.module);
-    expectJSON(this.name, pkg, 'jsii.targets.python.classifiers', ['Framework :: AWS CDK', 'Framework :: AWS CDK :: 1']);
+    expectJSON(this.name, pkg, 'jsii.targets.python.classifiers', ['Framework :: AWS CDK', `Framework :: AWS CDK :: ${cdkMajorVersion()}`]);
   }
 }
 

From c7e309d6f5b74cacc4bdd5731c5c8dc1b7752ff1 Mon Sep 17 00:00:00 2001
From: Madeline Kusters <mkusters@amazon.com>
Date: Wed, 30 Mar 2022 14:04:45 -0700
Subject: [PATCH 15/19] fix merge conflict

---
 packages/@aws-cdk/aws-s3-assets/test/asset.test.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts b/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
index 5da2fad648880..db8f6a2652cd8 100644
--- a/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
+++ b/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
@@ -429,7 +429,3 @@ function mkdtempSync() {
 function isStackArtifact(x: any): x is cxapi.CloudFormationStackArtifact {
   return x instanceof cxapi.CloudFormationStackArtifact;
 }
-
-function isAssetManifestArtifact(x: any): x is cxapi.AssetManifestArtifact {
-  return x instanceof cxapi.AssetManifestArtifact;
-}

From a3c53ecb7dd5780efe243613c212d40e5c66c52b Mon Sep 17 00:00:00 2001
From: madeline-k <madeline-k@users.noreply.github.com>
Date: Wed, 30 Mar 2022 21:10:07 +0000
Subject: [PATCH 16/19] automatic pkglint fixes

---
 packages/@aws-cdk/alexa-ask/package.json                     | 2 +-
 packages/@aws-cdk/app-delivery/package.json                  | 2 +-
 packages/@aws-cdk/assertions/package.json                    | 2 +-
 packages/@aws-cdk/assets/package.json                        | 2 +-
 packages/@aws-cdk/aws-accessanalyzer/package.json            | 2 +-
 packages/@aws-cdk/aws-acmpca/package.json                    | 2 +-
 packages/@aws-cdk/aws-amazonmq/package.json                  | 2 +-
 packages/@aws-cdk/aws-amplify/package.json                   | 2 +-
 packages/@aws-cdk/aws-amplifyuibuilder/package.json          | 2 +-
 packages/@aws-cdk/aws-apigateway/package.json                | 2 +-
 packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json  | 2 +-
 packages/@aws-cdk/aws-apigatewayv2-integrations/package.json | 2 +-
 packages/@aws-cdk/aws-apigatewayv2/package.json              | 2 +-
 packages/@aws-cdk/aws-appconfig/package.json                 | 2 +-
 packages/@aws-cdk/aws-appflow/package.json                   | 2 +-
 packages/@aws-cdk/aws-appintegrations/package.json           | 2 +-
 packages/@aws-cdk/aws-applicationautoscaling/package.json    | 2 +-
 packages/@aws-cdk/aws-applicationinsights/package.json       | 2 +-
 packages/@aws-cdk/aws-appmesh/package.json                   | 2 +-
 packages/@aws-cdk/aws-apprunner/package.json                 | 2 +-
 packages/@aws-cdk/aws-appstream/package.json                 | 2 +-
 packages/@aws-cdk/aws-appsync/package.json                   | 2 +-
 packages/@aws-cdk/aws-aps/package.json                       | 2 +-
 packages/@aws-cdk/aws-athena/package.json                    | 2 +-
 packages/@aws-cdk/aws-auditmanager/package.json              | 2 +-
 packages/@aws-cdk/aws-autoscaling-common/package.json        | 2 +-
 packages/@aws-cdk/aws-autoscaling-hooktargets/package.json   | 2 +-
 packages/@aws-cdk/aws-autoscaling/package.json               | 2 +-
 packages/@aws-cdk/aws-autoscalingplans/package.json          | 2 +-
 packages/@aws-cdk/aws-backup/package.json                    | 2 +-
 packages/@aws-cdk/aws-batch/package.json                     | 2 +-
 packages/@aws-cdk/aws-billingconductor/package.json          | 2 +-
 packages/@aws-cdk/aws-budgets/package.json                   | 2 +-
 packages/@aws-cdk/aws-cassandra/package.json                 | 2 +-
 packages/@aws-cdk/aws-ce/package.json                        | 2 +-
 packages/@aws-cdk/aws-certificatemanager/package.json        | 2 +-
 packages/@aws-cdk/aws-chatbot/package.json                   | 2 +-
 packages/@aws-cdk/aws-cloud9/package.json                    | 2 +-
 packages/@aws-cdk/aws-cloudformation/package.json            | 2 +-
 packages/@aws-cdk/aws-cloudfront-origins/package.json        | 2 +-
 packages/@aws-cdk/aws-cloudfront/package.json                | 2 +-
 packages/@aws-cdk/aws-cloudtrail/package.json                | 2 +-
 packages/@aws-cdk/aws-cloudwatch-actions/package.json        | 2 +-
 packages/@aws-cdk/aws-cloudwatch/package.json                | 2 +-
 packages/@aws-cdk/aws-codeartifact/package.json              | 2 +-
 packages/@aws-cdk/aws-codebuild/package.json                 | 2 +-
 packages/@aws-cdk/aws-codecommit/package.json                | 2 +-
 packages/@aws-cdk/aws-codedeploy/package.json                | 2 +-
 packages/@aws-cdk/aws-codeguruprofiler/package.json          | 2 +-
 packages/@aws-cdk/aws-codegurureviewer/package.json          | 2 +-
 packages/@aws-cdk/aws-codepipeline-actions/package.json      | 2 +-
 packages/@aws-cdk/aws-codepipeline/package.json              | 2 +-
 packages/@aws-cdk/aws-codestar/package.json                  | 2 +-
 packages/@aws-cdk/aws-codestarconnections/package.json       | 2 +-
 packages/@aws-cdk/aws-codestarnotifications/package.json     | 2 +-
 packages/@aws-cdk/aws-cognito-identitypool/package.json      | 2 +-
 packages/@aws-cdk/aws-cognito/package.json                   | 2 +-
 packages/@aws-cdk/aws-config/package.json                    | 2 +-
 packages/@aws-cdk/aws-connect/package.json                   | 2 +-
 packages/@aws-cdk/aws-cur/package.json                       | 2 +-
 packages/@aws-cdk/aws-customerprofiles/package.json          | 2 +-
 packages/@aws-cdk/aws-databrew/package.json                  | 2 +-
 packages/@aws-cdk/aws-datapipeline/package.json              | 2 +-
 packages/@aws-cdk/aws-datasync/package.json                  | 2 +-
 packages/@aws-cdk/aws-dax/package.json                       | 2 +-
 packages/@aws-cdk/aws-detective/package.json                 | 2 +-
 packages/@aws-cdk/aws-devopsguru/package.json                | 2 +-
 packages/@aws-cdk/aws-directoryservice/package.json          | 2 +-
 packages/@aws-cdk/aws-dlm/package.json                       | 2 +-
 packages/@aws-cdk/aws-dms/package.json                       | 2 +-
 packages/@aws-cdk/aws-docdb/package.json                     | 2 +-
 packages/@aws-cdk/aws-dynamodb-global/package.json           | 2 +-
 packages/@aws-cdk/aws-dynamodb/package.json                  | 2 +-
 packages/@aws-cdk/aws-ec2/package.json                       | 2 +-
 packages/@aws-cdk/aws-ecr-assets/package.json                | 2 +-
 packages/@aws-cdk/aws-ecr/package.json                       | 2 +-
 packages/@aws-cdk/aws-ecs-patterns/package.json              | 2 +-
 packages/@aws-cdk/aws-ecs/package.json                       | 2 +-
 packages/@aws-cdk/aws-efs/package.json                       | 2 +-
 packages/@aws-cdk/aws-eks-legacy/package.json                | 2 +-
 packages/@aws-cdk/aws-eks/package.json                       | 2 +-
 packages/@aws-cdk/aws-elasticache/package.json               | 2 +-
 packages/@aws-cdk/aws-elasticbeanstalk/package.json          | 2 +-
 packages/@aws-cdk/aws-elasticloadbalancing/package.json      | 2 +-
 .../@aws-cdk/aws-elasticloadbalancingv2-actions/package.json | 2 +-
 .../@aws-cdk/aws-elasticloadbalancingv2-targets/package.json | 2 +-
 packages/@aws-cdk/aws-elasticloadbalancingv2/package.json    | 2 +-
 packages/@aws-cdk/aws-elasticsearch/package.json             | 2 +-
 packages/@aws-cdk/aws-emr/package.json                       | 2 +-
 packages/@aws-cdk/aws-emrcontainers/package.json             | 2 +-
 packages/@aws-cdk/aws-events-targets/package.json            | 2 +-
 packages/@aws-cdk/aws-events/package.json                    | 2 +-
 packages/@aws-cdk/aws-eventschemas/package.json              | 2 +-
 packages/@aws-cdk/aws-evidently/package.json                 | 2 +-
 packages/@aws-cdk/aws-finspace/package.json                  | 2 +-
 packages/@aws-cdk/aws-fis/package.json                       | 2 +-
 packages/@aws-cdk/aws-fms/package.json                       | 2 +-
 packages/@aws-cdk/aws-forecast/package.json                  | 2 +-
 packages/@aws-cdk/aws-frauddetector/package.json             | 2 +-
 packages/@aws-cdk/aws-fsx/package.json                       | 2 +-
 packages/@aws-cdk/aws-gamelift/package.json                  | 2 +-
 .../@aws-cdk/aws-globalaccelerator-endpoints/package.json    | 2 +-
 packages/@aws-cdk/aws-globalaccelerator/package.json         | 2 +-
 packages/@aws-cdk/aws-glue/package.json                      | 2 +-
 packages/@aws-cdk/aws-greengrass/package.json                | 2 +-
 packages/@aws-cdk/aws-greengrassv2/package.json              | 2 +-
 packages/@aws-cdk/aws-groundstation/package.json             | 2 +-
 packages/@aws-cdk/aws-guardduty/package.json                 | 2 +-
 packages/@aws-cdk/aws-healthlake/package.json                | 2 +-
 packages/@aws-cdk/aws-iam/package.json                       | 2 +-
 packages/@aws-cdk/aws-imagebuilder/package.json              | 2 +-
 packages/@aws-cdk/aws-inspector/package.json                 | 2 +-
 packages/@aws-cdk/aws-inspectorv2/package.json               | 2 +-
 packages/@aws-cdk/aws-iot-actions/package.json               | 2 +-
 packages/@aws-cdk/aws-iot/package.json                       | 2 +-
 packages/@aws-cdk/aws-iot1click/package.json                 | 2 +-
 packages/@aws-cdk/aws-iotanalytics/package.json              | 2 +-
 packages/@aws-cdk/aws-iotcoredeviceadvisor/package.json      | 2 +-
 packages/@aws-cdk/aws-iotevents-actions/package.json         | 2 +-
 packages/@aws-cdk/aws-iotevents/package.json                 | 2 +-
 packages/@aws-cdk/aws-iotfleethub/package.json               | 2 +-
 packages/@aws-cdk/aws-iotsitewise/package.json               | 2 +-
 packages/@aws-cdk/aws-iotthingsgraph/package.json            | 2 +-
 packages/@aws-cdk/aws-iotwireless/package.json               | 2 +-
 packages/@aws-cdk/aws-ivs/package.json                       | 2 +-
 packages/@aws-cdk/aws-kafkaconnect/package.json              | 2 +-
 packages/@aws-cdk/aws-kendra/package.json                    | 2 +-
 packages/@aws-cdk/aws-kinesis/package.json                   | 2 +-
 packages/@aws-cdk/aws-kinesisanalytics-flink/package.json    | 2 +-
 packages/@aws-cdk/aws-kinesisanalytics/package.json          | 2 +-
 packages/@aws-cdk/aws-kinesisanalyticsv2/package.json        | 2 +-
 .../@aws-cdk/aws-kinesisfirehose-destinations/package.json   | 2 +-
 packages/@aws-cdk/aws-kinesisfirehose/package.json           | 2 +-
 packages/@aws-cdk/aws-kinesisvideo/package.json              | 2 +-
 packages/@aws-cdk/aws-kms/package.json                       | 2 +-
 packages/@aws-cdk/aws-lakeformation/package.json             | 2 +-
 packages/@aws-cdk/aws-lambda-destinations/package.json       | 2 +-
 packages/@aws-cdk/aws-lambda-event-sources/package.json      | 2 +-
 packages/@aws-cdk/aws-lambda-go/package.json                 | 2 +-
 packages/@aws-cdk/aws-lambda-nodejs/package.json             | 2 +-
 packages/@aws-cdk/aws-lambda-python/package.json             | 2 +-
 packages/@aws-cdk/aws-lambda/package.json                    | 2 +-
 packages/@aws-cdk/aws-lex/package.json                       | 2 +-
 packages/@aws-cdk/aws-licensemanager/package.json            | 2 +-
 packages/@aws-cdk/aws-lightsail/package.json                 | 2 +-
 packages/@aws-cdk/aws-location/package.json                  | 2 +-
 packages/@aws-cdk/aws-logs-destinations/package.json         | 2 +-
 packages/@aws-cdk/aws-logs/package.json                      | 2 +-
 packages/@aws-cdk/aws-lookoutequipment/package.json          | 2 +-
 packages/@aws-cdk/aws-lookoutmetrics/package.json            | 2 +-
 packages/@aws-cdk/aws-lookoutvision/package.json             | 2 +-
 packages/@aws-cdk/aws-macie/package.json                     | 2 +-
 packages/@aws-cdk/aws-managedblockchain/package.json         | 2 +-
 packages/@aws-cdk/aws-mediaconnect/package.json              | 2 +-
 packages/@aws-cdk/aws-mediaconvert/package.json              | 2 +-
 packages/@aws-cdk/aws-medialive/package.json                 | 2 +-
 packages/@aws-cdk/aws-mediapackage/package.json              | 2 +-
 packages/@aws-cdk/aws-mediastore/package.json                | 2 +-
 packages/@aws-cdk/aws-memorydb/package.json                  | 2 +-
 packages/@aws-cdk/aws-msk/package.json                       | 2 +-
 packages/@aws-cdk/aws-mwaa/package.json                      | 2 +-
 packages/@aws-cdk/aws-neptune/package.json                   | 2 +-
 packages/@aws-cdk/aws-networkfirewall/package.json           | 2 +-
 packages/@aws-cdk/aws-networkmanager/package.json            | 2 +-
 packages/@aws-cdk/aws-nimblestudio/package.json              | 2 +-
 packages/@aws-cdk/aws-opensearchservice/package.json         | 2 +-
 packages/@aws-cdk/aws-opsworks/package.json                  | 2 +-
 packages/@aws-cdk/aws-opsworkscm/package.json                | 2 +-
 packages/@aws-cdk/aws-panorama/package.json                  | 2 +-
 packages/@aws-cdk/aws-personalize/package.json               | 2 +-
 packages/@aws-cdk/aws-pinpoint/package.json                  | 2 +-
 packages/@aws-cdk/aws-pinpointemail/package.json             | 2 +-
 packages/@aws-cdk/aws-qldb/package.json                      | 2 +-
 packages/@aws-cdk/aws-quicksight/package.json                | 2 +-
 packages/@aws-cdk/aws-ram/package.json                       | 2 +-
 packages/@aws-cdk/aws-rds/package.json                       | 2 +-
 packages/@aws-cdk/aws-redshift/package.json                  | 2 +-
 packages/@aws-cdk/aws-refactorspaces/package.json            | 2 +-
 packages/@aws-cdk/aws-rekognition/package.json               | 2 +-
 packages/@aws-cdk/aws-resiliencehub/package.json             | 2 +-
 packages/@aws-cdk/aws-resourcegroups/package.json            | 2 +-
 packages/@aws-cdk/aws-robomaker/package.json                 | 2 +-
 packages/@aws-cdk/aws-route53-patterns/package.json          | 2 +-
 packages/@aws-cdk/aws-route53-targets/package.json           | 2 +-
 packages/@aws-cdk/aws-route53/package.json                   | 2 +-
 packages/@aws-cdk/aws-route53recoverycontrol/package.json    | 2 +-
 packages/@aws-cdk/aws-route53recoveryreadiness/package.json  | 2 +-
 packages/@aws-cdk/aws-route53resolver/package.json           | 2 +-
 packages/@aws-cdk/aws-rum/package.json                       | 2 +-
 packages/@aws-cdk/aws-s3-assets/package.json                 | 2 +-
 packages/@aws-cdk/aws-s3-deployment/package.json             | 2 +-
 packages/@aws-cdk/aws-s3-notifications/package.json          | 2 +-
 packages/@aws-cdk/aws-s3/package.json                        | 2 +-
 packages/@aws-cdk/aws-s3objectlambda/package.json            | 2 +-
 packages/@aws-cdk/aws-s3outposts/package.json                | 2 +-
 packages/@aws-cdk/aws-sagemaker/package.json                 | 2 +-
 packages/@aws-cdk/aws-sam/package.json                       | 2 +-
 packages/@aws-cdk/aws-sdb/package.json                       | 2 +-
 packages/@aws-cdk/aws-secretsmanager/package.json            | 2 +-
 packages/@aws-cdk/aws-securityhub/package.json               | 2 +-
 packages/@aws-cdk/aws-servicecatalog/package.json            | 2 +-
 packages/@aws-cdk/aws-servicecatalogappregistry/package.json | 2 +-
 packages/@aws-cdk/aws-servicediscovery/package.json          | 2 +-
 packages/@aws-cdk/aws-ses-actions/package.json               | 2 +-
 packages/@aws-cdk/aws-ses/package.json                       | 2 +-
 packages/@aws-cdk/aws-signer/package.json                    | 2 +-
 packages/@aws-cdk/aws-sns-subscriptions/package.json         | 2 +-
 packages/@aws-cdk/aws-sns/package.json                       | 2 +-
 packages/@aws-cdk/aws-sqs/package.json                       | 2 +-
 packages/@aws-cdk/aws-ssm/package.json                       | 2 +-
 packages/@aws-cdk/aws-ssmcontacts/package.json               | 2 +-
 packages/@aws-cdk/aws-ssmincidents/package.json              | 2 +-
 packages/@aws-cdk/aws-sso/package.json                       | 2 +-
 packages/@aws-cdk/aws-stepfunctions-tasks/package.json       | 2 +-
 packages/@aws-cdk/aws-stepfunctions/package.json             | 2 +-
 packages/@aws-cdk/aws-synthetics/package.json                | 2 +-
 packages/@aws-cdk/aws-timestream/package.json                | 2 +-
 packages/@aws-cdk/aws-transfer/package.json                  | 2 +-
 packages/@aws-cdk/aws-waf/package.json                       | 2 +-
 packages/@aws-cdk/aws-wafregional/package.json               | 2 +-
 packages/@aws-cdk/aws-wafv2/package.json                     | 2 +-
 packages/@aws-cdk/aws-wisdom/package.json                    | 2 +-
 packages/@aws-cdk/aws-workspaces/package.json                | 2 +-
 packages/@aws-cdk/aws-xray/package.json                      | 2 +-
 packages/@aws-cdk/cdk-assets-schema/package.json             | 2 +-
 packages/@aws-cdk/cloud-assembly-schema/package.json         | 2 +-
 packages/@aws-cdk/cloudformation-include/package.json        | 2 +-
 packages/@aws-cdk/core/package.json                          | 2 +-
 packages/@aws-cdk/custom-resources/package.json              | 2 +-
 packages/@aws-cdk/cx-api/package.json                        | 2 +-
 packages/@aws-cdk/example-construct-library/package.json     | 2 +-
 packages/@aws-cdk/integ-runner/package.json                  | 5 +++--
 packages/@aws-cdk/lambda-layer-awscli/package.json           | 2 +-
 packages/@aws-cdk/lambda-layer-kubectl/package.json          | 2 +-
 packages/@aws-cdk/pipelines/package.json                     | 2 +-
 packages/@aws-cdk/region-info/package.json                   | 2 +-
 packages/@aws-cdk/triggers/package.json                      | 2 +-
 packages/@aws-cdk/yaml-cfn/package.json                      | 2 +-
 packages/cdk-cli-wrapper/package.json                        | 2 +-
 239 files changed, 241 insertions(+), 240 deletions(-)

diff --git a/packages/@aws-cdk/alexa-ask/package.json b/packages/@aws-cdk/alexa-ask/package.json
index aa399f57c0e11..ccd7a174b5bc2 100644
--- a/packages/@aws-cdk/alexa-ask/package.json
+++ b/packages/@aws-cdk/alexa-ask/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.alexa_ask",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/app-delivery/package.json b/packages/@aws-cdk/app-delivery/package.json
index f2f15bf0c486a..514575344e5cb 100644
--- a/packages/@aws-cdk/app-delivery/package.json
+++ b/packages/@aws-cdk/app-delivery/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.app_delivery",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/assertions/package.json b/packages/@aws-cdk/assertions/package.json
index 76aff691768b1..b953d826ab993 100644
--- a/packages/@aws-cdk/assertions/package.json
+++ b/packages/@aws-cdk/assertions/package.json
@@ -42,7 +42,7 @@
         "module": "aws_cdk.assertions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
index 81063af27a480..794a682df5ae3 100644
--- a/packages/@aws-cdk/assets/package.json
+++ b/packages/@aws-cdk/assets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.assets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-accessanalyzer/package.json b/packages/@aws-cdk/aws-accessanalyzer/package.json
index c662614cc7a5d..ac62a0fcf888f 100644
--- a/packages/@aws-cdk/aws-accessanalyzer/package.json
+++ b/packages/@aws-cdk/aws-accessanalyzer/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_accessanalyzer",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-acmpca/package.json b/packages/@aws-cdk/aws-acmpca/package.json
index d8a682020500d..f2e42a59cc08a 100644
--- a/packages/@aws-cdk/aws-acmpca/package.json
+++ b/packages/@aws-cdk/aws-acmpca/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_acmpca",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-amazonmq/package.json b/packages/@aws-cdk/aws-amazonmq/package.json
index 36997e9b54e08..e0e34894b7a71 100644
--- a/packages/@aws-cdk/aws-amazonmq/package.json
+++ b/packages/@aws-cdk/aws-amazonmq/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_amazonmq",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-amplify/package.json b/packages/@aws-cdk/aws-amplify/package.json
index 3c6fd2f5f9253..7336974246077 100644
--- a/packages/@aws-cdk/aws-amplify/package.json
+++ b/packages/@aws-cdk/aws-amplify/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_amplify",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-amplifyuibuilder/package.json b/packages/@aws-cdk/aws-amplifyuibuilder/package.json
index 712f94e25d05d..9d8b1c3401301 100644
--- a/packages/@aws-cdk/aws-amplifyuibuilder/package.json
+++ b/packages/@aws-cdk/aws-amplifyuibuilder/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-amplifyuibuilder",
         "module": "aws_cdk.aws_amplifyuibuilder"
diff --git a/packages/@aws-cdk/aws-apigateway/package.json b/packages/@aws-cdk/aws-apigateway/package.json
index 2b6f68bcb31bd..f00a673d17a1a 100644
--- a/packages/@aws-cdk/aws-apigateway/package.json
+++ b/packages/@aws-cdk/aws-apigateway/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_apigateway",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json b/packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
index 0794d1db130dd..d72b259cb4f7d 100644
--- a/packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
+++ b/packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json
@@ -26,7 +26,7 @@
         "module": "aws_cdk.aws_apigatewayv2_authorizers",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/package.json b/packages/@aws-cdk/aws-apigatewayv2-integrations/package.json
index 8f9ca7cdc96b0..23d8b6fda7280 100644
--- a/packages/@aws-cdk/aws-apigatewayv2-integrations/package.json
+++ b/packages/@aws-cdk/aws-apigatewayv2-integrations/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_apigatewayv2_integrations",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-apigatewayv2/package.json b/packages/@aws-cdk/aws-apigatewayv2/package.json
index 85ae7948384e7..0640ea81dfd5e 100644
--- a/packages/@aws-cdk/aws-apigatewayv2/package.json
+++ b/packages/@aws-cdk/aws-apigatewayv2/package.json
@@ -29,7 +29,7 @@
         "module": "aws_cdk.aws_apigatewayv2",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-appconfig/package.json b/packages/@aws-cdk/aws-appconfig/package.json
index 2739635c3e9b3..6e24be7a09bcd 100644
--- a/packages/@aws-cdk/aws-appconfig/package.json
+++ b/packages/@aws-cdk/aws-appconfig/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_appconfig",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-appflow/package.json b/packages/@aws-cdk/aws-appflow/package.json
index dc0377f50ff16..f36d382aff57e 100644
--- a/packages/@aws-cdk/aws-appflow/package.json
+++ b/packages/@aws-cdk/aws-appflow/package.json
@@ -26,7 +26,7 @@
         "module": "aws_cdk.aws_appflow",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-appintegrations/package.json b/packages/@aws-cdk/aws-appintegrations/package.json
index 496e316e349a4..72723ef7bd272 100644
--- a/packages/@aws-cdk/aws-appintegrations/package.json
+++ b/packages/@aws-cdk/aws-appintegrations/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-appintegrations",
         "module": "aws_cdk.aws_appintegrations"
diff --git a/packages/@aws-cdk/aws-applicationautoscaling/package.json b/packages/@aws-cdk/aws-applicationautoscaling/package.json
index e11efe39a1181..34bee8592c248 100644
--- a/packages/@aws-cdk/aws-applicationautoscaling/package.json
+++ b/packages/@aws-cdk/aws-applicationautoscaling/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_applicationautoscaling",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-applicationinsights/package.json b/packages/@aws-cdk/aws-applicationinsights/package.json
index dd08f48398437..1ae89cacb369d 100644
--- a/packages/@aws-cdk/aws-applicationinsights/package.json
+++ b/packages/@aws-cdk/aws-applicationinsights/package.json
@@ -26,7 +26,7 @@
         "module": "aws_cdk.aws_applicationinsights",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-appmesh/package.json b/packages/@aws-cdk/aws-appmesh/package.json
index f42ab647a3243..134765203c619 100644
--- a/packages/@aws-cdk/aws-appmesh/package.json
+++ b/packages/@aws-cdk/aws-appmesh/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_appmesh",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-apprunner/package.json b/packages/@aws-cdk/aws-apprunner/package.json
index 1d17549b97f1b..85963616fee77 100644
--- a/packages/@aws-cdk/aws-apprunner/package.json
+++ b/packages/@aws-cdk/aws-apprunner/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-apprunner",
         "module": "aws_cdk.aws_apprunner"
diff --git a/packages/@aws-cdk/aws-appstream/package.json b/packages/@aws-cdk/aws-appstream/package.json
index 249d0072c4f1d..5c361ad96d1e7 100644
--- a/packages/@aws-cdk/aws-appstream/package.json
+++ b/packages/@aws-cdk/aws-appstream/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_appstream",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-appsync/package.json b/packages/@aws-cdk/aws-appsync/package.json
index 999fd7509dcdf..fa2d969adade2 100644
--- a/packages/@aws-cdk/aws-appsync/package.json
+++ b/packages/@aws-cdk/aws-appsync/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_appsync",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-aps/package.json b/packages/@aws-cdk/aws-aps/package.json
index 3c39be0897b32..0247162a3fc6a 100644
--- a/packages/@aws-cdk/aws-aps/package.json
+++ b/packages/@aws-cdk/aws-aps/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-aps",
         "module": "aws_cdk.aws_aps"
diff --git a/packages/@aws-cdk/aws-athena/package.json b/packages/@aws-cdk/aws-athena/package.json
index 595c070df0f5f..98c0f47c16ddd 100644
--- a/packages/@aws-cdk/aws-athena/package.json
+++ b/packages/@aws-cdk/aws-athena/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_athena",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-auditmanager/package.json b/packages/@aws-cdk/aws-auditmanager/package.json
index 6d383282f7e2f..f042a4700effd 100644
--- a/packages/@aws-cdk/aws-auditmanager/package.json
+++ b/packages/@aws-cdk/aws-auditmanager/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-auditmanager",
         "module": "aws_cdk.aws_auditmanager"
diff --git a/packages/@aws-cdk/aws-autoscaling-common/package.json b/packages/@aws-cdk/aws-autoscaling-common/package.json
index 74795a7d958e5..976a08912fb36 100644
--- a/packages/@aws-cdk/aws-autoscaling-common/package.json
+++ b/packages/@aws-cdk/aws-autoscaling-common/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_autoscaling_common",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json b/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
index 2132156c49a8c..372a0a26443ba 100644
--- a/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
+++ b/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_autoscaling_hooktargets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-autoscaling/package.json b/packages/@aws-cdk/aws-autoscaling/package.json
index 0c5c721e5f504..9649c95512bb8 100644
--- a/packages/@aws-cdk/aws-autoscaling/package.json
+++ b/packages/@aws-cdk/aws-autoscaling/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_autoscaling",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-autoscalingplans/package.json b/packages/@aws-cdk/aws-autoscalingplans/package.json
index b7ec19abaf886..c6c42a59e05e4 100644
--- a/packages/@aws-cdk/aws-autoscalingplans/package.json
+++ b/packages/@aws-cdk/aws-autoscalingplans/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_autoscalingplans",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-backup/package.json b/packages/@aws-cdk/aws-backup/package.json
index 4adf0832868f0..b5e9ed0d9b2f2 100644
--- a/packages/@aws-cdk/aws-backup/package.json
+++ b/packages/@aws-cdk/aws-backup/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_backup",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-batch/package.json b/packages/@aws-cdk/aws-batch/package.json
index bd3a508bd4a60..5cbcdbf6a881a 100644
--- a/packages/@aws-cdk/aws-batch/package.json
+++ b/packages/@aws-cdk/aws-batch/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_batch",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-billingconductor/package.json b/packages/@aws-cdk/aws-billingconductor/package.json
index 8dfcac4e365e3..1bc6c73071f08 100644
--- a/packages/@aws-cdk/aws-billingconductor/package.json
+++ b/packages/@aws-cdk/aws-billingconductor/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-billingconductor",
         "module": "aws_cdk.aws_billingconductor"
diff --git a/packages/@aws-cdk/aws-budgets/package.json b/packages/@aws-cdk/aws-budgets/package.json
index a732c19a33e25..23b66c85c9d31 100644
--- a/packages/@aws-cdk/aws-budgets/package.json
+++ b/packages/@aws-cdk/aws-budgets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_budgets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cassandra/package.json b/packages/@aws-cdk/aws-cassandra/package.json
index 41773f8d88e08..53d79a546b440 100644
--- a/packages/@aws-cdk/aws-cassandra/package.json
+++ b/packages/@aws-cdk/aws-cassandra/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cassandra",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ce/package.json b/packages/@aws-cdk/aws-ce/package.json
index 6bc59581a9ecc..568c8c8ba3be1 100644
--- a/packages/@aws-cdk/aws-ce/package.json
+++ b/packages/@aws-cdk/aws-ce/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ce",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-certificatemanager/package.json b/packages/@aws-cdk/aws-certificatemanager/package.json
index 8c2effe8d09b0..301bb685bc688 100644
--- a/packages/@aws-cdk/aws-certificatemanager/package.json
+++ b/packages/@aws-cdk/aws-certificatemanager/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_certificatemanager",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-chatbot/package.json b/packages/@aws-cdk/aws-chatbot/package.json
index 8b67807781f51..c9f802c1efece 100644
--- a/packages/@aws-cdk/aws-chatbot/package.json
+++ b/packages/@aws-cdk/aws-chatbot/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_chatbot",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloud9/package.json b/packages/@aws-cdk/aws-cloud9/package.json
index 87b9c6866f872..9c237383fc534 100644
--- a/packages/@aws-cdk/aws-cloud9/package.json
+++ b/packages/@aws-cdk/aws-cloud9/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloud9",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloudformation/package.json b/packages/@aws-cdk/aws-cloudformation/package.json
index 6cc6f8b3c7762..9947a26fba181 100644
--- a/packages/@aws-cdk/aws-cloudformation/package.json
+++ b/packages/@aws-cdk/aws-cloudformation/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloudformation",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/package.json b/packages/@aws-cdk/aws-cloudfront-origins/package.json
index fb28a6d4cf3c8..7bb576579d596 100644
--- a/packages/@aws-cdk/aws-cloudfront-origins/package.json
+++ b/packages/@aws-cdk/aws-cloudfront-origins/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloudfront_origins",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json
index d0fd65a7b930a..5bbb1a4154e83 100644
--- a/packages/@aws-cdk/aws-cloudfront/package.json
+++ b/packages/@aws-cdk/aws-cloudfront/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloudfront",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloudtrail/package.json b/packages/@aws-cdk/aws-cloudtrail/package.json
index 5d2443eac1713..cdd5132dd32ef 100644
--- a/packages/@aws-cdk/aws-cloudtrail/package.json
+++ b/packages/@aws-cdk/aws-cloudtrail/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloudtrail",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloudwatch-actions/package.json b/packages/@aws-cdk/aws-cloudwatch-actions/package.json
index bfde9fac3f512..3e3c869ad9ff9 100644
--- a/packages/@aws-cdk/aws-cloudwatch-actions/package.json
+++ b/packages/@aws-cdk/aws-cloudwatch-actions/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloudwatch_actions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cloudwatch/package.json b/packages/@aws-cdk/aws-cloudwatch/package.json
index 4448300cab76f..ca0117f683a7d 100644
--- a/packages/@aws-cdk/aws-cloudwatch/package.json
+++ b/packages/@aws-cdk/aws-cloudwatch/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cloudwatch",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codeartifact/package.json b/packages/@aws-cdk/aws-codeartifact/package.json
index 2e9f08629c795..43ec958608ffe 100644
--- a/packages/@aws-cdk/aws-codeartifact/package.json
+++ b/packages/@aws-cdk/aws-codeartifact/package.json
@@ -24,7 +24,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-codeartifact",
         "module": "aws_cdk.aws_codeartifact"
diff --git a/packages/@aws-cdk/aws-codebuild/package.json b/packages/@aws-cdk/aws-codebuild/package.json
index 61cdc3489f200..28e74942a2763 100644
--- a/packages/@aws-cdk/aws-codebuild/package.json
+++ b/packages/@aws-cdk/aws-codebuild/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codebuild",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codecommit/package.json b/packages/@aws-cdk/aws-codecommit/package.json
index ad28e0725d2e5..303f8c026575c 100644
--- a/packages/@aws-cdk/aws-codecommit/package.json
+++ b/packages/@aws-cdk/aws-codecommit/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codecommit",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codedeploy/package.json b/packages/@aws-cdk/aws-codedeploy/package.json
index 838e26c30ef5b..7ae51fa30115c 100644
--- a/packages/@aws-cdk/aws-codedeploy/package.json
+++ b/packages/@aws-cdk/aws-codedeploy/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codedeploy",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codeguruprofiler/package.json b/packages/@aws-cdk/aws-codeguruprofiler/package.json
index a9bd53fcc822e..96328dc0d4752 100644
--- a/packages/@aws-cdk/aws-codeguruprofiler/package.json
+++ b/packages/@aws-cdk/aws-codeguruprofiler/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codeguruprofiler",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codegurureviewer/package.json b/packages/@aws-cdk/aws-codegurureviewer/package.json
index cc818f0caf50a..16878088538a0 100644
--- a/packages/@aws-cdk/aws-codegurureviewer/package.json
+++ b/packages/@aws-cdk/aws-codegurureviewer/package.json
@@ -33,7 +33,7 @@
         "module": "aws_cdk.aws_codegurureviewer",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     }
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/package.json b/packages/@aws-cdk/aws-codepipeline-actions/package.json
index 9518c2836c8e6..5b045f5bdfc02 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/package.json
+++ b/packages/@aws-cdk/aws-codepipeline-actions/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codepipeline_actions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codepipeline/package.json b/packages/@aws-cdk/aws-codepipeline/package.json
index 97468600fdfe9..f522a8cd8d552 100644
--- a/packages/@aws-cdk/aws-codepipeline/package.json
+++ b/packages/@aws-cdk/aws-codepipeline/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codepipeline",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codestar/package.json b/packages/@aws-cdk/aws-codestar/package.json
index fe354eea19ee3..b0a83917ae102 100644
--- a/packages/@aws-cdk/aws-codestar/package.json
+++ b/packages/@aws-cdk/aws-codestar/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codestar",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codestarconnections/package.json b/packages/@aws-cdk/aws-codestarconnections/package.json
index e7e1075a29c34..cbabc360bc178 100644
--- a/packages/@aws-cdk/aws-codestarconnections/package.json
+++ b/packages/@aws-cdk/aws-codestarconnections/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codestarconnections",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-codestarnotifications/package.json b/packages/@aws-cdk/aws-codestarnotifications/package.json
index e1f04c7c710db..bb8e6b8881303 100644
--- a/packages/@aws-cdk/aws-codestarnotifications/package.json
+++ b/packages/@aws-cdk/aws-codestarnotifications/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_codestarnotifications",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cognito-identitypool/package.json b/packages/@aws-cdk/aws-cognito-identitypool/package.json
index 17003be238f3c..6b84282820fc6 100644
--- a/packages/@aws-cdk/aws-cognito-identitypool/package.json
+++ b/packages/@aws-cdk/aws-cognito-identitypool/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_cognito_identitypool",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-cognito/package.json b/packages/@aws-cdk/aws-cognito/package.json
index c1b468bf6d523..9f4b1d8367037 100644
--- a/packages/@aws-cdk/aws-cognito/package.json
+++ b/packages/@aws-cdk/aws-cognito/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_cognito",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-config/package.json b/packages/@aws-cdk/aws-config/package.json
index 8d2e85ed03923..2331770138108 100644
--- a/packages/@aws-cdk/aws-config/package.json
+++ b/packages/@aws-cdk/aws-config/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_config",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-connect/package.json b/packages/@aws-cdk/aws-connect/package.json
index ddd41eb126726..456867ae0611e 100644
--- a/packages/@aws-cdk/aws-connect/package.json
+++ b/packages/@aws-cdk/aws-connect/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-connect",
         "module": "aws_cdk.aws_connect"
diff --git a/packages/@aws-cdk/aws-cur/package.json b/packages/@aws-cdk/aws-cur/package.json
index b40afc7957d85..b512263d513aa 100644
--- a/packages/@aws-cdk/aws-cur/package.json
+++ b/packages/@aws-cdk/aws-cur/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-cur",
         "module": "aws_cdk.aws_cur"
diff --git a/packages/@aws-cdk/aws-customerprofiles/package.json b/packages/@aws-cdk/aws-customerprofiles/package.json
index aea4d880ade31..b5a82a4876ce3 100644
--- a/packages/@aws-cdk/aws-customerprofiles/package.json
+++ b/packages/@aws-cdk/aws-customerprofiles/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-customerprofiles",
         "module": "aws_cdk.aws_customerprofiles"
diff --git a/packages/@aws-cdk/aws-databrew/package.json b/packages/@aws-cdk/aws-databrew/package.json
index 7f62fd9aa8e40..ae16048fb7642 100644
--- a/packages/@aws-cdk/aws-databrew/package.json
+++ b/packages/@aws-cdk/aws-databrew/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-databrew",
         "module": "aws_cdk.aws_databrew"
diff --git a/packages/@aws-cdk/aws-datapipeline/package.json b/packages/@aws-cdk/aws-datapipeline/package.json
index 3e1c45c0185a1..797a161045689 100644
--- a/packages/@aws-cdk/aws-datapipeline/package.json
+++ b/packages/@aws-cdk/aws-datapipeline/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_datapipeline",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-datasync/package.json b/packages/@aws-cdk/aws-datasync/package.json
index c6dcd8a0176fa..eb36db89baf0d 100644
--- a/packages/@aws-cdk/aws-datasync/package.json
+++ b/packages/@aws-cdk/aws-datasync/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-datasync",
         "module": "aws_cdk.aws_datasync"
diff --git a/packages/@aws-cdk/aws-dax/package.json b/packages/@aws-cdk/aws-dax/package.json
index aa8c65f0fa53c..244e615a42237 100644
--- a/packages/@aws-cdk/aws-dax/package.json
+++ b/packages/@aws-cdk/aws-dax/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_dax",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-detective/package.json b/packages/@aws-cdk/aws-detective/package.json
index 6864e859727ad..bcf0004078fef 100644
--- a/packages/@aws-cdk/aws-detective/package.json
+++ b/packages/@aws-cdk/aws-detective/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_detective",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-devopsguru/package.json b/packages/@aws-cdk/aws-devopsguru/package.json
index 7cd25d4ca9d22..4e5d996742661 100644
--- a/packages/@aws-cdk/aws-devopsguru/package.json
+++ b/packages/@aws-cdk/aws-devopsguru/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-devopsguru",
         "module": "aws_cdk.aws_devopsguru"
diff --git a/packages/@aws-cdk/aws-directoryservice/package.json b/packages/@aws-cdk/aws-directoryservice/package.json
index 4af6fdd33dd16..d1ed11aa0087c 100644
--- a/packages/@aws-cdk/aws-directoryservice/package.json
+++ b/packages/@aws-cdk/aws-directoryservice/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_directoryservice",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-dlm/package.json b/packages/@aws-cdk/aws-dlm/package.json
index f2d7cfd3fe629..f6889d56e6ec8 100644
--- a/packages/@aws-cdk/aws-dlm/package.json
+++ b/packages/@aws-cdk/aws-dlm/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_dlm",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-dms/package.json b/packages/@aws-cdk/aws-dms/package.json
index 239beff1ecc23..e1de38c2e5d3c 100644
--- a/packages/@aws-cdk/aws-dms/package.json
+++ b/packages/@aws-cdk/aws-dms/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_dms",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-docdb/package.json b/packages/@aws-cdk/aws-docdb/package.json
index 5e46e4fa84238..e1183e3093c56 100644
--- a/packages/@aws-cdk/aws-docdb/package.json
+++ b/packages/@aws-cdk/aws-docdb/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_docdb",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-dynamodb-global/package.json b/packages/@aws-cdk/aws-dynamodb-global/package.json
index 2949a56e596b0..617115be8cf4b 100644
--- a/packages/@aws-cdk/aws-dynamodb-global/package.json
+++ b/packages/@aws-cdk/aws-dynamodb-global/package.json
@@ -31,7 +31,7 @@
         "module": "aws_cdk.aws_dynamodb_global",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       },
       "dotnet": {
diff --git a/packages/@aws-cdk/aws-dynamodb/package.json b/packages/@aws-cdk/aws-dynamodb/package.json
index fa9578638414b..cafea4fbf1217 100644
--- a/packages/@aws-cdk/aws-dynamodb/package.json
+++ b/packages/@aws-cdk/aws-dynamodb/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_dynamodb",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ec2/package.json b/packages/@aws-cdk/aws-ec2/package.json
index b782e739c6c98..0bada1b909327 100644
--- a/packages/@aws-cdk/aws-ec2/package.json
+++ b/packages/@aws-cdk/aws-ec2/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ec2",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ecr-assets/package.json b/packages/@aws-cdk/aws-ecr-assets/package.json
index f544d62f6b568..79b843e1bce76 100644
--- a/packages/@aws-cdk/aws-ecr-assets/package.json
+++ b/packages/@aws-cdk/aws-ecr-assets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ecr_assets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ecr/package.json b/packages/@aws-cdk/aws-ecr/package.json
index c14d9439502a9..342a5315da022 100644
--- a/packages/@aws-cdk/aws-ecr/package.json
+++ b/packages/@aws-cdk/aws-ecr/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ecr",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ecs-patterns/package.json b/packages/@aws-cdk/aws-ecs-patterns/package.json
index bb34a31fc473a..56c56bf30581e 100644
--- a/packages/@aws-cdk/aws-ecs-patterns/package.json
+++ b/packages/@aws-cdk/aws-ecs-patterns/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ecs_patterns",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ecs/package.json b/packages/@aws-cdk/aws-ecs/package.json
index 56365c6349537..2867dde591f8c 100644
--- a/packages/@aws-cdk/aws-ecs/package.json
+++ b/packages/@aws-cdk/aws-ecs/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ecs",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-efs/package.json b/packages/@aws-cdk/aws-efs/package.json
index 648a5ab393cb9..dd19ff6c0bd52 100644
--- a/packages/@aws-cdk/aws-efs/package.json
+++ b/packages/@aws-cdk/aws-efs/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_efs",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-eks-legacy/package.json b/packages/@aws-cdk/aws-eks-legacy/package.json
index b248b1243eec0..e22dd5d066604 100644
--- a/packages/@aws-cdk/aws-eks-legacy/package.json
+++ b/packages/@aws-cdk/aws-eks-legacy/package.json
@@ -26,7 +26,7 @@
         "module": "aws_cdk.aws_eks_legacy",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-eks/package.json b/packages/@aws-cdk/aws-eks/package.json
index d709c9949e6ab..61692aefc54d1 100644
--- a/packages/@aws-cdk/aws-eks/package.json
+++ b/packages/@aws-cdk/aws-eks/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_eks",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticache/package.json b/packages/@aws-cdk/aws-elasticache/package.json
index 5263f44083f5b..08ade3e969aea 100644
--- a/packages/@aws-cdk/aws-elasticache/package.json
+++ b/packages/@aws-cdk/aws-elasticache/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticache",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticbeanstalk/package.json b/packages/@aws-cdk/aws-elasticbeanstalk/package.json
index 9cd5e59983ece..c4e4ee7e7e412 100644
--- a/packages/@aws-cdk/aws-elasticbeanstalk/package.json
+++ b/packages/@aws-cdk/aws-elasticbeanstalk/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticbeanstalk",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticloadbalancing/package.json b/packages/@aws-cdk/aws-elasticloadbalancing/package.json
index 9b2f7e02ec079..5d357956b1821 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancing/package.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancing/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticloadbalancing",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/package.json b/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/package.json
index f2b3d59a2434b..ab2515852df0b 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/package.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancingv2-actions/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticloadbalancingv2_actions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/package.json b/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/package.json
index be761374253ce..5a8b2f1e7aaa6 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/package.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancingv2-targets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticloadbalancingv2_targets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
index 2531189166179..76542dace31d4 100644
--- a/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
+++ b/packages/@aws-cdk/aws-elasticloadbalancingv2/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticloadbalancingv2",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-elasticsearch/package.json b/packages/@aws-cdk/aws-elasticsearch/package.json
index c02abeec181e7..eaa0d56ce0f7e 100644
--- a/packages/@aws-cdk/aws-elasticsearch/package.json
+++ b/packages/@aws-cdk/aws-elasticsearch/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_elasticsearch",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-emr/package.json b/packages/@aws-cdk/aws-emr/package.json
index adc724f9587a2..2554771f802db 100644
--- a/packages/@aws-cdk/aws-emr/package.json
+++ b/packages/@aws-cdk/aws-emr/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_emr",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-emrcontainers/package.json b/packages/@aws-cdk/aws-emrcontainers/package.json
index 2c1aef2f37eae..e7e2c7466a762 100644
--- a/packages/@aws-cdk/aws-emrcontainers/package.json
+++ b/packages/@aws-cdk/aws-emrcontainers/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-emrcontainers",
         "module": "aws_cdk.aws_emrcontainers"
diff --git a/packages/@aws-cdk/aws-events-targets/package.json b/packages/@aws-cdk/aws-events-targets/package.json
index 10c13b354e70a..7dfdb92909708 100644
--- a/packages/@aws-cdk/aws-events-targets/package.json
+++ b/packages/@aws-cdk/aws-events-targets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_events_targets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-events/package.json b/packages/@aws-cdk/aws-events/package.json
index 812a2340e237c..8cfbd97c4fc4f 100644
--- a/packages/@aws-cdk/aws-events/package.json
+++ b/packages/@aws-cdk/aws-events/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_events",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-eventschemas/package.json b/packages/@aws-cdk/aws-eventschemas/package.json
index d6003e1a29be5..3f9cf9c1d0c3e 100644
--- a/packages/@aws-cdk/aws-eventschemas/package.json
+++ b/packages/@aws-cdk/aws-eventschemas/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_eventschemas",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-evidently/package.json b/packages/@aws-cdk/aws-evidently/package.json
index 3d769eb2c0d5c..bb35f7f6c2f3b 100644
--- a/packages/@aws-cdk/aws-evidently/package.json
+++ b/packages/@aws-cdk/aws-evidently/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-evidently",
         "module": "aws_cdk.aws_evidently"
diff --git a/packages/@aws-cdk/aws-finspace/package.json b/packages/@aws-cdk/aws-finspace/package.json
index ae846ebde3a65..a70ad5f2f388d 100644
--- a/packages/@aws-cdk/aws-finspace/package.json
+++ b/packages/@aws-cdk/aws-finspace/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-finspace",
         "module": "aws_cdk.aws_finspace"
diff --git a/packages/@aws-cdk/aws-fis/package.json b/packages/@aws-cdk/aws-fis/package.json
index d2b5abc087edf..29b909b9f4a09 100644
--- a/packages/@aws-cdk/aws-fis/package.json
+++ b/packages/@aws-cdk/aws-fis/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-fis",
         "module": "aws_cdk.aws_fis"
diff --git a/packages/@aws-cdk/aws-fms/package.json b/packages/@aws-cdk/aws-fms/package.json
index 6b04354e62076..968aff0d1c08f 100644
--- a/packages/@aws-cdk/aws-fms/package.json
+++ b/packages/@aws-cdk/aws-fms/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_fms",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-forecast/package.json b/packages/@aws-cdk/aws-forecast/package.json
index 0058edc4c6166..eda7fc341f38d 100644
--- a/packages/@aws-cdk/aws-forecast/package.json
+++ b/packages/@aws-cdk/aws-forecast/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-forecast",
         "module": "aws_cdk.aws_forecast"
diff --git a/packages/@aws-cdk/aws-frauddetector/package.json b/packages/@aws-cdk/aws-frauddetector/package.json
index 2a890d12672dc..f943b4cd7ea2c 100644
--- a/packages/@aws-cdk/aws-frauddetector/package.json
+++ b/packages/@aws-cdk/aws-frauddetector/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-frauddetector",
         "module": "aws_cdk.aws_frauddetector"
diff --git a/packages/@aws-cdk/aws-fsx/package.json b/packages/@aws-cdk/aws-fsx/package.json
index 8cb61d2958dca..8ce870b08f02a 100644
--- a/packages/@aws-cdk/aws-fsx/package.json
+++ b/packages/@aws-cdk/aws-fsx/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_fsx",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-gamelift/package.json b/packages/@aws-cdk/aws-gamelift/package.json
index c0ac68a145a31..e65490033ac43 100644
--- a/packages/@aws-cdk/aws-gamelift/package.json
+++ b/packages/@aws-cdk/aws-gamelift/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_gamelift",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-globalaccelerator-endpoints/package.json b/packages/@aws-cdk/aws-globalaccelerator-endpoints/package.json
index 8c5c5f6b59f5c..fbb8b9ec3279f 100644
--- a/packages/@aws-cdk/aws-globalaccelerator-endpoints/package.json
+++ b/packages/@aws-cdk/aws-globalaccelerator-endpoints/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_globalaccelerator_endpoints",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-globalaccelerator/package.json b/packages/@aws-cdk/aws-globalaccelerator/package.json
index 05958bc904e6b..510d4b093814a 100644
--- a/packages/@aws-cdk/aws-globalaccelerator/package.json
+++ b/packages/@aws-cdk/aws-globalaccelerator/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_globalaccelerator",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-glue/package.json b/packages/@aws-cdk/aws-glue/package.json
index 35027e6b5b47c..7ce4369f6c87a 100644
--- a/packages/@aws-cdk/aws-glue/package.json
+++ b/packages/@aws-cdk/aws-glue/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_glue",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-greengrass/package.json b/packages/@aws-cdk/aws-greengrass/package.json
index ec8177728a17a..95834ea7d7963 100644
--- a/packages/@aws-cdk/aws-greengrass/package.json
+++ b/packages/@aws-cdk/aws-greengrass/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_greengrass",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-greengrassv2/package.json b/packages/@aws-cdk/aws-greengrassv2/package.json
index 2a94a8161e0cd..8bdb85649e50a 100644
--- a/packages/@aws-cdk/aws-greengrassv2/package.json
+++ b/packages/@aws-cdk/aws-greengrassv2/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_greengrassv2",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-groundstation/package.json b/packages/@aws-cdk/aws-groundstation/package.json
index 73e4cb8502920..f1778e342e2a5 100644
--- a/packages/@aws-cdk/aws-groundstation/package.json
+++ b/packages/@aws-cdk/aws-groundstation/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-groundstation",
         "module": "aws_cdk.aws_groundstation"
diff --git a/packages/@aws-cdk/aws-guardduty/package.json b/packages/@aws-cdk/aws-guardduty/package.json
index 926adbe57f9af..740d3aeb8468c 100644
--- a/packages/@aws-cdk/aws-guardduty/package.json
+++ b/packages/@aws-cdk/aws-guardduty/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_guardduty",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-healthlake/package.json b/packages/@aws-cdk/aws-healthlake/package.json
index 49618621e5ce5..8dfcdaca8fdb5 100644
--- a/packages/@aws-cdk/aws-healthlake/package.json
+++ b/packages/@aws-cdk/aws-healthlake/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-healthlake",
         "module": "aws_cdk.aws_healthlake"
diff --git a/packages/@aws-cdk/aws-iam/package.json b/packages/@aws-cdk/aws-iam/package.json
index fd5217702a2ce..69a2410c3c2cb 100644
--- a/packages/@aws-cdk/aws-iam/package.json
+++ b/packages/@aws-cdk/aws-iam/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_iam",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-imagebuilder/package.json b/packages/@aws-cdk/aws-imagebuilder/package.json
index ed92bfcb6e707..99534ddcb7dab 100644
--- a/packages/@aws-cdk/aws-imagebuilder/package.json
+++ b/packages/@aws-cdk/aws-imagebuilder/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_imagebuilder",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-inspector/package.json b/packages/@aws-cdk/aws-inspector/package.json
index 61a265cdd6488..d3c1eb68f37b6 100644
--- a/packages/@aws-cdk/aws-inspector/package.json
+++ b/packages/@aws-cdk/aws-inspector/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_inspector",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-inspectorv2/package.json b/packages/@aws-cdk/aws-inspectorv2/package.json
index 1555506e6b8ec..8d1db8fe14f3e 100644
--- a/packages/@aws-cdk/aws-inspectorv2/package.json
+++ b/packages/@aws-cdk/aws-inspectorv2/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-inspectorv2",
         "module": "aws_cdk.aws_inspectorv2"
diff --git a/packages/@aws-cdk/aws-iot-actions/package.json b/packages/@aws-cdk/aws-iot-actions/package.json
index fd9dd10477f39..376af55f01c92 100644
--- a/packages/@aws-cdk/aws-iot-actions/package.json
+++ b/packages/@aws-cdk/aws-iot-actions/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_iot_actions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iot/package.json b/packages/@aws-cdk/aws-iot/package.json
index 8cdda87487793..f4ad3a3acbde1 100644
--- a/packages/@aws-cdk/aws-iot/package.json
+++ b/packages/@aws-cdk/aws-iot/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_iot",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iot1click/package.json b/packages/@aws-cdk/aws-iot1click/package.json
index 2d8bf68932a2f..de848ba525335 100644
--- a/packages/@aws-cdk/aws-iot1click/package.json
+++ b/packages/@aws-cdk/aws-iot1click/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_iot1click",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iotanalytics/package.json b/packages/@aws-cdk/aws-iotanalytics/package.json
index 55df4a0a64456..deffee8538113 100644
--- a/packages/@aws-cdk/aws-iotanalytics/package.json
+++ b/packages/@aws-cdk/aws-iotanalytics/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_iotanalytics",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iotcoredeviceadvisor/package.json b/packages/@aws-cdk/aws-iotcoredeviceadvisor/package.json
index db5fae0fcedf3..8e9cf5e85f7c2 100644
--- a/packages/@aws-cdk/aws-iotcoredeviceadvisor/package.json
+++ b/packages/@aws-cdk/aws-iotcoredeviceadvisor/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-iotcoredeviceadvisor",
         "module": "aws_cdk.aws_iotcoredeviceadvisor"
diff --git a/packages/@aws-cdk/aws-iotevents-actions/package.json b/packages/@aws-cdk/aws-iotevents-actions/package.json
index 55e474f5f0904..8cd7f48749d83 100644
--- a/packages/@aws-cdk/aws-iotevents-actions/package.json
+++ b/packages/@aws-cdk/aws-iotevents-actions/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_iotevents_actions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iotevents/package.json b/packages/@aws-cdk/aws-iotevents/package.json
index c7400b197621f..0ff8959de67cc 100644
--- a/packages/@aws-cdk/aws-iotevents/package.json
+++ b/packages/@aws-cdk/aws-iotevents/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_iotevents",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iotfleethub/package.json b/packages/@aws-cdk/aws-iotfleethub/package.json
index 7e41dc680b0bb..6a5ffb439148a 100644
--- a/packages/@aws-cdk/aws-iotfleethub/package.json
+++ b/packages/@aws-cdk/aws-iotfleethub/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-iotfleethub",
         "module": "aws_cdk.aws_iotfleethub"
diff --git a/packages/@aws-cdk/aws-iotsitewise/package.json b/packages/@aws-cdk/aws-iotsitewise/package.json
index c210e2863213c..be107e71bc846 100644
--- a/packages/@aws-cdk/aws-iotsitewise/package.json
+++ b/packages/@aws-cdk/aws-iotsitewise/package.json
@@ -24,7 +24,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-iotsitewise",
         "module": "aws_cdk.aws_iotsitewise"
diff --git a/packages/@aws-cdk/aws-iotthingsgraph/package.json b/packages/@aws-cdk/aws-iotthingsgraph/package.json
index 877d214206759..6f25ca320be3a 100644
--- a/packages/@aws-cdk/aws-iotthingsgraph/package.json
+++ b/packages/@aws-cdk/aws-iotthingsgraph/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_iotthingsgraph",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-iotwireless/package.json b/packages/@aws-cdk/aws-iotwireless/package.json
index af72b7cdfa1ff..bc6a893ed837f 100644
--- a/packages/@aws-cdk/aws-iotwireless/package.json
+++ b/packages/@aws-cdk/aws-iotwireless/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-iotwireless",
         "module": "aws_cdk.aws_iotwireless"
diff --git a/packages/@aws-cdk/aws-ivs/package.json b/packages/@aws-cdk/aws-ivs/package.json
index d285f27a8641b..214004e20b43b 100644
--- a/packages/@aws-cdk/aws-ivs/package.json
+++ b/packages/@aws-cdk/aws-ivs/package.json
@@ -24,7 +24,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-ivs",
         "module": "aws_cdk.aws_ivs"
diff --git a/packages/@aws-cdk/aws-kafkaconnect/package.json b/packages/@aws-cdk/aws-kafkaconnect/package.json
index 36fbdae4e146f..c50b9f71594be 100644
--- a/packages/@aws-cdk/aws-kafkaconnect/package.json
+++ b/packages/@aws-cdk/aws-kafkaconnect/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-kafkaconnect",
         "module": "aws_cdk.aws_kafkaconnect"
diff --git a/packages/@aws-cdk/aws-kendra/package.json b/packages/@aws-cdk/aws-kendra/package.json
index 3ba88794d1602..cffc95b7d22bf 100644
--- a/packages/@aws-cdk/aws-kendra/package.json
+++ b/packages/@aws-cdk/aws-kendra/package.json
@@ -33,7 +33,7 @@
         "module": "aws_cdk.aws_kendra",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     }
diff --git a/packages/@aws-cdk/aws-kinesis/package.json b/packages/@aws-cdk/aws-kinesis/package.json
index a7f7a7b0c4f2f..d7dbf2d1eba72 100644
--- a/packages/@aws-cdk/aws-kinesis/package.json
+++ b/packages/@aws-cdk/aws-kinesis/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_kinesis",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink/package.json b/packages/@aws-cdk/aws-kinesisanalytics-flink/package.json
index f2a4ce16bf320..beb642b6943c7 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics-flink/package.json
+++ b/packages/@aws-cdk/aws-kinesisanalytics-flink/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_kinesisanalytics_flink",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-kinesisanalytics/package.json b/packages/@aws-cdk/aws-kinesisanalytics/package.json
index f370ecccac0d0..9e1461d979eaa 100644
--- a/packages/@aws-cdk/aws-kinesisanalytics/package.json
+++ b/packages/@aws-cdk/aws-kinesisanalytics/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_kinesisanalytics",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-kinesisanalyticsv2/package.json b/packages/@aws-cdk/aws-kinesisanalyticsv2/package.json
index 583d65c0c9a3b..d20af154b098f 100644
--- a/packages/@aws-cdk/aws-kinesisanalyticsv2/package.json
+++ b/packages/@aws-cdk/aws-kinesisanalyticsv2/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-kinesisanalyticsv2",
         "module": "aws_cdk.aws_kinesisanalyticsv2"
diff --git a/packages/@aws-cdk/aws-kinesisfirehose-destinations/package.json b/packages/@aws-cdk/aws-kinesisfirehose-destinations/package.json
index 4adba8197cd0e..669afb16e51ef 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose-destinations/package.json
+++ b/packages/@aws-cdk/aws-kinesisfirehose-destinations/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.aws_kinesisfirehose_destinations",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-kinesisfirehose/package.json b/packages/@aws-cdk/aws-kinesisfirehose/package.json
index 9b5a6c7e4ebe7..fa36f5c9c2d96 100644
--- a/packages/@aws-cdk/aws-kinesisfirehose/package.json
+++ b/packages/@aws-cdk/aws-kinesisfirehose/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_kinesisfirehose",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-kinesisvideo/package.json b/packages/@aws-cdk/aws-kinesisvideo/package.json
index 781b3a5155305..278a31170f8f5 100644
--- a/packages/@aws-cdk/aws-kinesisvideo/package.json
+++ b/packages/@aws-cdk/aws-kinesisvideo/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-kinesisvideo",
         "module": "aws_cdk.aws_kinesisvideo"
diff --git a/packages/@aws-cdk/aws-kms/package.json b/packages/@aws-cdk/aws-kms/package.json
index aaa0d6eefa8dc..1de18685e1e14 100644
--- a/packages/@aws-cdk/aws-kms/package.json
+++ b/packages/@aws-cdk/aws-kms/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_kms",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lakeformation/package.json b/packages/@aws-cdk/aws-lakeformation/package.json
index dad89dc9543db..13a517197d22b 100644
--- a/packages/@aws-cdk/aws-lakeformation/package.json
+++ b/packages/@aws-cdk/aws-lakeformation/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_lakeformation",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lambda-destinations/package.json b/packages/@aws-cdk/aws-lambda-destinations/package.json
index 7c6c51e3887ed..83f93ebcf4634 100644
--- a/packages/@aws-cdk/aws-lambda-destinations/package.json
+++ b/packages/@aws-cdk/aws-lambda-destinations/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_lambda_destinations",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lambda-event-sources/package.json b/packages/@aws-cdk/aws-lambda-event-sources/package.json
index 5c683623b7af2..14441440da9d5 100644
--- a/packages/@aws-cdk/aws-lambda-event-sources/package.json
+++ b/packages/@aws-cdk/aws-lambda-event-sources/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_lambda_event_sources",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lambda-go/package.json b/packages/@aws-cdk/aws-lambda-go/package.json
index 8605855317b93..46a3c9966efde 100644
--- a/packages/@aws-cdk/aws-lambda-go/package.json
+++ b/packages/@aws-cdk/aws-lambda-go/package.json
@@ -26,7 +26,7 @@
         "module": "aws_cdk.aws_lambda_go",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lambda-nodejs/package.json b/packages/@aws-cdk/aws-lambda-nodejs/package.json
index 099f9aa46bc40..828c058813d51 100644
--- a/packages/@aws-cdk/aws-lambda-nodejs/package.json
+++ b/packages/@aws-cdk/aws-lambda-nodejs/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_lambda_nodejs",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lambda-python/package.json b/packages/@aws-cdk/aws-lambda-python/package.json
index 65f63daf03a6f..7e895539fb317 100644
--- a/packages/@aws-cdk/aws-lambda-python/package.json
+++ b/packages/@aws-cdk/aws-lambda-python/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_lambda_python",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lambda/package.json b/packages/@aws-cdk/aws-lambda/package.json
index 8c421867b1432..4431d0685e104 100644
--- a/packages/@aws-cdk/aws-lambda/package.json
+++ b/packages/@aws-cdk/aws-lambda/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_lambda",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lex/package.json b/packages/@aws-cdk/aws-lex/package.json
index 740bd2faec671..69c7b0b7d687b 100644
--- a/packages/@aws-cdk/aws-lex/package.json
+++ b/packages/@aws-cdk/aws-lex/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-lex",
         "module": "aws_cdk.aws_lex"
diff --git a/packages/@aws-cdk/aws-licensemanager/package.json b/packages/@aws-cdk/aws-licensemanager/package.json
index 483e1349b8aad..730112ca21dd6 100644
--- a/packages/@aws-cdk/aws-licensemanager/package.json
+++ b/packages/@aws-cdk/aws-licensemanager/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-licensemanager",
         "module": "aws_cdk.aws_licensemanager"
diff --git a/packages/@aws-cdk/aws-lightsail/package.json b/packages/@aws-cdk/aws-lightsail/package.json
index c2e55a94f80cc..fadd810dc5ca8 100644
--- a/packages/@aws-cdk/aws-lightsail/package.json
+++ b/packages/@aws-cdk/aws-lightsail/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-lightsail",
         "module": "aws_cdk.aws_lightsail"
diff --git a/packages/@aws-cdk/aws-location/package.json b/packages/@aws-cdk/aws-location/package.json
index 583d921de1f65..52839687c8253 100644
--- a/packages/@aws-cdk/aws-location/package.json
+++ b/packages/@aws-cdk/aws-location/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-location",
         "module": "aws_cdk.aws_location"
diff --git a/packages/@aws-cdk/aws-logs-destinations/package.json b/packages/@aws-cdk/aws-logs-destinations/package.json
index 80fc6b8876962..f11cf612bb022 100644
--- a/packages/@aws-cdk/aws-logs-destinations/package.json
+++ b/packages/@aws-cdk/aws-logs-destinations/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_logs_destinations",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-logs/package.json b/packages/@aws-cdk/aws-logs/package.json
index 5c08f2f57e060..b6cc47d085714 100644
--- a/packages/@aws-cdk/aws-logs/package.json
+++ b/packages/@aws-cdk/aws-logs/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_logs",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-lookoutequipment/package.json b/packages/@aws-cdk/aws-lookoutequipment/package.json
index 2502d2dca290f..af7420010f22a 100644
--- a/packages/@aws-cdk/aws-lookoutequipment/package.json
+++ b/packages/@aws-cdk/aws-lookoutequipment/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-lookoutequipment",
         "module": "aws_cdk.aws_lookoutequipment"
diff --git a/packages/@aws-cdk/aws-lookoutmetrics/package.json b/packages/@aws-cdk/aws-lookoutmetrics/package.json
index 884ef2c47fb78..3efad3759a488 100644
--- a/packages/@aws-cdk/aws-lookoutmetrics/package.json
+++ b/packages/@aws-cdk/aws-lookoutmetrics/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-lookoutmetrics",
         "module": "aws_cdk.aws_lookoutmetrics"
diff --git a/packages/@aws-cdk/aws-lookoutvision/package.json b/packages/@aws-cdk/aws-lookoutvision/package.json
index 6fef339ca8909..c6c0d842ee584 100644
--- a/packages/@aws-cdk/aws-lookoutvision/package.json
+++ b/packages/@aws-cdk/aws-lookoutvision/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-lookoutvision",
         "module": "aws_cdk.aws_lookoutvision"
diff --git a/packages/@aws-cdk/aws-macie/package.json b/packages/@aws-cdk/aws-macie/package.json
index f809c77c32f5e..a01812e6a41fe 100644
--- a/packages/@aws-cdk/aws-macie/package.json
+++ b/packages/@aws-cdk/aws-macie/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_macie",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-managedblockchain/package.json b/packages/@aws-cdk/aws-managedblockchain/package.json
index 45161defabb1f..971b676dc098a 100644
--- a/packages/@aws-cdk/aws-managedblockchain/package.json
+++ b/packages/@aws-cdk/aws-managedblockchain/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_managedblockchain",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-mediaconnect/package.json b/packages/@aws-cdk/aws-mediaconnect/package.json
index f779c8fde1bf6..b9453009114b8 100644
--- a/packages/@aws-cdk/aws-mediaconnect/package.json
+++ b/packages/@aws-cdk/aws-mediaconnect/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-mediaconnect",
         "module": "aws_cdk.aws_mediaconnect"
diff --git a/packages/@aws-cdk/aws-mediaconvert/package.json b/packages/@aws-cdk/aws-mediaconvert/package.json
index cb668974bf868..686c490867e36 100644
--- a/packages/@aws-cdk/aws-mediaconvert/package.json
+++ b/packages/@aws-cdk/aws-mediaconvert/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_mediaconvert",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-medialive/package.json b/packages/@aws-cdk/aws-medialive/package.json
index a3b5df0038f42..059fb4457b2e8 100644
--- a/packages/@aws-cdk/aws-medialive/package.json
+++ b/packages/@aws-cdk/aws-medialive/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_medialive",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-mediapackage/package.json b/packages/@aws-cdk/aws-mediapackage/package.json
index fb57a9292c585..b5f3ce7a241a7 100644
--- a/packages/@aws-cdk/aws-mediapackage/package.json
+++ b/packages/@aws-cdk/aws-mediapackage/package.json
@@ -31,7 +31,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-mediapackage",
         "module": "aws_cdk.aws_mediapackage"
diff --git a/packages/@aws-cdk/aws-mediastore/package.json b/packages/@aws-cdk/aws-mediastore/package.json
index cfdbe8c9924f9..e7e84fe1e2f8a 100644
--- a/packages/@aws-cdk/aws-mediastore/package.json
+++ b/packages/@aws-cdk/aws-mediastore/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_mediastore",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-memorydb/package.json b/packages/@aws-cdk/aws-memorydb/package.json
index 8612bfd6b4fc7..6dedd26102a4e 100644
--- a/packages/@aws-cdk/aws-memorydb/package.json
+++ b/packages/@aws-cdk/aws-memorydb/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-memorydb",
         "module": "aws_cdk.aws_memorydb"
diff --git a/packages/@aws-cdk/aws-msk/package.json b/packages/@aws-cdk/aws-msk/package.json
index d509379d73317..5b508bc6ed524 100644
--- a/packages/@aws-cdk/aws-msk/package.json
+++ b/packages/@aws-cdk/aws-msk/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_msk",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-mwaa/package.json b/packages/@aws-cdk/aws-mwaa/package.json
index 0b7a41d5a2dc4..07004820d9983 100644
--- a/packages/@aws-cdk/aws-mwaa/package.json
+++ b/packages/@aws-cdk/aws-mwaa/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-mwaa",
         "module": "aws_cdk.aws_mwaa"
diff --git a/packages/@aws-cdk/aws-neptune/package.json b/packages/@aws-cdk/aws-neptune/package.json
index a5b356bb47624..1175afdd23a67 100644
--- a/packages/@aws-cdk/aws-neptune/package.json
+++ b/packages/@aws-cdk/aws-neptune/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_neptune",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-networkfirewall/package.json b/packages/@aws-cdk/aws-networkfirewall/package.json
index d1c75c758097c..dc9ad54481ede 100644
--- a/packages/@aws-cdk/aws-networkfirewall/package.json
+++ b/packages/@aws-cdk/aws-networkfirewall/package.json
@@ -23,7 +23,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-networkfirewall",
         "module": "aws_cdk.aws_networkfirewall"
diff --git a/packages/@aws-cdk/aws-networkmanager/package.json b/packages/@aws-cdk/aws-networkmanager/package.json
index d5e37ea80ac41..d8faf3125d33f 100644
--- a/packages/@aws-cdk/aws-networkmanager/package.json
+++ b/packages/@aws-cdk/aws-networkmanager/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_networkmanager",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-nimblestudio/package.json b/packages/@aws-cdk/aws-nimblestudio/package.json
index f80b2b0e6869f..64f1a18bda617 100644
--- a/packages/@aws-cdk/aws-nimblestudio/package.json
+++ b/packages/@aws-cdk/aws-nimblestudio/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-nimblestudio",
         "module": "aws_cdk.aws_nimblestudio"
diff --git a/packages/@aws-cdk/aws-opensearchservice/package.json b/packages/@aws-cdk/aws-opensearchservice/package.json
index 7a179fa8d0502..ef3bda2cabaab 100644
--- a/packages/@aws-cdk/aws-opensearchservice/package.json
+++ b/packages/@aws-cdk/aws-opensearchservice/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-opensearchservice",
         "module": "aws_cdk.aws_opensearchservice"
diff --git a/packages/@aws-cdk/aws-opsworks/package.json b/packages/@aws-cdk/aws-opsworks/package.json
index 080252d94f828..212fdab148e76 100644
--- a/packages/@aws-cdk/aws-opsworks/package.json
+++ b/packages/@aws-cdk/aws-opsworks/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_opsworks",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-opsworkscm/package.json b/packages/@aws-cdk/aws-opsworkscm/package.json
index 134aab8d4506a..f635675b5129a 100644
--- a/packages/@aws-cdk/aws-opsworkscm/package.json
+++ b/packages/@aws-cdk/aws-opsworkscm/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_opsworkscm",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-panorama/package.json b/packages/@aws-cdk/aws-panorama/package.json
index ccd5dadfad81c..85d7a851df252 100644
--- a/packages/@aws-cdk/aws-panorama/package.json
+++ b/packages/@aws-cdk/aws-panorama/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-panorama",
         "module": "aws_cdk.aws_panorama"
diff --git a/packages/@aws-cdk/aws-personalize/package.json b/packages/@aws-cdk/aws-personalize/package.json
index f8af5135db715..7d07855dacb6a 100644
--- a/packages/@aws-cdk/aws-personalize/package.json
+++ b/packages/@aws-cdk/aws-personalize/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-personalize",
         "module": "aws_cdk.aws_personalize"
diff --git a/packages/@aws-cdk/aws-pinpoint/package.json b/packages/@aws-cdk/aws-pinpoint/package.json
index 9b30b1381fd84..ca368ee981c65 100644
--- a/packages/@aws-cdk/aws-pinpoint/package.json
+++ b/packages/@aws-cdk/aws-pinpoint/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_pinpoint",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-pinpointemail/package.json b/packages/@aws-cdk/aws-pinpointemail/package.json
index 3decc007123e7..dc581ee50bebc 100644
--- a/packages/@aws-cdk/aws-pinpointemail/package.json
+++ b/packages/@aws-cdk/aws-pinpointemail/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_pinpointemail",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-qldb/package.json b/packages/@aws-cdk/aws-qldb/package.json
index d251c623a612c..8cec30cf10f99 100644
--- a/packages/@aws-cdk/aws-qldb/package.json
+++ b/packages/@aws-cdk/aws-qldb/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_qldb",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-quicksight/package.json b/packages/@aws-cdk/aws-quicksight/package.json
index 81f53dfed5799..35bf3b1adf528 100644
--- a/packages/@aws-cdk/aws-quicksight/package.json
+++ b/packages/@aws-cdk/aws-quicksight/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-quicksight",
         "module": "aws_cdk.aws_quicksight"
diff --git a/packages/@aws-cdk/aws-ram/package.json b/packages/@aws-cdk/aws-ram/package.json
index 2cf6f20a1a9f5..6e876598b2adb 100644
--- a/packages/@aws-cdk/aws-ram/package.json
+++ b/packages/@aws-cdk/aws-ram/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ram",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-rds/package.json b/packages/@aws-cdk/aws-rds/package.json
index c48d2d1abe866..df9b7481434d3 100644
--- a/packages/@aws-cdk/aws-rds/package.json
+++ b/packages/@aws-cdk/aws-rds/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_rds",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-redshift/package.json b/packages/@aws-cdk/aws-redshift/package.json
index 5a8d24da47316..a9290dc4cfb50 100644
--- a/packages/@aws-cdk/aws-redshift/package.json
+++ b/packages/@aws-cdk/aws-redshift/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_redshift",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-refactorspaces/package.json b/packages/@aws-cdk/aws-refactorspaces/package.json
index b169bfe56dcf8..87553a285eb6f 100644
--- a/packages/@aws-cdk/aws-refactorspaces/package.json
+++ b/packages/@aws-cdk/aws-refactorspaces/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-refactorspaces",
         "module": "aws_cdk.aws_refactorspaces"
diff --git a/packages/@aws-cdk/aws-rekognition/package.json b/packages/@aws-cdk/aws-rekognition/package.json
index 4baef5c840d99..355803c7855b6 100644
--- a/packages/@aws-cdk/aws-rekognition/package.json
+++ b/packages/@aws-cdk/aws-rekognition/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-rekognition",
         "module": "aws_cdk.aws_rekognition"
diff --git a/packages/@aws-cdk/aws-resiliencehub/package.json b/packages/@aws-cdk/aws-resiliencehub/package.json
index c04acfbba1c94..cbc047f0536f4 100644
--- a/packages/@aws-cdk/aws-resiliencehub/package.json
+++ b/packages/@aws-cdk/aws-resiliencehub/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-resiliencehub",
         "module": "aws_cdk.aws_resiliencehub"
diff --git a/packages/@aws-cdk/aws-resourcegroups/package.json b/packages/@aws-cdk/aws-resourcegroups/package.json
index d708924cc02ab..20ae66c147046 100644
--- a/packages/@aws-cdk/aws-resourcegroups/package.json
+++ b/packages/@aws-cdk/aws-resourcegroups/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_resourcegroups",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-robomaker/package.json b/packages/@aws-cdk/aws-robomaker/package.json
index 05506e1b83eb6..dd946ab86218d 100644
--- a/packages/@aws-cdk/aws-robomaker/package.json
+++ b/packages/@aws-cdk/aws-robomaker/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_robomaker",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-route53-patterns/package.json b/packages/@aws-cdk/aws-route53-patterns/package.json
index 6534bb073f001..8258f02f11feb 100644
--- a/packages/@aws-cdk/aws-route53-patterns/package.json
+++ b/packages/@aws-cdk/aws-route53-patterns/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_route53_patterns",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-route53-targets/package.json b/packages/@aws-cdk/aws-route53-targets/package.json
index 2b4b9216fea28..497fd140fe143 100644
--- a/packages/@aws-cdk/aws-route53-targets/package.json
+++ b/packages/@aws-cdk/aws-route53-targets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_route53_targets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-route53/package.json b/packages/@aws-cdk/aws-route53/package.json
index eeb1710eaad3f..4aaa9b9d4d715 100644
--- a/packages/@aws-cdk/aws-route53/package.json
+++ b/packages/@aws-cdk/aws-route53/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_route53",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-route53recoverycontrol/package.json b/packages/@aws-cdk/aws-route53recoverycontrol/package.json
index a73a8d327c944..9c4034cc9776b 100644
--- a/packages/@aws-cdk/aws-route53recoverycontrol/package.json
+++ b/packages/@aws-cdk/aws-route53recoverycontrol/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-route53recoverycontrol",
         "module": "aws_cdk.aws_route53recoverycontrol"
diff --git a/packages/@aws-cdk/aws-route53recoveryreadiness/package.json b/packages/@aws-cdk/aws-route53recoveryreadiness/package.json
index 402b280af99c4..f3469980997f2 100644
--- a/packages/@aws-cdk/aws-route53recoveryreadiness/package.json
+++ b/packages/@aws-cdk/aws-route53recoveryreadiness/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-route53recoveryreadiness",
         "module": "aws_cdk.aws_route53recoveryreadiness"
diff --git a/packages/@aws-cdk/aws-route53resolver/package.json b/packages/@aws-cdk/aws-route53resolver/package.json
index 954775e26dd6d..c470c5ca213dc 100644
--- a/packages/@aws-cdk/aws-route53resolver/package.json
+++ b/packages/@aws-cdk/aws-route53resolver/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_route53resolver",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-rum/package.json b/packages/@aws-cdk/aws-rum/package.json
index 2e6fb7208985a..20799e2335ae4 100644
--- a/packages/@aws-cdk/aws-rum/package.json
+++ b/packages/@aws-cdk/aws-rum/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-rum",
         "module": "aws_cdk.aws_rum"
diff --git a/packages/@aws-cdk/aws-s3-assets/package.json b/packages/@aws-cdk/aws-s3-assets/package.json
index 617370716fcc2..18488801845d5 100644
--- a/packages/@aws-cdk/aws-s3-assets/package.json
+++ b/packages/@aws-cdk/aws-s3-assets/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_s3_assets",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-s3-deployment/package.json b/packages/@aws-cdk/aws-s3-deployment/package.json
index afce236c64c2a..b62f0d069e074 100644
--- a/packages/@aws-cdk/aws-s3-deployment/package.json
+++ b/packages/@aws-cdk/aws-s3-deployment/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_s3_deployment",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-s3-notifications/package.json b/packages/@aws-cdk/aws-s3-notifications/package.json
index 2c84a2539dd83..7c94f91edc5b9 100644
--- a/packages/@aws-cdk/aws-s3-notifications/package.json
+++ b/packages/@aws-cdk/aws-s3-notifications/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_s3_notifications",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-s3/package.json b/packages/@aws-cdk/aws-s3/package.json
index 781dfd662cced..30e41a5095a00 100644
--- a/packages/@aws-cdk/aws-s3/package.json
+++ b/packages/@aws-cdk/aws-s3/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_s3",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-s3objectlambda/package.json b/packages/@aws-cdk/aws-s3objectlambda/package.json
index 1f89f37447d83..1a17edfb90f2e 100644
--- a/packages/@aws-cdk/aws-s3objectlambda/package.json
+++ b/packages/@aws-cdk/aws-s3objectlambda/package.json
@@ -25,7 +25,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-s3objectlambda",
         "module": "aws_cdk.aws_s3objectlambda"
diff --git a/packages/@aws-cdk/aws-s3outposts/package.json b/packages/@aws-cdk/aws-s3outposts/package.json
index f153db396fed5..001dffffa4646 100644
--- a/packages/@aws-cdk/aws-s3outposts/package.json
+++ b/packages/@aws-cdk/aws-s3outposts/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-s3outposts",
         "module": "aws_cdk.aws_s3outposts"
diff --git a/packages/@aws-cdk/aws-sagemaker/package.json b/packages/@aws-cdk/aws-sagemaker/package.json
index 2dbd7e6ed787a..25a2efc3d82e2 100644
--- a/packages/@aws-cdk/aws-sagemaker/package.json
+++ b/packages/@aws-cdk/aws-sagemaker/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_sagemaker",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-sam/package.json b/packages/@aws-cdk/aws-sam/package.json
index 4096641d0a6ba..8e1fdcbd03c7c 100644
--- a/packages/@aws-cdk/aws-sam/package.json
+++ b/packages/@aws-cdk/aws-sam/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_sam",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-sdb/package.json b/packages/@aws-cdk/aws-sdb/package.json
index cddbf0d9c9bfb..bbfe841196f9f 100644
--- a/packages/@aws-cdk/aws-sdb/package.json
+++ b/packages/@aws-cdk/aws-sdb/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_sdb",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-secretsmanager/package.json b/packages/@aws-cdk/aws-secretsmanager/package.json
index 3fc78a6f32a5f..b022eb9aef04a 100644
--- a/packages/@aws-cdk/aws-secretsmanager/package.json
+++ b/packages/@aws-cdk/aws-secretsmanager/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_secretsmanager",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-securityhub/package.json b/packages/@aws-cdk/aws-securityhub/package.json
index 14d883c9626a1..3e56ad1ebbda5 100644
--- a/packages/@aws-cdk/aws-securityhub/package.json
+++ b/packages/@aws-cdk/aws-securityhub/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_securityhub",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-servicecatalog/package.json b/packages/@aws-cdk/aws-servicecatalog/package.json
index c01c45433260e..90737cb7d5b76 100644
--- a/packages/@aws-cdk/aws-servicecatalog/package.json
+++ b/packages/@aws-cdk/aws-servicecatalog/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_servicecatalog",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-servicecatalogappregistry/package.json b/packages/@aws-cdk/aws-servicecatalogappregistry/package.json
index 3c93bf96d7eb0..579065c56275f 100644
--- a/packages/@aws-cdk/aws-servicecatalogappregistry/package.json
+++ b/packages/@aws-cdk/aws-servicecatalogappregistry/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-servicecatalogappregistry",
         "module": "aws_cdk.aws_servicecatalogappregistry"
diff --git a/packages/@aws-cdk/aws-servicediscovery/package.json b/packages/@aws-cdk/aws-servicediscovery/package.json
index 6f56cb51b25e0..83e3e63827238 100644
--- a/packages/@aws-cdk/aws-servicediscovery/package.json
+++ b/packages/@aws-cdk/aws-servicediscovery/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_servicediscovery",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ses-actions/package.json b/packages/@aws-cdk/aws-ses-actions/package.json
index 1e9605712c5f0..df5c1f5012b10 100644
--- a/packages/@aws-cdk/aws-ses-actions/package.json
+++ b/packages/@aws-cdk/aws-ses-actions/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ses_actions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ses/package.json b/packages/@aws-cdk/aws-ses/package.json
index 7da276813a111..91fb4ec21b109 100644
--- a/packages/@aws-cdk/aws-ses/package.json
+++ b/packages/@aws-cdk/aws-ses/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ses",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-signer/package.json b/packages/@aws-cdk/aws-signer/package.json
index 6d8951d41347e..328ef239bf39e 100644
--- a/packages/@aws-cdk/aws-signer/package.json
+++ b/packages/@aws-cdk/aws-signer/package.json
@@ -30,7 +30,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-signer",
         "module": "aws_cdk.aws_signer"
diff --git a/packages/@aws-cdk/aws-sns-subscriptions/package.json b/packages/@aws-cdk/aws-sns-subscriptions/package.json
index c6badea27512a..08bb55fecbac7 100644
--- a/packages/@aws-cdk/aws-sns-subscriptions/package.json
+++ b/packages/@aws-cdk/aws-sns-subscriptions/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_sns_subscriptions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-sns/package.json b/packages/@aws-cdk/aws-sns/package.json
index cf293ae1599e5..fcce159c0e5ee 100644
--- a/packages/@aws-cdk/aws-sns/package.json
+++ b/packages/@aws-cdk/aws-sns/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_sns",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-sqs/package.json b/packages/@aws-cdk/aws-sqs/package.json
index 5d01cc6612535..b359a8fd25d9c 100644
--- a/packages/@aws-cdk/aws-sqs/package.json
+++ b/packages/@aws-cdk/aws-sqs/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_sqs",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ssm/package.json b/packages/@aws-cdk/aws-ssm/package.json
index 950615205399b..ac851da627d15 100644
--- a/packages/@aws-cdk/aws-ssm/package.json
+++ b/packages/@aws-cdk/aws-ssm/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_ssm",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-ssmcontacts/package.json b/packages/@aws-cdk/aws-ssmcontacts/package.json
index def1df56b8542..bf29c4515e48c 100644
--- a/packages/@aws-cdk/aws-ssmcontacts/package.json
+++ b/packages/@aws-cdk/aws-ssmcontacts/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-ssmcontacts",
         "module": "aws_cdk.aws_ssmcontacts"
diff --git a/packages/@aws-cdk/aws-ssmincidents/package.json b/packages/@aws-cdk/aws-ssmincidents/package.json
index d30e0bf1e7d28..eba0b529855af 100644
--- a/packages/@aws-cdk/aws-ssmincidents/package.json
+++ b/packages/@aws-cdk/aws-ssmincidents/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-ssmincidents",
         "module": "aws_cdk.aws_ssmincidents"
diff --git a/packages/@aws-cdk/aws-sso/package.json b/packages/@aws-cdk/aws-sso/package.json
index f71b38d396f08..98e81cd773ecc 100644
--- a/packages/@aws-cdk/aws-sso/package.json
+++ b/packages/@aws-cdk/aws-sso/package.json
@@ -33,7 +33,7 @@
         "module": "aws_cdk.aws_sso",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     }
diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/package.json b/packages/@aws-cdk/aws-stepfunctions-tasks/package.json
index 4127aab8547ae..36da0fee6ef30 100644
--- a/packages/@aws-cdk/aws-stepfunctions-tasks/package.json
+++ b/packages/@aws-cdk/aws-stepfunctions-tasks/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_stepfunctions_tasks",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-stepfunctions/package.json b/packages/@aws-cdk/aws-stepfunctions/package.json
index 1c7c666cf18fc..f3d17280c985a 100644
--- a/packages/@aws-cdk/aws-stepfunctions/package.json
+++ b/packages/@aws-cdk/aws-stepfunctions/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_stepfunctions",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-synthetics/package.json b/packages/@aws-cdk/aws-synthetics/package.json
index 012a26e046953..0630e59b7d40d 100644
--- a/packages/@aws-cdk/aws-synthetics/package.json
+++ b/packages/@aws-cdk/aws-synthetics/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_synthetics",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-timestream/package.json b/packages/@aws-cdk/aws-timestream/package.json
index a88eaeddbc977..7b5dcab99858f 100644
--- a/packages/@aws-cdk/aws-timestream/package.json
+++ b/packages/@aws-cdk/aws-timestream/package.json
@@ -31,7 +31,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-timestream",
         "module": "aws_cdk.aws_timestream"
diff --git a/packages/@aws-cdk/aws-transfer/package.json b/packages/@aws-cdk/aws-transfer/package.json
index 2566980943cc9..00dc6778afb8f 100644
--- a/packages/@aws-cdk/aws-transfer/package.json
+++ b/packages/@aws-cdk/aws-transfer/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_transfer",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-waf/package.json b/packages/@aws-cdk/aws-waf/package.json
index 7ec1012189ee6..f05c909b9cbb0 100644
--- a/packages/@aws-cdk/aws-waf/package.json
+++ b/packages/@aws-cdk/aws-waf/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_waf",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-wafregional/package.json b/packages/@aws-cdk/aws-wafregional/package.json
index b1e4cc9d4f822..4376101cbfd4e 100644
--- a/packages/@aws-cdk/aws-wafregional/package.json
+++ b/packages/@aws-cdk/aws-wafregional/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_wafregional",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-wafv2/package.json b/packages/@aws-cdk/aws-wafv2/package.json
index 8f5a0f219c30a..a884f48790f75 100644
--- a/packages/@aws-cdk/aws-wafv2/package.json
+++ b/packages/@aws-cdk/aws-wafv2/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_wafv2",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-wisdom/package.json b/packages/@aws-cdk/aws-wisdom/package.json
index eeed32307bdca..41379e74cf149 100644
--- a/packages/@aws-cdk/aws-wisdom/package.json
+++ b/packages/@aws-cdk/aws-wisdom/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-wisdom",
         "module": "aws_cdk.aws_wisdom"
diff --git a/packages/@aws-cdk/aws-workspaces/package.json b/packages/@aws-cdk/aws-workspaces/package.json
index 3251092c6a51c..977861ee2bc82 100644
--- a/packages/@aws-cdk/aws-workspaces/package.json
+++ b/packages/@aws-cdk/aws-workspaces/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.aws_workspaces",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/aws-xray/package.json b/packages/@aws-cdk/aws-xray/package.json
index a330cb7b7778a..9bdb7d91e54b6 100644
--- a/packages/@aws-cdk/aws-xray/package.json
+++ b/packages/@aws-cdk/aws-xray/package.json
@@ -32,7 +32,7 @@
       "python": {
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ],
         "distName": "aws-cdk.aws-xray",
         "module": "aws_cdk.aws_xray"
diff --git a/packages/@aws-cdk/cdk-assets-schema/package.json b/packages/@aws-cdk/cdk-assets-schema/package.json
index 6f8826da58940..b02c981426aa1 100644
--- a/packages/@aws-cdk/cdk-assets-schema/package.json
+++ b/packages/@aws-cdk/cdk-assets-schema/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.cdk_assets_schema",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/cloud-assembly-schema/package.json b/packages/@aws-cdk/cloud-assembly-schema/package.json
index 59d1b7dc97eb0..9f82eaeedd6b7 100644
--- a/packages/@aws-cdk/cloud-assembly-schema/package.json
+++ b/packages/@aws-cdk/cloud-assembly-schema/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.cloud_assembly_schema",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/cloudformation-include/package.json b/packages/@aws-cdk/cloudformation-include/package.json
index 058aab1955f20..848f13120e88b 100644
--- a/packages/@aws-cdk/cloudformation-include/package.json
+++ b/packages/@aws-cdk/cloudformation-include/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.cloudformation_include",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/core/package.json b/packages/@aws-cdk/core/package.json
index 1a35b1ca3cde0..fb09931a270b1 100644
--- a/packages/@aws-cdk/core/package.json
+++ b/packages/@aws-cdk/core/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.core",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/custom-resources/package.json b/packages/@aws-cdk/custom-resources/package.json
index 9662b75c58013..0cd2121656c55 100644
--- a/packages/@aws-cdk/custom-resources/package.json
+++ b/packages/@aws-cdk/custom-resources/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.custom_resources",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json
index 2d0d09087e3ac..46c0bc46762a4 100644
--- a/packages/@aws-cdk/cx-api/package.json
+++ b/packages/@aws-cdk/cx-api/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.cx_api",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/example-construct-library/package.json b/packages/@aws-cdk/example-construct-library/package.json
index 2959c2590ab36..c254953e2c372 100644
--- a/packages/@aws-cdk/example-construct-library/package.json
+++ b/packages/@aws-cdk/example-construct-library/package.json
@@ -25,7 +25,7 @@
         "module": "aws_cdk.example_construct_library",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
index af90b78aef132..20fae96cdfbb6 100644
--- a/packages/@aws-cdk/integ-runner/package.json
+++ b/packages/@aws-cdk/integ-runner/package.json
@@ -59,7 +59,7 @@
   ],
   "homepage": "https://github.com/aws/aws-cdk",
   "engines": {
-    "node": ">= 10.13.0 <13 || >=13.7.0"
+    "node": ">= 14.15.0"
   },
   "cdk-package": {
     "shrinkWrap": true
@@ -75,5 +75,6 @@
   "maturity": "experimental",
   "publishConfig": {
     "tag": "latest"
-  }
+  },
+  "private": true
 }
diff --git a/packages/@aws-cdk/lambda-layer-awscli/package.json b/packages/@aws-cdk/lambda-layer-awscli/package.json
index eb6680d64070c..05eec50423b88 100644
--- a/packages/@aws-cdk/lambda-layer-awscli/package.json
+++ b/packages/@aws-cdk/lambda-layer-awscli/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.lambda_layer_awscli",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/lambda-layer-kubectl/package.json b/packages/@aws-cdk/lambda-layer-kubectl/package.json
index e789dd127c344..c2dd92f3b977b 100644
--- a/packages/@aws-cdk/lambda-layer-kubectl/package.json
+++ b/packages/@aws-cdk/lambda-layer-kubectl/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.lambda_layer_kubectl",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/pipelines/package.json b/packages/@aws-cdk/pipelines/package.json
index 7fe8219d0a620..9021076eb7654 100644
--- a/packages/@aws-cdk/pipelines/package.json
+++ b/packages/@aws-cdk/pipelines/package.json
@@ -130,7 +130,7 @@
         "module": "aws_cdk.pipelines",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/region-info/package.json b/packages/@aws-cdk/region-info/package.json
index ca0d34a5d0104..c222d064bdde5 100644
--- a/packages/@aws-cdk/region-info/package.json
+++ b/packages/@aws-cdk/region-info/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.region_info",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/triggers/package.json b/packages/@aws-cdk/triggers/package.json
index d5225c68594db..cb224a49a348e 100644
--- a/packages/@aws-cdk/triggers/package.json
+++ b/packages/@aws-cdk/triggers/package.json
@@ -24,7 +24,7 @@
         "module": "aws_cdk.triggers",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/@aws-cdk/yaml-cfn/package.json b/packages/@aws-cdk/yaml-cfn/package.json
index 15b629cacc0ca..dccff610ec4a3 100644
--- a/packages/@aws-cdk/yaml-cfn/package.json
+++ b/packages/@aws-cdk/yaml-cfn/package.json
@@ -44,7 +44,7 @@
         "module": "aws_cdk.yaml_cfn",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },
diff --git a/packages/cdk-cli-wrapper/package.json b/packages/cdk-cli-wrapper/package.json
index 35b9877c9ce80..a0a93abf9ed31 100644
--- a/packages/cdk-cli-wrapper/package.json
+++ b/packages/cdk-cli-wrapper/package.json
@@ -41,7 +41,7 @@
         "module": "aws_cdk.cdk_cli_wrapper",
         "classifiers": [
           "Framework :: AWS CDK",
-          "Framework :: AWS CDK :: 1"
+          "Framework :: AWS CDK :: 2"
         ]
       }
     },

From 13c47bdbedd055449f01ef70d54fb6fc15df22da Mon Sep 17 00:00:00 2001
From: Ricardo Cino <ricardo@cino.io>
Date: Wed, 30 Mar 2022 23:19:55 +0200
Subject: [PATCH 17/19] chore(lambda): fix addPermission function name in docs
 (#18991)

Documentation text change based on open issue #17873 indicating there is a typo.

fixes #17873

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-lambda/lib/permission.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@aws-cdk/aws-lambda/lib/permission.ts b/packages/@aws-cdk/aws-lambda/lib/permission.ts
index a4ca4ef3d1e7f..a22a3d53fb10b 100644
--- a/packages/@aws-cdk/aws-lambda/lib/permission.ts
+++ b/packages/@aws-cdk/aws-lambda/lib/permission.ts
@@ -3,7 +3,7 @@ import { Construct } from '@aws-cdk/core';
 
 /**
  * Represents a permission statement that can be added to a Lambda function's
- * resource policy via the `addPermissions()` method.
+ * resource policy via the `addPermission()` method.
  */
 export interface Permission {
   /**

From fbba9c7a843bc4d69b7adf015f04e548d11f0a3b Mon Sep 17 00:00:00 2001
From: Adam Novak <anovak@soe.ucsc.edu>
Date: Wed, 30 Mar 2022 15:01:14 -0700
Subject: [PATCH 18/19] chore: throw more descriptive error when failing to
 create output directory (#18296)

I passed a `--output` to the CDK that was `/public/something/or/other`, on a system with no `/public`, and then forgot about it. I was presented with the head-scratch-inducing failure message:

```
ENOENT: no such file or directory, mkdir '/public'
Error: ENOENT: no such file or directory, mkdir '/public'
```

This should improve the error so that some reference is made to why the CDK expects or desires this path to exist (and remind me that in fact I told it to go there).

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/aws-cdk/lib/api/cxapp/exec.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/aws-cdk/lib/api/cxapp/exec.ts b/packages/aws-cdk/lib/api/cxapp/exec.ts
index bcc298deaeea2..34fae3c59c4c6 100644
--- a/packages/aws-cdk/lib/api/cxapp/exec.ts
+++ b/packages/aws-cdk/lib/api/cxapp/exec.ts
@@ -68,7 +68,11 @@ export async function execProgram(aws: SdkProvider, config: Configuration): Prom
   if (!outdir) {
     throw new Error('unexpected: --output is required');
   }
-  await fs.mkdirp(outdir);
+  try {
+    await fs.mkdirp(outdir);
+  } catch (error) {
+    throw new Error(`Could not create output directory ${outdir} (${error.message})`);
+  }
 
   debug('outdir:', outdir);
   env[cxapi.OUTDIR_ENV] = outdir;

From 89fc9c7ae475da01efb09d3183f064ba7b85563f Mon Sep 17 00:00:00 2001
From: AWS CDK Team <aws-cdk@amazon.com>
Date: Wed, 30 Mar 2022 23:45:25 +0000
Subject: [PATCH 19/19] chore(release): 2.19.0

---
 CHANGELOG.v2.alpha.md |  2 ++
 CHANGELOG.v2.md       | 14 ++++++++++++++
 version.v2.json       |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
index 8cd387b6de647..a0690279f7076 100644
--- a/CHANGELOG.v2.alpha.md
+++ b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 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.19.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.18.0-alpha.0...v2.19.0-alpha.0) (2022-03-30)
+
 ## [2.18.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.17.0-alpha.0...v2.18.0-alpha.0) (2022-03-28)
 
 
diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
index b291127756391..b11138c494c8d 100644
--- a/CHANGELOG.v2.md
+++ b/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.19.0](https://github.com/aws/aws-cdk/compare/v2.18.0...v2.19.0) (2022-03-30)
+
+
+### Features
+
+* add new integration test runner ([#19529](https://github.com/aws/aws-cdk/issues/19529)) ([e7f43d1](https://github.com/aws/aws-cdk/commit/e7f43d1a3bb52bbf589d7472c9a9b89e3c1cc8c1))
+* **aws-ec2:** Enable/disable EC2 "Detailed Monitoring" ([#19437](https://github.com/aws/aws-cdk/issues/19437)) ([94f9d27](https://github.com/aws/aws-cdk/commit/94f9d27e626bced5fc68a6ebbd653fea21c6e21e))
+
+
+### Bug Fixes
+
+* **aws-cdk:** include nested stacks when building changesets ([#19494](https://github.com/aws/aws-cdk/issues/19494)) ([97cc8e2](https://github.com/aws/aws-cdk/commit/97cc8e29e155b222d553b1fe955a0302036feed5)), closes [#5722](https://github.com/aws/aws-cdk/issues/5722) [#17396](https://github.com/aws/aws-cdk/issues/17396) [#19224](https://github.com/aws/aws-cdk/issues/19224)
+* **docdb:** DB Instance ARN uses 'docdb' as the service component instead of 'rds' ([#19555](https://github.com/aws/aws-cdk/issues/19555)) ([6a63924](https://github.com/aws/aws-cdk/commit/6a63924c0b184342befd92903b8867e45b158252)), closes [#19554](https://github.com/aws/aws-cdk/issues/19554)
+
 ## [2.18.0](https://github.com/aws/aws-cdk/compare/v2.17.0...v2.18.0) (2022-03-28)
 
 
diff --git a/version.v2.json b/version.v2.json
index de5044c642c21..25875f812168b 100644
--- a/version.v2.json
+++ b/version.v2.json
@@ -1,4 +1,4 @@
 {
-  "version": "2.18.0",
-  "alphaVersion": "2.18.0-alpha.0"
+  "version": "2.19.0",
+  "alphaVersion": "2.19.0-alpha.0"
 }
\ No newline at end of file