Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 86 additions & 4 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
x.addDevDeps(
'@typescript-eslint/eslint-plugin@^8',
'@typescript-eslint/parser@^8',
'@stylistic/eslint-plugin',
'@stylistic/eslint-plugin@^3',
'@cdklabs/eslint-plugin',
'eslint-plugin-import',
'eslint-plugin-jest',
Expand Down Expand Up @@ -665,7 +665,7 @@
tsconfig: {
compilerOptions: {
target: 'es2022',
lib: ['es2022', 'esnext.disposable'],
lib: ['es2022', 'esnext.disposable', 'dom'],
module: 'NodeNext',
esModuleInterop: false,
},
Expand Down Expand Up @@ -1153,7 +1153,7 @@
tsconfig: {
compilerOptions: {
target: 'es2022',
lib: ['es2022', 'esnext.disposable'],
lib: ['es2022', 'esnext.disposable', 'dom'],
module: 'NodeNext',
esModuleInterop: false,
},
Expand Down Expand Up @@ -1278,7 +1278,7 @@
name: '@aws-cdk/cdk-cli-wrapper',
description: 'CDK CLI Wrapper Library',
srcdir: 'lib',
devDeps: ['aws-cdk-lib', cli, 'constructs', '@aws-cdk/integ-runner'],
devDeps: [],
nextVersionCommand: `tsx ../../../projenrc/next-version.ts copyVersion:../../../${cliPackageJson}`,
releasableCommits: transitiveToolkitPackages('@aws-cdk/cdk-cli-wrapper'),

Expand All @@ -1289,15 +1289,27 @@
},
},
}),

tsconfig: {
compilerOptions: {
target: 'ES2020',
module: 'commonjs',
lib: ['es2020', 'dom'],
incremental: true,
esModuleInterop: false,
}
},
}),
);

/* Can't have this -- the integ-runner depends on this package
(() => {
const integ = cdkCliWrapper.addTask('integ', {
exec: 'integ-runner --language javascript',
});
cdkCliWrapper.testTask.spawn(integ);
})();
*/

//////////////////////////////////////////////////////////////////////

Expand All @@ -1317,6 +1329,76 @@

//////////////////////////////////////////////////////////////////////

const integRunner = configureProject(
new yarn.TypeScriptWorkspace({
...genericCdkProps(),
parent: repo,
name: '@aws-cdk/integ-runner',
description: 'CDK Integration Testing Tool',
srcdir: 'lib',
deps: [
cloudAssemblySchema.customizeReference({ exactVersion: true }),

Check failure on line 1340 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.

Check failure on line 1340 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.
cxApi,
cdkCliWrapper.customizeReference({ exactVersion: true }),

Check failure on line 1342 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.

Check failure on line 1342 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.
cli.customizeReference({ exactVersion: true }),

Check failure on line 1343 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.

Check failure on line 1343 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.
cdkAssets.customizeReference({ exactVersion: true }),

Check failure on line 1344 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.

Check failure on line 1344 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.
cloudFormationDiff.customizeReference({ exactVersion: true }),

Check failure on line 1345 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.

Check failure on line 1345 in .projenrc.ts

View workflow job for this annotation

GitHub Actions / build

Object literal may only specify known properties, and 'exactVersion' does not exist in type 'ReferenceOptions'.
'workerpool@^6',
'chokidar@^3',
'chalk@^4',
'fs-extra@^9',
'yargs@^16',
'@aws-cdk/aws-service-spec',
'@aws-sdk/client-cloudformation@^3',
],
devDeps: ['aws-cdk-lib', '@types/fs-extra', '@types/mock-fs@^4', 'mock-fs@^4', '@types/workerpool@^6', '@types/yargs', 'constructs@^10'],
allowPrivateDeps: true,
tsconfig: {
compilerOptions: {
target: 'ES2020',
module: 'commonjs',
lib: ['es2020', 'dom'],
incremental: true,
esModuleInterop: false,
}
},
}),
);
integRunner.gitignore?.addPatterns('recommended-feature-flags.json');
integRunner.tsconfig?.addInclude('lib/*.json');

integRunner.preCompileTask.prependExec('./build-tools/generate.sh');

new BundleCli(integRunner, {
externals: {
optionalDependencies: [
'fsevents',
],
dependencies: [
'@aws-cdk/aws-service-spec',
'aws-cdk',
],
},
allowedLicenses: [
'Apache-2.0',
'MIT',
'BSD-3-Clause',
'ISC',
'BSD-2-Clause',
'0BSD',
'MIT OR Apache-2.0',
],
dontAttribute: '^@aws-cdk/|^@cdklabs/|^cdk-assets$|^cdk-cli-wrapper$',
test: 'bin/integ-runner --version',
entryPoints: [
'lib/index.js',
'lib/workers/extract/index.js',
],
minifyWhitespace: true,
});

//////////////////////////////////////////////////////////////////////

// The pj.github.Dependabot component is only for a single Node project,
// but we need multiple non-Node projects
new pj.YamlFile(repo, '.github/dependabot.yml', {
Expand Down
3 changes: 3 additions & 0 deletions aws-cdk-cli.code-workspace

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/@aws-cdk/cdk-cli-wrapper/lib/commands/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export interface DeployOptions extends DefaultCdkOptions {
/**
* What kind of security changes require approval
*
* @default RequireApproval.NEVER
* @default RequireApproval.Never
*/
readonly requireApproval?: RequireApproval;

Expand Down
14 changes: 5 additions & 9 deletions packages/@aws-cdk/cdk-cli-wrapper/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions packages/@aws-cdk/cdk-cli-wrapper/tsconfig.dev.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.