From 39138eb9d4eb9b4ead691a7f3fac6c92a70b8dae Mon Sep 17 00:00:00 2001 From: Naumel <104374999+Naumel@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:43:26 +0200 Subject: [PATCH] Revert "feat(cli): --concurrency option" (#21664) Reverts aws/aws-cdk#20345 See #21661 --- packages/aws-cdk/README.md | 2 - packages/aws-cdk/THIRD_PARTY_LICENSES | 80 -------- packages/aws-cdk/lib/cdk-toolkit.ts | 41 +--- packages/aws-cdk/lib/cli.ts | 4 +- packages/aws-cdk/lib/deploy.ts | 60 ------ packages/aws-cdk/package.json | 1 - packages/aws-cdk/test/deploy.test.ts | 187 ------------------ .../aws-cdk/test/integ/cli/cli.integtest.ts | 20 +- packages/aws-cdk/tsconfig.json | 4 +- 9 files changed, 9 insertions(+), 390 deletions(-) delete mode 100644 packages/aws-cdk/lib/deploy.ts delete mode 100644 packages/aws-cdk/test/deploy.test.ts diff --git a/packages/aws-cdk/README.md b/packages/aws-cdk/README.md index 73260afd299d6..a9a35f644d2fa 100644 --- a/packages/aws-cdk/README.md +++ b/packages/aws-cdk/README.md @@ -191,8 +191,6 @@ In order to deploy them, you can list the stacks you want to deploy. If your app If you want to deploy all of them, you can use the flag `--all` or the wildcard `*` to deploy all stacks in an app. Please note that, if you have a hierarchy of stacks as described above, `--all` and `*` will only match the stacks on the top level. If you want to match all the stacks in the hierarchy, use `**`. You can also combine these patterns. For example, if you want to deploy all stacks in the `Prod` stage, you can use `cdk deploy PipelineStack/Prod/**`. -`--concurrency N` allows deploying multiple stacks in parallel while respecting inter-stack dependencies to speed up deployments. It does not protect against CloudFormation and other AWS account rate limiting. - #### Parameters Pass parameters to your template during deployment by using `--parameters diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES index 4a5cf062ec2be..7bd96069943ab 100644 --- a/packages/aws-cdk/THIRD_PARTY_LICENSES +++ b/packages/aws-cdk/THIRD_PARTY_LICENSES @@ -1143,32 +1143,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----------------- - -** eventemitter3@4.0.7 - https://www.npmjs.com/package/eventemitter3/v/4.0.7 | MIT -The MIT License (MIT) - -Copyright (c) 2014 Arnout Kazemier - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - ---------------- ** fast-deep-equal@3.1.3 - https://www.npmjs.com/package/fast-deep-equal/v/3.1.3 | MIT @@ -2300,60 +2274,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ----------------- - -** p-finally@1.0.0 - https://www.npmjs.com/package/p-finally/v/1.0.0 | MIT -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - ----------------- - -** p-queue@6.6.2 - https://www.npmjs.com/package/p-queue/v/6.6.2 | MIT -MIT License - -Copyright (c) Sindre Sorhus (https://sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - ----------------- - -** p-timeout@3.2.0 - https://www.npmjs.com/package/p-timeout/v/3.2.0 | MIT -MIT License - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - ---------------- ** pac-proxy-agent@5.0.0 - https://www.npmjs.com/package/pac-proxy-agent/v/5.0.0 | MIT diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 82dfd295ff5a2..724e0f02b579a 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -14,7 +14,6 @@ import { CloudExecutable } from './api/cxapp/cloud-executable'; import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; import { StackActivityProgress } from './api/util/cloudformation/stack-activity-monitor'; -import { deployStacks } from './deploy'; import { printSecurityDiff, printStackDiff, RequireApproval } from './diff'; import { ResourceImporter } from './import'; import { data, debug, error, highlight, print, success, warning } from './logging'; @@ -138,7 +137,7 @@ export class CdkToolkit { } const startSynthTime = new Date().getTime(); - const stackCollection = await this.selectStacksForDeploy(options.selector, options.exclusively, options.cacheCloudAssembly); + const stacks = await this.selectStacksForDeploy(options.selector, options.exclusively, options.cacheCloudAssembly); const elapsedSynthTime = new Date().getTime() - startSynthTime; print('\n✨ Synthesis time: %ss\n', formatTime(elapsedSynthTime)); @@ -164,19 +163,11 @@ export class CdkToolkit { warning('⚠️ It should only be used for development - never use it for your production Stacks!'); } - const stacks = stackCollection.stackArtifacts; - const stackOutputs: { [key: string]: any } = { }; const outputsFile = options.outputsFile; - const concurrency = options.concurrency || 1; - const progress = concurrency > 1 ? StackActivityProgress.EVENTS : options.progress; - if (concurrency > 1 && options.progress && options.progress != StackActivityProgress.EVENTS) { - warning('⚠️ The --concurrency flag only supports --progress "events". Switching to "events".'); - } - - const deployStack = async (stack: cxapi.CloudFormationStackArtifact) => { - if (stackCollection.stackCount !== 1) { highlight(stack.displayName); } + for (const stack of stacks.stackArtifacts) { + if (stacks.stackCount !== 1) { highlight(stack.displayName); } if (!stack.environment) { // eslint-disable-next-line max-len throw new Error(`Stack ${stack.displayName} does not define an environment, and AWS credentials could not be obtained from standard locations or no region was configured.`); @@ -196,7 +187,7 @@ export class CdkToolkit { ci: options.ci, }); } - return; + continue; } if (requireApproval !== RequireApproval.Never) { @@ -210,13 +201,6 @@ export class CdkToolkit { 'but terminal (TTY) is not attached so we are unable to get a confirmation from the user'); } - // only talk to user if concurreny is 1 (otherwise, fail) - if (concurrency > 1) { - throw new Error( - '"--require-approval" is enabled and stack includes security-sensitive updates, ' + - 'but concurrency is greater than 1 so we are unable to get a confirmation from the user'); - } - const confirmed = await promptly.confirm('Do you wish to deploy these changes (y/n)?'); if (!confirmed) { throw new Error('Aborted by user'); } } @@ -245,7 +229,7 @@ export class CdkToolkit { force: options.force, parameters: Object.assign({}, parameterMap['*'], parameterMap[stack.stackName]), usePreviousParameters: options.usePreviousParameters, - progress, + progress: options.progress, ci: options.ci, rollback: options.rollback, hotswap: options.hotswap, @@ -294,13 +278,6 @@ export class CdkToolkit { } } print('\n✨ Total time: %ss\n', formatTime(elapsedSynthTime + elapsedDeployTime)); - }; - - try { - await deployStacks(stacks, { concurrency, deployStack }); - } catch (e) { - error('\n ❌ Deployment failed: %s', e); - throw e; } } @@ -971,14 +948,6 @@ export interface DeployOptions extends CfnDeployOptions, WatchOptions { * @default - not monitoring CloudWatch logs */ readonly cloudWatchLogMonitor?: CloudWatchLogEventMonitor; - - /** - * Maximum number of simulatenous deployments (dependency permitting) to execute. - * The default is '1', which executes all deployments serially. - * - * @default 1 - */ - readonly concurrency?: number; } export interface ImportOptions extends CfnDeployOptions { diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index fcb3412a2717f..c28e3a166f8fa 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -146,8 +146,7 @@ async function parseCommandLineArguments() { desc: 'Show CloudWatch log events from all resources in the selected Stacks in the terminal. ' + "'true' by default, use --no-logs to turn off. " + "Only in effect if specified alongside the '--watch' option", - }) - .option('concurrency', { type: 'number', desc: 'Maximum number of simulatenous deployments (dependency permitting) to execute.', default: 1, requiresArg: true }), + }), ) .command('import [STACK]', 'Import existing resource(s) into the given STACK', (yargs: Argv) => yargs .option('execute', { type: 'boolean', desc: 'Whether to execute ChangeSet (--no-execute will NOT execute the ChangeSet)', default: true }) @@ -481,7 +480,6 @@ async function initCommandLine() { hotswap: args.hotswap, watch: args.watch, traceLogs: args.logs, - concurrency: args.concurrency, }); case 'import': diff --git a/packages/aws-cdk/lib/deploy.ts b/packages/aws-cdk/lib/deploy.ts deleted file mode 100644 index 95f45e8d93299..0000000000000 --- a/packages/aws-cdk/lib/deploy.ts +++ /dev/null @@ -1,60 +0,0 @@ -import * as cxapi from '@aws-cdk/cx-api'; -import PQueue from 'p-queue'; - -type Options = { - concurrency: number; - deployStack: (stack: cxapi.CloudFormationStackArtifact) => Promise; -}; - -type DeploymentState = 'pending' | 'queued' | 'deploying' | 'completed' | 'failed' | 'skipped'; - -export const deployStacks = async (stacks: cxapi.CloudFormationStackArtifact[], { concurrency, deployStack }: Options): Promise => { - const queue = new PQueue({ concurrency }); - const deploymentStates = stacks.reduce((acc, stack) => ({ ...acc, [stack.id]: 'pending' as const }), {} as Record); - - const isStackUnblocked = (stack: cxapi.CloudFormationStackArtifact) => - stack.dependencies - .map(({ id }) => id) - .filter((id) => !id.endsWith('.assets')) - .every((id) => deploymentStates[id] === 'completed'); - - const hasAnyStackFailed = (states: Record) => Object.values(states).includes('failed'); - - const deploymentErrors: Error[] = []; - - const enqueueStackDeploys = () => { - stacks.forEach(async (stack) => { - if (deploymentStates[stack.id] === 'pending' && isStackUnblocked(stack)) { - deploymentStates[stack.id] = 'queued'; - - await queue.add(async () => { - // Do not start new deployments if any has already failed - if (hasAnyStackFailed(deploymentStates)) { - deploymentStates[stack.id] = 'skipped'; - return; - } - - deploymentStates[stack.id] = 'deploying'; - - await deployStack(stack).catch((err) => { - deploymentStates[stack.id] = 'failed'; - throw err; - }); - - deploymentStates[stack.id] = 'completed'; - enqueueStackDeploys(); - }).catch((err) => { - deploymentErrors.push(err); - }); - } - }); - }; - - enqueueStackDeploys(); - - await queue.onIdle(); - - if (deploymentErrors.length) { - throw Error(`Stack Deployments Failed: ${deploymentErrors}`); - } -}; \ No newline at end of file diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index c950840484a79..a4c8238fbd091 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -107,7 +107,6 @@ "glob": "^7.2.3", "json-diff": "^0.9.0", "minimatch": ">=3.1", - "p-queue": "^6.6.2", "promptly": "^3.2.0", "proxy-agent": "^5.0.0", "semver": "^7.3.7", diff --git a/packages/aws-cdk/test/deploy.test.ts b/packages/aws-cdk/test/deploy.test.ts deleted file mode 100644 index 600f47531dd95..0000000000000 --- a/packages/aws-cdk/test/deploy.test.ts +++ /dev/null @@ -1,187 +0,0 @@ -import * as cxapi from '@aws-cdk/cx-api'; -import { deployStacks } from '../lib/deploy'; - -type Stack = cxapi.CloudFormationStackArtifact; - -const sleep = async (duration: number) => new Promise((resolve) => setTimeout(() => resolve(), duration)); - -/** - * Repurposing unused stack attributes to create specific test scenarios - * - stack.name = deployment duration - * - stack.displayName = error message - */ -describe('DeployStacks', () => { - const deployedStacks: string[] = []; - const deployStack = async ({ id, displayName, name }: Stack) => { - const errorMessage = displayName; - const timeout = Number(name) || 0; - - await sleep(timeout); - - if (errorMessage) { - throw Error(errorMessage); - } - - deployedStacks.push(id); - }; - - beforeEach(() => { - deployedStacks.splice(0); - }); - - // Success - test.each([ - // Concurrency 1 - { scenario: 'No Stacks', concurrency: 1, toDeploy: [], expected: [] }, - { scenario: 'A', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [] }], expected: ['A'] }, - { scenario: 'A, B', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [] }], expected: ['A', 'B'] }, - { scenario: 'A -> B', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [{ id: 'A' }] }], expected: ['A', 'B'] }, - { scenario: '[unsorted] A -> B', concurrency: 1, toDeploy: [{ id: 'B', dependencies: [{ id: 'A' }] }, { id: 'A', dependencies: [] }], expected: ['A', 'B'] }, - { scenario: 'A -> B -> C', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [{ id: 'A' }] }, { id: 'C', dependencies: [{ id: 'B' }] }], expected: ['A', 'B', 'C'] }, - { scenario: 'A -> B, A -> C', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [{ id: 'A' }] }, { id: 'C', dependencies: [{ id: 'A' }] }], expected: ['A', 'B', 'C'] }, - { - scenario: 'A (slow), B', - concurrency: 1, - toDeploy: [ - { id: 'A', dependencies: [], name: 10 }, - { id: 'B', dependencies: [] }, - ], - expected: ['A', 'B'], - }, - { - scenario: 'A -> B, C -> D', - concurrency: 1, - toDeploy: [ - { id: 'A', dependencies: [] }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [] }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expected: ['A', 'C', 'B', 'D'], - }, - { - scenario: 'A (slow) -> B, C -> D', - concurrency: 1, - toDeploy: [ - { id: 'A', dependencies: [], name: 10 }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [] }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expected: ['A', 'C', 'B', 'D'], - }, - - // Concurrency 2 - { scenario: 'No Stacks', concurrency: 2, toDeploy: [], expected: [] }, - { scenario: 'A', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [] }], expected: ['A'] }, - { scenario: 'A, B', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [] }], expected: ['A', 'B'] }, - { scenario: 'A -> B', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [{ id: 'A' }] }], expected: ['A', 'B'] }, - { scenario: '[unsorted] A -> B', concurrency: 2, toDeploy: [{ id: 'B', dependencies: [{ id: 'A' }] }, { id: 'A', dependencies: [] }], expected: ['A', 'B'] }, - { scenario: 'A -> B -> C', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [{ id: 'A' }] }, { id: 'C', dependencies: [{ id: 'B' }] }], expected: ['A', 'B', 'C'] }, - { scenario: 'A -> B, A -> C', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [{ id: 'A' }] }, { id: 'C', dependencies: [{ id: 'A' }] }], expected: ['A', 'B', 'C'] }, - { - scenario: 'A, B', - concurrency: 2, - toDeploy: [ - { id: 'A', dependencies: [], name: 10 }, - { id: 'B', dependencies: [] }, - ], - expected: ['B', 'A'], - }, - { - scenario: 'A -> B, C -> D', - concurrency: 2, - toDeploy: [ - { id: 'A', dependencies: [] }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [] }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expected: ['A', 'C', 'B', 'D'], - }, - { - scenario: 'A (slow) -> B, C -> D', - concurrency: 2, - toDeploy: [ - { id: 'A', dependencies: [], name: 10 }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [] }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expected: ['C', 'D', 'A', 'B'], - }, - ])('Success - Concurrency: $concurrency - $scenario', async ({ concurrency, expected, toDeploy }) => { - await expect(deployStacks(toDeploy as unknown as Stack[], { concurrency, deployStack })).resolves.toBeUndefined(); - - expect(deployedStacks).toStrictEqual(expected); - }); - - // Failure - test.each([ - // Concurrency 1 - { scenario: 'A (error)', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [], displayName: 'A' }], expectedError: 'A', expectedStacks: [] }, - { scenario: 'A (error), B', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [], displayName: 'A' }, { id: 'B', dependencies: [] }], expectedError: 'A', expectedStacks: [] }, - { scenario: 'A, B (error)', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [], displayName: 'B' }], expectedError: 'B', expectedStacks: ['A'] }, - { scenario: 'A (error) -> B', concurrency: 1, toDeploy: [{ id: 'A', dependencies: [], displayName: 'A' }, { id: 'B', dependencies: [{ id: 'A' }] }], expectedError: 'A', expectedStacks: [] }, - { scenario: '[unsorted] A (error) -> B', concurrency: 1, toDeploy: [{ id: 'B', dependencies: [{ id: 'A' }] }, { id: 'A', dependencies: [], displayName: 'A' }], expectedError: 'A', expectedStacks: [] }, - { - scenario: 'A (error) -> B, C -> D', - concurrency: 1, - toDeploy: [ - { id: 'A', dependencies: [], displayName: 'A' }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [] }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expectedError: 'A', - expectedStacks: [], - }, - { - scenario: 'A -> B, C (error) -> D', - concurrency: 1, - toDeploy: [ - { id: 'A', dependencies: [] }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [], displayName: 'C', name: 100 }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expectedError: 'C', - expectedStacks: ['A'], - }, - - // Concurrency 2 - { scenario: 'A (error)', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [], displayName: 'A' }], expectedError: 'A', expectedStacks: [] }, - { scenario: 'A (error), B', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [], displayName: 'A' }, { id: 'B', dependencies: [] }], expectedError: 'A', expectedStacks: ['B'] }, - { scenario: 'A, B (error)', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [] }, { id: 'B', dependencies: [], displayName: 'B' }], expectedError: 'B', expectedStacks: ['A'] }, - { scenario: 'A (error) -> B', concurrency: 2, toDeploy: [{ id: 'A', dependencies: [], displayName: 'A' }, { id: 'B', dependencies: [{ id: 'A' }] }], expectedError: 'A', expectedStacks: [] }, - { scenario: '[unsorted] A (error) -> B', concurrency: 2, toDeploy: [{ id: 'B', dependencies: [{ id: 'A' }] }, { id: 'A', dependencies: [], displayName: 'A' }], expectedError: 'A', expectedStacks: [] }, - { - scenario: 'A (error) -> B, C -> D', - concurrency: 2, - toDeploy: [ - { id: 'A', dependencies: [], displayName: 'A' }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [] }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expectedError: 'A', - expectedStacks: ['C'], - }, - { - scenario: 'A -> B, C (error) -> D', - concurrency: 2, - toDeploy: [ - { id: 'A', dependencies: [] }, - { id: 'B', dependencies: [{ id: 'A' }] }, - { id: 'C', dependencies: [], displayName: 'C', name: 100 }, - { id: 'D', dependencies: [{ id: 'C' }] }, - ], - expectedError: 'C', - expectedStacks: ['A', 'B'], - }, - ])('Failure - Concurrency: $concurrency - $scenario', async ({ concurrency, expectedError, toDeploy, expectedStacks }) => { - await expect(deployStacks(toDeploy as unknown as Stack[], { concurrency, deployStack })).rejects.toThrowError(expectedError); - - expect(deployedStacks).toStrictEqual(expectedStacks); - }); -}); \ No newline at end of file diff --git a/packages/aws-cdk/test/integ/cli/cli.integtest.ts b/packages/aws-cdk/test/integ/cli/cli.integtest.ts index 77832d9df2a45..ba3519481e883 100644 --- a/packages/aws-cdk/test/integ/cli/cli.integtest.ts +++ b/packages/aws-cdk/test/integ/cli/cli.integtest.ts @@ -135,14 +135,6 @@ integTest('automatic ordering', withDefaultFixture(async (fixture) => { await fixture.cdkDestroy('order-providing'); })); -integTest('automatic ordering with concurrency', withDefaultFixture(async (fixture) => { - // Deploy the consuming stack which will include the producing stack - await fixture.cdkDeploy('order-consuming', { options: ['--concurrency', '2'] }); - - // Destroy the providing stack which will include the consuming stack - await fixture.cdkDestroy('order-providing'); -})); - integTest('context setting', withDefaultFixture(async (fixture) => { await fs.writeFile(path.join(fixture.integTestDir, 'cdk.context.json'), JSON.stringify({ contextkey: 'this is the context value', @@ -186,17 +178,7 @@ integTest('deploy', withDefaultFixture(async (fixture) => { integTest('deploy all', withDefaultFixture(async (fixture) => { const arns = await fixture.cdkDeploy('test-*', { captureStderr: false }); - // verify that we only deployed both stacks (there are 2 ARNs in the output) - expect(arns.split('\n').length).toEqual(2); -})); - -integTest('deploy all concurrently', withDefaultFixture(async (fixture) => { - const arns = await fixture.cdkDeploy('test-*', { - captureStderr: false, - options: ['--concurrency', '2'], - }); - - // verify that we only deployed both stacks (there are 2 ARNs in the output) + // verify that we only deployed a single stack (there's a single ARN in the output) expect(arns.split('\n').length).toEqual(2); })); diff --git a/packages/aws-cdk/tsconfig.json b/packages/aws-cdk/tsconfig.json index 2f37a56b99090..674269068d4c5 100644 --- a/packages/aws-cdk/tsconfig.json +++ b/packages/aws-cdk/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { - "target": "ES2020", + "target": "ES2019", "module": "commonjs", - "lib": ["es2019", "es2020", "dom"], + "lib": ["es2019", "dom"], "strict": true, "alwaysStrict": true, "declaration": true,