1 files changed, 12 insertions, 0 deletions

diff --git a/vendor/github.com/hashicorp/terraform/terraform/node_data_refresh.go b/vendor/github.com/hashicorp/terraform/terraform/node_data_refresh.go
index ab82163..dd92866 100644
--- a/vendor/github.com/hashicorp/terraform/terraform/node_data_refresh.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/node_data_refresh.go
@@ -38,6 +38,16 @@ func (n *NodeRefreshableDataResource) DynamicExpand(ctx EvalContext) (*Graph, er
                 return nil, nil
         }
 
+        forEachMap, forEachKnown, forEachDiags := evaluateResourceForEachExpressionKnown(n.Config.ForEach, ctx)
+        if forEachDiags.HasErrors() {
+                return nil, diags.Err()
+        }
+        if !forEachKnown {
+                // If the for_each isn't known yet, we'll skip refreshing and try expansion
+                // again during the plan walk.
+                return nil, nil
+        }
+
         // Next we need to potentially rename an instance address in the state
         // if we're transitioning whether "count" is set at all.
         fixResourceCountSetTransition(ctx, n.ResourceAddr(), count != -1)
@@ -77,6 +87,7 @@ func (n *NodeRefreshableDataResource) DynamicExpand(ctx EvalContext) (*Graph, er
                         Concrete: concreteResource,
                         Schema:   n.Schema,
                         Count:    count,
+                        ForEach:  forEachMap,
                         Addr:     n.ResourceAddr(),
                 },
 
@@ -85,6 +96,7 @@ func (n *NodeRefreshableDataResource) DynamicExpand(ctx EvalContext) (*Graph, er
                 &OrphanResourceCountTransformer{
                         Concrete: concreteResourceDestroyable,
                         Count:    count,
+                        ForEach:  forEachMap,
                         Addr:     n.ResourceAddr(),
                         State:    state,
                 },