ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the signature of map writer to take a map that isn't a pointer. Force the use of `ToMap()` to retrieve the created `map[string]interface{}`.

This commit is contained in:
Sean Chittenden 2017-02-09 02:11:59 -08:00
parent 15fb969f3e
commit db2f217f25
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/providers/consul/attr_writer_map.go
View File

@ -8,10 +8,10 @@ import (
)
type _AttrWriterMap struct {
m *map[string]interface{}
m map[string]interface{}
}
func _NewMapWriter(m *map[string]interface{}) *_AttrWriterMap {
func _NewMapWriter(m map[string]interface{}) *_AttrWriterMap {
return &_AttrWriterMap{
m: m,
}
@ -37,12 +37,12 @@ func (w *_AttrWriterMap) Set(name _SchemaAttr, v interface{}) error {
}
func (w *_AttrWriterMap) SetBool(name _SchemaAttr, b bool) error {
(*w.m)[string(name)] = fmt.Sprintf("%t", b)
w.m[string(name)] = fmt.Sprintf("%t", b)
return nil
}
func (w *_AttrWriterMap) SetFloat64(name _SchemaAttr, f float64) error {
(*w.m)[string(name)] = strconv.FormatFloat(f, 'g', -1, 64)
w.m[string(name)] = strconv.FormatFloat(f, 'g', -1, 64)
return nil
}
@ -51,6 +51,8 @@ func (w *_AttrWriterMap) SetList(name _SchemaAttr, l []interface{}) error {
}
func (w *_AttrWriterMap) SetMap(name _SchemaAttr, m map[string]interface{}) error {
w.m[string(name)] = m
return nil
panic(fmt.Sprintf("PROVIDER BUG: Cat set a map within a map for %s", name))
}
@ -59,6 +61,10 @@ func (w *_AttrWriterMap) SetSet(name _SchemaAttr, s *schema.Set) error {
}
func (w *_AttrWriterMap) SetString(name _SchemaAttr, s string) error {
(*w.m)[string(name)] = s
w.m[string(name)] = s
return nil
}
func (w *_AttrWriterMap) ToMap() map[string]interface{} {
return w.m
}

5
builtin/providers/consul/utils.go
View File

@ -242,8 +242,7 @@ func _APIToStateMap(e *_TypeEntry, v interface{}, w _AttrWriter) error {
return fmt.Errorf("PROVIDER BUG: unable to cast %s to a map", e.SchemaName)
}
m := make(map[string]interface{}, len(rawMap))
mWriter := _NewMapWriter(&m)
mWriter := _NewMapWriter(make(map[string]interface{}, len(rawMap)))
// Make a lookup map by API Schema Name
var setMembersLen int
@ -271,7 +270,7 @@ func _APIToStateMap(e *_TypeEntry, v interface{}, w _AttrWriter) error {
}
}
return w.SetMap(e.SchemaName, m)
return w.SetMap(e.SchemaName, mWriter.ToMap())
}
func _APIToStateSet(e *_TypeEntry, v interface{}, w _AttrWriter) error {