From 9a6ffacad43166da111a916fea30ee00c5f135e0 Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Fri, 4 Jun 2021 20:51:59 +0200 Subject: [PATCH 1/2] fix(cli): Make sure output parses only relevant parts I think this should have been the default case in the first place. This surfaced due to output changes in 0.15.4 - similar to this #739 but now for cdktf destroy. In general I think we'll switch the entire output processing over to this https://www.terraform.io/docs/internals/machine-readable-ui.html --- packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx b/packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx index da919ff7d8..6401804201 100644 --- a/packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx +++ b/packages/cdktf-cli/bin/cmds/ui/terraform-context.tsx @@ -62,7 +62,7 @@ const parseOutput = (str: string): DeployingResource[] => { applyState = DeployingResourceApplyState.DESTROYED break; default: - applyState = DeployingResourceApplyState.WAITING + return } if (resourceMatch && resourceMatch.length >= 0 && resourceMatch[1] != "Warning") { From 03f78a1a8041f6d3db4b6f0c9b41bab5abb7f41d Mon Sep 17 00:00:00 2001 From: Sebastian Korfmann Date: Fri, 4 Jun 2021 21:27:08 +0200 Subject: [PATCH 2/2] Increase test timeout --- test/jest.setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jest.setup.js b/test/jest.setup.js index 4a0c0c5965..748e4f08d3 100644 --- a/test/jest.setup.js +++ b/test/jest.setup.js @@ -1,7 +1,7 @@ // set a generous global timeout for beforeAll hooks as jest does run the tests anyway even // if the hook timeout out. This produces weird errors that are hard to trace down // for reference: https://github.com/facebook/jest/issues/9527 -const DEFAULT_TIMEOUT = 300000; +const DEFAULT_TIMEOUT = 500000; let originalBeforeAll = global.beforeAll; global.beforeAll = function beforeAllWithDefaultTimeout(setup, timeout = DEFAULT_TIMEOUT) { return originalBeforeAll(setup, timeout);