Skip to content

Commit fe68e1d

Browse files
rix0rrrrix0rrr
authored
Merge branch 'main' into fix/stepfunctions/sagemaker/validation
2 parents 8258693 + 4fd510e commit fe68e1d

File tree

462 files changed

+75967
-83050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+75967
-83050
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@a0585ff9904b77d046192a7846e59783d6ea287b
22+
uses: tj-actions/changed-files@c860b5c47fa71f461da850094ef2f6e3d6514e44
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

‎.github/workflows/update-contributors.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: github.repository == 'aws/aws-cdk'
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- uses: minicli/action-contributors@v3.3
1515
name: "Update a projects CONTRIBUTORS file"
1616
env:

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ Most build issues can be solved by doing a full clean rebuild:
11391139

11401140
```shell
11411141
$ git clean -fqdx .
1142+
$ yarn install
11421143
$ yarn build
11431144
```
11441145

‎nx.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"!{workspaceRoot}/**/tsconfig.json",
1212
"!{workspaceRoot}/**/tsconfig.json",
1313
"!{workspaceRoot}/tsconfig.base.json",
14-
"!{workspaceRoot}/**/tsconfig.tsbuildinfo"
14+
"!{workspaceRoot}/**/tsconfig.tsbuildinfo",
15+
"!{workspaceRoot}/**/jest.config.js"
1516
],
1617
"outputs": [
1718
"{projectRoot}/**/*.integ.*.js.snapshot/*",

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"patch-package": "^6.5.1",
3434
"semver": "^7.5.4",
3535
"standard-version": "^9.5.0",
36+
"ts-jest": "^29.1.1",
3637
"ts-node": "^10.9.1",
3738
"typescript": "~5.1.6"
3839
},

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { sleep } from '../lib';
22
import { ResourcePool } from '../lib/resource-pool';
33

4+
jest.setTimeout(30_000);
5+
46
const POOL_NAME = 'resource-pool.test';
57

68
test('take and dispose', async () => {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ nyc.config.js
1414

1515
!**/*.snapshot/**/asset.*/**
1616

17-
**/*.ts.snapshot
17+
**/*.ts.snapshot
18+
19+
!jest.config.js

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/** @type {import('ts-jest').JestConfigWithTsJest} */
2+
module.exports = {
3+
// Purposely only run .js files, not .ts files. This is so that the unit tests
4+
// here will use the jsii-compiled version of `aws-cdk-lib`, and not the live-interpreted
5+
// .ts files.
6+
moduleFileExtensions: [
7+
'js',
8+
],
9+
testMatch: [
10+
'<rootDir>/test/**/?(*.)+(test).js',
11+
],
12+
13+
testEnvironment: 'node',
14+
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "30.1.0",
2+
"version": "34.0.0",
33
"files": {
4-
"ffa0280c20139b5a0ec753fdb4365af29fb08ea9703b9139810054417bc99c10": {
4+
"8a58fa97a651075da97dae0f25e1a6d749868a97b0aaa5cad68bc5b40a6ad731": {
55
"source": {
66
"path": "aws-cdk-docdb-cluster-rotation.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "ffa0280c20139b5a0ec753fdb4365af29fb08ea9703b9139810054417bc99c10.json",
12+
"objectKey": "8a58fa97a651075da97dae0f25e1a6d749868a97b0aaa5cad68bc5b40a6ad731.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

0 commit comments

Comments
 (0)