Skip to content

Commit a792b5c

Browse files
authored
chore: move integ-runner over (#261)
(Stacked PR on top of #246) --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license
1 parent 6a01f80 commit a792b5c

File tree

231 files changed

+16855
-89
lines changed

Some content is hidden

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

231 files changed

+16855
-89
lines changed

.github/workflows/release.yml

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projen/deps.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

Lines changed: 86 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function configureProject<A extends pj.typescript.TypeScriptProject>(x: A): A {
3333
x.addDevDeps(
3434
'@typescript-eslint/eslint-plugin@^8',
3535
'@typescript-eslint/parser@^8',
36-
'@stylistic/eslint-plugin',
36+
'@stylistic/eslint-plugin@^3',
3737
'@cdklabs/eslint-plugin',
3838
'eslint-plugin-import',
3939
'eslint-plugin-jest',
@@ -665,7 +665,7 @@ const tmpToolkitHelpers = configureProject(
665665
tsconfig: {
666666
compilerOptions: {
667667
target: 'es2022',
668-
lib: ['es2022', 'esnext.disposable'],
668+
lib: ['es2022', 'esnext.disposable', 'dom'],
669669
module: 'NodeNext',
670670
esModuleInterop: false,
671671
},
@@ -1153,7 +1153,7 @@ const toolkitLib = configureProject(
11531153
tsconfig: {
11541154
compilerOptions: {
11551155
target: 'es2022',
1156-
lib: ['es2022', 'esnext.disposable'],
1156+
lib: ['es2022', 'esnext.disposable', 'dom'],
11571157
module: 'NodeNext',
11581158
esModuleInterop: false,
11591159
},
@@ -1278,7 +1278,7 @@ const cdkCliWrapper = configureProject(
12781278
name: '@aws-cdk/cdk-cli-wrapper',
12791279
description: 'CDK CLI Wrapper Library',
12801280
srcdir: 'lib',
1281-
devDeps: ['aws-cdk-lib', cli, 'constructs', '@aws-cdk/integ-runner'],
1281+
devDeps: [],
12821282
nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson}`,
12831283
releasableCommits: transitiveToolkitPackages('@aws-cdk/cdk-cli-wrapper'),
12841284

@@ -1289,15 +1289,27 @@ const cdkCliWrapper = configureProject(
12891289
},
12901290
},
12911291
}),
1292+
1293+
tsconfig: {
1294+
compilerOptions: {
1295+
target: 'ES2020',
1296+
module: 'commonjs',
1297+
lib: ['es2020', 'dom'],
1298+
incremental: true,
1299+
esModuleInterop: false,
1300+
}
1301+
},
12921302
}),
12931303
);
12941304

1305+
/* Can't have this -- the integ-runner depends on this package
12951306
(() => {
12961307
const integ = cdkCliWrapper.addTask('integ', {
12971308
exec: 'integ-runner --language javascript',
12981309
});
12991310
cdkCliWrapper.testTask.spawn(integ);
13001311
})();
1312+
*/
13011313

13021314
//////////////////////////////////////////////////////////////////////
13031315

@@ -1317,6 +1329,76 @@ void cdkAliasPackage;
13171329

13181330
//////////////////////////////////////////////////////////////////////
13191331

1332+
const integRunner = configureProject(
1333+
new yarn.TypeScriptWorkspace({
1334+
...genericCdkProps(),
1335+
parent: repo,
1336+
name: '@aws-cdk/integ-runner',
1337+
description: 'CDK Integration Testing Tool',
1338+
srcdir: 'lib',
1339+
deps: [
1340+
cloudAssemblySchema.customizeReference({ exactVersion: true }),
1341+
cxApi,
1342+
cdkCliWrapper.customizeReference({ exactVersion: true }),
1343+
cli.customizeReference({ exactVersion: true }),
1344+
cdkAssets.customizeReference({ exactVersion: true }),
1345+
cloudFormationDiff.customizeReference({ exactVersion: true }),
1346+
'workerpool@^6',
1347+
'chokidar@^3',
1348+
'chalk@^4',
1349+
'fs-extra@^9',
1350+
'yargs@^16',
1351+
'@aws-cdk/aws-service-spec',
1352+
'@aws-sdk/client-cloudformation@^3',
1353+
],
1354+
devDeps: ['aws-cdk-lib', '@types/fs-extra', '@types/mock-fs@^4', 'mock-fs@^4', '@types/workerpool@^6', '@types/yargs', 'constructs@^10'],
1355+
allowPrivateDeps: true,
1356+
tsconfig: {
1357+
compilerOptions: {
1358+
target: 'ES2020',
1359+
module: 'commonjs',
1360+
lib: ['es2020', 'dom'],
1361+
incremental: true,
1362+
esModuleInterop: false,
1363+
}
1364+
},
1365+
}),
1366+
);
1367+
integRunner.gitignore?.addPatterns('recommended-feature-flags.json');
1368+
integRunner.tsconfig?.addInclude('lib/*.json');
1369+
1370+
integRunner.preCompileTask.prependExec('./build-tools/generate.sh');
1371+
1372+
new BundleCli(integRunner, {
1373+
externals: {
1374+
optionalDependencies: [
1375+
'fsevents',
1376+
],
1377+
dependencies: [
1378+
'@aws-cdk/aws-service-spec',
1379+
'aws-cdk',
1380+
],
1381+
},
1382+
allowedLicenses: [
1383+
'Apache-2.0',
1384+
'MIT',
1385+
'BSD-3-Clause',
1386+
'ISC',
1387+
'BSD-2-Clause',
1388+
'0BSD',
1389+
'MIT OR Apache-2.0',
1390+
],
1391+
dontAttribute: '^@aws-cdk/|^@cdklabs/|^cdk-assets$|^cdk-cli-wrapper$',
1392+
test: 'bin/integ-runner --version',
1393+
entryPoints: [
1394+
'lib/index.js',
1395+
'lib/workers/extract/index.js',
1396+
],
1397+
minifyWhitespace: true,
1398+
});
1399+
1400+
//////////////////////////////////////////////////////////////////////
1401+
13201402
// The pj.github.Dependabot component is only for a single Node project,
13211403
// but we need multiple non-Node projects
13221404
new pj.YamlFile(repo, '.github/dependabot.yml', {

aws-cdk-cli.code-workspace

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cdk-cli-wrapper/lib/commands/deploy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export interface DeployOptions extends DefaultCdkOptions {
5656
/**
5757
* What kind of security changes require approval
5858
*
59-
* @default RequireApproval.NEVER
59+
* @default RequireApproval.Never
6060
*/
6161
readonly requireApproval?: RequireApproval;
6262

packages/@aws-cdk/cdk-cli-wrapper/package.json

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/cdk-cli-wrapper/tsconfig.dev.json

Lines changed: 7 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)