Merge branch 'main' into fix/stepfunctions/sagemaker/validation

aws · Aug 29, 2023 · fe68e1d · fe68e1d
2 parents 8258693 + 4fd510e
commit fe68e1d
Show file tree

Hide file tree

Showing 462 changed files with 75,967 additions and 83,050 deletions.
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@a0585ff9904b77d046192a7846e59783d6ea287b
+        uses: tj-actions/changed-files@c860b5c47fa71f461da850094ef2f6e3d6514e44
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'aws/aws-cdk'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: minicli/action-contributors@v3.3
         name: "Update a projects CONTRIBUTORS file"
         env:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1139,6 +1139,7 @@ Most build issues can be solved by doing a full clean rebuild:
 
 ```shell
 $ git clean -fqdx .
+$ yarn install
 $ yarn build
 ```
 

diff --git a/nx.json b/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/*",

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "patch-package": "^6.5.1",
     "semver": "^7.5.4",
     "standard-version": "^9.5.0",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "typescript": "~5.1.6"
   },

diff --git a/packages/@aws-cdk-testing/cli-integ/test/resource-pool.test.ts b/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 () => {

diff --git a/packages/@aws-cdk-testing/framework-integ/.gitignore b/packages/@aws-cdk-testing/framework-integ/.gitignore
@@ -14,4 +14,6 @@ nyc.config.js
 
 !**/*.snapshot/**/asset.*/**
 
-**/*.ts.snapshot
+**/*.ts.snapshot
+
+!jest.config.js
diff --git a/packages/@aws-cdk-testing/framework-integ/jest.config.js b/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',
+};
diff --git a/...db/test/integ.cluster-rotation.lit.js.snapshot/aws-cdk-docdb-cluster-rotation.assets.json b/...db/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}"
         }
       }