terraform: disable shadowing the experimental graph

terraform/context.go

@@ -51,6 +51,11 @@ var (
 	// Plan operation, effectively testing the Diff DeepCopy whenever
 	// a Plan occurs. This is enabled for tests.
 	contextTestDeepCopyOnPlan = false
+
+	// contextTestShadow will enable the shadow graph for the new graphs.
+	// This is enabled for tests. This will be removed very shortly and
+	// be enabled by default.
+	contextTestShadow = false
 )
 
 // ContextOpts are the user-configurable options to create a context with
@@ -422,6 +427,12 @@ func (c *Context) Apply() (*State, error) {
 		}
 	}
 
+	// For now, always shadow with the real graph for verification. We don't
+	// want to shadow yet with the new graphs.
+	if !contextTestShadow {
+		shadow = real
+	}
+
 	// Determine the operation
 	operation := walkApply
 	if c.destroy {

terraform/terraform_test.go

@@ -47,6 +47,9 @@ func TestMain(m *testing.M) {
 	// Always DeepCopy the Diff on every Plan during a test
 	contextTestDeepCopyOnPlan = true
 
+	// Shadow the new graphs
+	contextTestShadow = true
+
 	os.Exit(m.Run())
 }