fix(aws-cdk): destroy stacks in reverse order

Fixes #1508.
aws · Jan 10, 2019 · 2a3752c · 2a3752c
1 parent d7371f0
commit 2a3752c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/packages/aws-cdk/bin/cdk.ts b/packages/aws-cdk/bin/cdk.ts
@@ -366,6 +366,10 @@ async function initCommandLine() {
 
   async function cliDestroy(stackNames: string[], force: boolean, roleArn: string | undefined) {
     const stacks = await appStacks.selectStacks(...stackNames);
+
+    // The stacks will have been ordered for deployment, so reverse them for deletion.
+    stacks.reverse();
+
     renames.validateSelectedStacks(stacks);
 
     if (!force) {

diff --git a/packages/aws-cdk/integ-tests/app/app.js b/packages/aws-cdk/integ-tests/app/app.js
@@ -33,13 +33,17 @@ class IamStack extends cdk.Stack {
 class ProvidingStack extends cdk.Stack {
   constructor(parent, id) {
     super(parent, id);
+
+    new sns.Topic(this, 'BogusTopic'); // Some filler
   }
 }
 
 class ConsumingStack extends cdk.Stack {
   constructor(parent, id, providingStack) {
     super(parent, id);
 
+
+    new sns.Topic(this, 'BogusTopic');  // Some filler
     new cdk.Output(this, 'IConsumedSomething', { value: providingStack.stackName });
   }
 }

diff --git a/packages/aws-cdk/integ-tests/test-cdk-order.sh b/packages/aws-cdk/integ-tests/test-cdk-order.sh
@@ -6,10 +6,10 @@ source ${scriptdir}/common.bash
 
 setup
 
-# ls order == synthesis order == provider before consumer
-assert "cdk list | grep -- -order-" <<HERE
-cdk-toolkit-integration-order-providing
-cdk-toolkit-integration-order-consuming
-HERE
+# Deploy all stacks with an ordering component between them
+cdk deploy cdk-toolkit-integration-order-\*
+
+# Destroy them again
+cdk destroy -f cdk-toolkit-integration-order-\*
 
 echo "✅  success"