1 files changed, 6 insertions, 5 deletions

diff --git a/vendor/github.com/hashicorp/terraform/helper/schema/field_reader.go b/vendor/github.com/hashicorp/terraform/helper/schema/field_reader.go
index 1660a67..b80b223 100644
--- a/vendor/github.com/hashicorp/terraform/helper/schema/field_reader.go
+++ b/vendor/github.com/hashicorp/terraform/helper/schema/field_reader.go
@@ -126,6 +126,8 @@ func addrToSchema(addr []string, schemaMap map[string]*Schema) []*Schema {
                                 switch v := current.Elem.(type) {
                                 case ValueType:
                                         current = &Schema{Type: v}
+                                case *Schema:
+                                        current, _ = current.Elem.(*Schema)
                                 default:
                                         // maps default to string values. This is all we can have
                                         // if this is nested in another list or map.
@@ -249,11 +251,10 @@ func readObjectField(
 }
 
 // convert map values to the proper primitive type based on schema.Elem
-func mapValuesToPrimitive(m map[string]interface{}, schema *Schema) error {
-
-        elemType := TypeString
-        if et, ok := schema.Elem.(ValueType); ok {
-                elemType = et
+func mapValuesToPrimitive(k string, m map[string]interface{}, schema *Schema) error {
+        elemType, err := getValueType(k, schema)
+        if err != nil {
+                return err
         }
 
         switch elemType {