1 files changed, 10 insertions, 4 deletions

diff --git a/vendor/github.com/hashicorp/terraform/terraform/eval_state.go b/vendor/github.com/hashicorp/terraform/terraform/eval_state.go
index d506ce3..b611113 100644
--- a/vendor/github.com/hashicorp/terraform/terraform/eval_state.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/eval_state.go
@@ -424,15 +424,21 @@ func (n *EvalWriteResourceState) Eval(ctx EvalContext) (interface{}, error) {
                 return nil, diags.Err()
         }
 
-        // Currently we ony support NoEach and EachList, because for_each support
-        // is not fully wired up across Terraform. Once for_each support is added,
-        // we'll need to handle that here too, setting states.EachMap if the
-        // assigned expression is a map.
         eachMode := states.NoEach
         if count >= 0 { // -1 signals "count not set"
                 eachMode = states.EachList
         }
 
+        forEach, forEachDiags := evaluateResourceForEachExpression(n.Config.ForEach, ctx)
+        diags = diags.Append(forEachDiags)
+        if forEachDiags.HasErrors() {
+                return nil, diags.Err()
+        }
+
+        if forEach != nil {
+                eachMode = states.EachMap
+        }
+
         // This method takes care of all of the business logic of updating this
         // while ensuring that any existing instances are preserved, etc.
         state.SetResourceMeta(absAddr, eachMode, n.ProviderAddr)