Merge pull request #6922 from paybyphone/paybyphone_expanded_datasource_destroyfix

core: Ensure EvalReadDataApply is called on expanded destroy nodes

terraform/transform_resource.go

@@ -894,7 +894,23 @@ func (n *graphNodeExpandedResourceDestroy) EvalTree() EvalNode {
 				&EvalRequireState{
 					State: &state,
 				},
-				&EvalApply{
+				// Make sure we handle data sources properly.
+				&EvalIf{
+					If: func(ctx EvalContext) (bool, error) {
+						if n.Resource.Mode == config.DataResourceMode {
+							return true, nil
+						}
+
+						return false, nil
+					},
+
+					Then: &EvalReadDataApply{
+						Info:     info,
+						Diff:     &diffApply,
+						Provider: &provider,
+						Output:   &state,
+					},
+					Else: &EvalApply{
 						Info:     info,
 						State:    &state,
 						Diff:     &diffApply,
@@ -902,6 +918,7 @@ func (n *graphNodeExpandedResourceDestroy) EvalTree() EvalNode {
 						Output:   &state,
 						Error:    &err,
 					},
+				},
 				&EvalWriteState{
 					Name:         n.stateId(),
 					ResourceType: n.Resource.Type,