From cf9b6de03e57ee8465c42b30accea42c1e92fc7b Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Thu, 14 May 2020 14:08:33 -0400
Subject: [PATCH] force cbd during apply too

We need to run the force CBD transformer during apply too, both to
ensure we can rely on the `CreateBeforeDestroy()` status for dependants
during apply, but also to ensure that the correct status is stored into
state.
---
 terraform/graph_builder_apply.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go
index fba7eff507..86ea86e050 100644
--- a/terraform/graph_builder_apply.go
+++ b/terraform/graph_builder_apply.go
@@ -143,6 +143,10 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer {
 		&ReferenceTransformer{},
 		&AttachDependenciesTransformer{},
 
+		// Detect when create_before_destroy must be forced on for a particular
+		// node due to dependency edges, to avoid graph cycles during apply.
+		&ForcedCBDTransformer{},
+
 		// Destruction ordering
 		&DestroyEdgeTransformer{
 			Config:  b.Config,