From e2b08fbc854188d8f8e1b3ac561dfb1749d75725 Mon Sep 17 00:00:00 2001 From: Sri Tikkireddy Date: Thu, 22 Jun 2023 19:00:49 -0400 Subject: [PATCH 1/2] add support for generating the bundle.tf.json to make sure destroy happens cleanly if .databricks was deleted --- bundle/phases/destroy.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundle/phases/destroy.go b/bundle/phases/destroy.go index b0ed5d6271..c4d1902c69 100644 --- a/bundle/phases/destroy.go +++ b/bundle/phases/destroy.go @@ -15,6 +15,8 @@ func Destroy() bundle.Mutator { bundle.Defer( bundle.Seq( terraform.StatePull(), + terraform.Interpolate(), + terraform.Write(), terraform.Plan(terraform.PlanGoal("destroy")), terraform.Destroy(), terraform.StatePush(), From 180b3fe4d8f848ebff08318163eb21ca26d016d6 Mon Sep 17 00:00:00 2001 From: Sri Tikkireddy Date: Wed, 5 Jul 2023 09:44:14 -0400 Subject: [PATCH 2/2] fixed order of mutators to match deploy phase --- bundle/phases/destroy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/phases/destroy.go b/bundle/phases/destroy.go index c4d1902c69..5841916d15 100644 --- a/bundle/phases/destroy.go +++ b/bundle/phases/destroy.go @@ -14,9 +14,9 @@ func Destroy() bundle.Mutator { lock.Acquire(), bundle.Defer( bundle.Seq( - terraform.StatePull(), terraform.Interpolate(), terraform.Write(), + terraform.StatePull(), terraform.Plan(terraform.PlanGoal("destroy")), terraform.Destroy(), terraform.StatePush(),