Merge branch 'main' into main

nx.json

@@ -11,7 +11,8 @@
  "!{workspaceRoot}/**/tsconfig.json",
  "!{workspaceRoot}/**/tsconfig.json",
  "!{workspaceRoot}/tsconfig.base.json",
- "!{workspaceRoot}/**/tsconfig.tsbuildinfo"
+ "!{workspaceRoot}/**/tsconfig.tsbuildinfo",
+ "!{workspaceRoot}/**/jest.config.js"
  ],
  "outputs": [
  "{projectRoot}/**/*.integ.*.js.snapshot/*",

package.json

@@ -28,6 +28,7 @@
  "jsii-pacmak": "1.87.0",
  "jsii-reflect": "1.87.0",
  "jsii-rosetta": "~5.1.10",
+ "ts-jest": "^29.1.1",
  "lerna": "^7.1.5",
  "nx": "^16.7.3",
  "patch-package": "^6.5.1",

packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts

@@ -1,6 +1,8 @@
 import { sleep } from '../lib';
 import { ResourcePool } from '../lib/resource-pool';
 
+jest.setTimeout(30_000);
+
 const POOL_NAME = 'resource-pool.test';
 
 test('take and dispose', async () => {

packages/@aws-cdk-testing/framework-integ/.gitignore

@@ -14,4 +14,6 @@ nyc.config.js
 
 !**/*.snapshot/**/asset.*/**
 
-**/*.ts.snapshot
+**/*.ts.snapshot
+
+!jest.config.js

packages/@aws-cdk-testing/framework-integ/jest.config.js

@@ -0,0 +1,14 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+ // Purposely only run .js files, not .ts files. This is so that the unit tests
+ // here will use the jsii-compiled version of `aws-cdk-lib`, and not the live-interpreted
+ // .ts files.
+ moduleFileExtensions: [
+ 'js',
+ ],
+ testMatch: [
+ '<rootDir>/test/**/?(*.)+(test).js',
+ ],
+
+ testEnvironment: 'node',
+};

packages/@aws-cdk-testing/framework-integ/test/aws-docdb/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-docdb-cluster-rotation.assets.json

@@ -1,15 +1,15 @@
 {
- "version": "30.1.0",
+ "version": "34.0.0",
  "files": {
- "ffa0280c20139b5a0ec753fdb4365af29fb08ea9703b9139810054417bc99c10": {
+ "8a58fa97a651075da97dae0f25e1a6d749868a97b0aaa5cad68bc5b40a6ad731": {
  "source": {
  "path": "aws-cdk-docdb-cluster-rotation.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-current_region": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "ffa0280c20139b5a0ec753fdb4365af29fb08ea9703b9139810054417bc99c10.json",
+ "objectKey": "8a58fa97a651075da97dae0f25e1a6d749868a97b0aaa5cad68bc5b40a6ad731.json",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
  }
  }