IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

helper/schema: test real nil pointer to ResourceData.Set

Browse Source
This commit is contained in:
Mitchell Hashimoto 2015-03-02 23:37:43 -08:00
parent c030148259
commit 58a8776c41
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helper/schema/resource_data.go
View File

@ -143,11 +143,18 @@ func (d *ResourceData) Set(key string, value interface{}) error {
// simplify the interface.
reflectVal := reflect.ValueOf(value)
if reflectVal.Kind() == reflect.Ptr {
if reflectVal.IsNil() {
// If the pointer is nil, then the value is just nil
value = nil
} else {
// Otherwise, we dereference the pointer as long as its not
// a pointer to a struct, since struct pointers are allowed.
reflectVal = reflect.Indirect(reflectVal)
if reflectVal.Kind() != reflect.Struct {
value = reflectVal.Interface()
}
}
}
return d.setWriter.WriteField(strings.Split(key, "."), value)
}

4
helper/schema/resource_data_test.go
View File

@ -1178,6 +1178,8 @@ func TestResourceDataHasChange(t *testing.T) {
}
func TestResourceDataSet(t *testing.T) {
var testNilPtr *string
cases := []struct {
Schema map[string]*Schema
State *terraform.InstanceState
@ -1649,7 +1651,7 @@ func TestResourceDataSet(t *testing.T) {
Diff: nil,
Key: "availability_zone",
Value: nil,
Value: testNilPtr,
GetKey: "availability_zone",
GetValue: "",