Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / hashicorp / terraform / helper / schema / field_writer_map.go

diff --git a/vendor/github.com/hashicorp/terraform/helper/schema/field_writer_map.go b/vendor/github.com/hashicorp/terraform/helper/schema/field_writer_map.go
index 814c7ba8e3fc119da00ab6fc3ab09cc122db2606..c09358b1bb4a2336e8bfeb8081d1beae10e61305 100644 (file)
--- a/vendor/github.com/hashicorp/terraform/helper/schema/field_writer_map.go
+++ b/vendor/github.com/hashicorp/terraform/helper/schema/field_writer_map.go
@@ -297,13 +297,14 @@ func (w *MapFieldWriter) setSet(
        // we get the proper order back based on the hash code.
        if v := reflect.ValueOf(value); v.Kind() == reflect.Slice {
                // Build a temp *ResourceData to use for the conversion
+               tempAddr := addr[len(addr)-1:]
                tempSchema := *schema
                tempSchema.Type = TypeList
-               tempSchemaMap := map[string]*Schema{addr[0]: &tempSchema}
+               tempSchemaMap := map[string]*Schema{tempAddr[0]: &tempSchema}
                tempW := &MapFieldWriter{Schema: tempSchemaMap}
 
                // Set the entire list, this lets us get sane values out of it
-               if err := tempW.WriteField(addr, value); err != nil {
+               if err := tempW.WriteField(tempAddr, value); err != nil {
                        return err
                }
 
@@ -319,7 +320,7 @@ func (w *MapFieldWriter) setSet(
                }
                for i := 0; i < v.Len(); i++ {
                        is := strconv.FormatInt(int64(i), 10)
-                       result, err := tempR.ReadField(append(addrCopy, is))
+                       result, err := tempR.ReadField(append(tempAddr, is))
                        if err != nil {
                                return err
                        }
@@ -340,6 +341,11 @@ func (w *MapFieldWriter) setSet(
        // problems when the old data isn't wiped first.
        w.clearTree(addr)
 
+       if value.(*Set) == nil {
+               w.result[k+".#"] = "0"
+               return nil
+       }
+
        for code, elem := range value.(*Set).m {
                if err := w.set(append(addrCopy, code), elem); err != nil {
                        return err