Skip to content

Commit 742a08a

Browse files
authored
Merge branch 'main' into otaviom/notices-via-proxy
2 parents 9cb4df5 + cbacf4d commit 742a08a

File tree

298 files changed

+11236
-2284
lines changed

Some content is hidden

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

298 files changed

+11236
-2284
lines changed

aws-cdk.code-workspace

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"name": "aws-custom-resource-sdk-adapter",
3232
"rootPath": "packages/@aws-cdk/aws-custom-resource-sdk-adapter"
3333
},
34-
{ "name": "yargs-gen", "rootPath": "tools/@aws-cdk/yargs-gen" }
34+
{ "name": "cli-args-gen", "rootPath": "tools/@aws-cdk/cli-args-gen" }
3535
]
3636
},
3737
"extensions": {

codecov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ component_management:
3030
name: packages/aws-cdk # display name that can change freely
3131
paths:
3232
- packages/aws-cdk/**
33+
34+
# https://docs.codecov.com/docs/ignoring-paths
35+
ignore:
36+
- packages/aws-cdk/lib/parse-command-line-arguments.ts # this file is generated and some lines cannot be tested

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"packages/@aws-cdk-testing/*",
1111
"packages/@aws-cdk/*/lambda-packages/*",
1212
"tools/@aws-cdk/cdk-build-tools",
13-
"tools/@aws-cdk/yargs-gen",
13+
"tools/@aws-cdk/cli-args-gen",
1414
"tools/@aws-cdk/cdk-release",
1515
"tools/@aws-cdk/node-bundle",
1616
"tools/@aws-cdk/pkglint",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"packages/@aws-cdk-testing/*",
7878
"packages/@aws-cdk/*/lambda-packages/*",
7979
"tools/@aws-cdk/cdk-build-tools",
80-
"tools/@aws-cdk/yargs-gen",
80+
"tools/@aws-cdk/cli-args-gen",
8181
"tools/@aws-cdk/cdk-release",
8282
"tools/@aws-cdk/node-bundle",
8383
"tools/@aws-cdk/pkglint",

packages/@aws-cdk-testing/cli-integ/bin/query-github.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// eslint-disable-next-line jest/no-jest-import
21
import * as yargs from 'yargs';
32
import { fetchPreviousVersion } from '../lib/github';
43

packages/@aws-cdk-testing/cli-integ/bin/run-suite.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable no-console */
22
import * as path from 'path';
3-
// eslint-disable-next-line jest/no-jest-import
43
import * as jest from 'jest';
54
import * as yargs from 'yargs';
65
import { ReleasePackageSourceSetup } from '../lib/package-sources/release-source';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ integTest(
11141114
await diffShouldSucceedWith({ fail: undefined, enableDiffNoFail: true });
11151115

11161116
async function diffShouldSucceedWith(props: DiffParameters) {
1117-
await expect(diff(props)).resolves.not.toThrowError();
1117+
await expect(diff(props)).resolves.not.toThrow();
11181118
}
11191119

11201120
async function diffShouldFailWith(props: DiffParameters) {

0 commit comments

Comments
 (0)