2 files changed, 6 insertions, 5 deletions

diff --git a/vendor/github.com/hashicorp/terraform/lang/blocktoattr/schema.go b/vendor/github.com/hashicorp/terraform/lang/blocktoattr/schema.go
index 2f2463a..47a0256 100644
--- a/vendor/github.com/hashicorp/terraform/lang/blocktoattr/schema.go
+++ b/vendor/github.com/hashicorp/terraform/lang/blocktoattr/schema.go
@@ -55,10 +55,11 @@ func effectiveSchema(given *hcl.BodySchema, body hcl.Body, ambiguousNames map[st
                                 },
                         }
                         content, _, _ = body.PartialContent(&probeSchema)
-                        if len(content.Blocks) > 0 {
-                                // No attribute present and at least one block present, so
-                                // we'll need to rewrite this one as a block for a successful
-                                // result.
+                        if len(content.Blocks) > 0 || dynamicExpanded {
+                                // A dynamic block with an empty iterator returns nothing.
+                                // If there's no attribute and we have either a block or a
+                                // dynamic expansion, we need to rewrite this one as a
+                                // block for a successful result.
                                 appearsAsBlock[name] = struct{}{}
                         }
                 }
diff --git a/vendor/github.com/hashicorp/terraform/lang/blocktoattr/variables.go b/vendor/github.com/hashicorp/terraform/lang/blocktoattr/variables.go
index e123b8a..b172805 100644
--- a/vendor/github.com/hashicorp/terraform/lang/blocktoattr/variables.go
+++ b/vendor/github.com/hashicorp/terraform/lang/blocktoattr/variables.go
@@ -33,7 +33,7 @@ func walkVariables(node dynblock.WalkVariablesNode, body hcl.Body, schema *confi
         for _, child := range children {
                 if blockS, exists := schema.BlockTypes[child.BlockTypeName]; exists {
                         vars = append(vars, walkVariables(child.Node, child.Body(), &blockS.Block)...)
-                } else if attrS, exists := schema.Attributes[child.BlockTypeName]; exists {
+                } else if attrS, exists := schema.Attributes[child.BlockTypeName]; exists && attrS.Type.ElementType().IsObjectType() {
                         synthSchema := SchemaForCtyElementType(attrS.Type.ElementType())
                         vars = append(vars, walkVariables(child.Node, child.Body(), synthSchema)...)
                 }