helper/schema: store state with processed properly

helper/schema/resource_data.go

@@ -27,6 +27,7 @@ const (
 // is called that contains some extra data that might be used.
 type getResult struct {
 	Value          interface{}
+	ValueProcessed interface{}
 	Exists         bool
 	Schema         *Schema
 }
@@ -71,13 +72,17 @@ func (d *ResourceData) GetChange(key string) (interface{}, interface{}) {
 // existed or not in the configuration. The second boolean result will also
 // be false if a key is given that isn't in the schema at all.
 func (d *ResourceData) GetOk(key string) (interface{}, bool) {
+	r := d.getRaw(key)
+	return r.Value, r.Exists
+}
+
+func (d *ResourceData) getRaw(key string) getResult {
 	var parts []string
 	if key != "" {
 		parts = strings.Split(key, ".")
 	}
 
-	r := d.getObject("", parts, d.schema, getSourceSet)
+	return d.getObject("", parts, d.schema, getSourceSet)
-	return r.Value, r.Exists
 }
 
 // HasChange returns whether or not the given key has been changed.
@@ -484,6 +489,7 @@ func (d *ResourceData) getPrimitive(
 	schema *Schema,
 	source getSource) getResult {
 	var result string
+	var resultProcessed interface{}
 	var resultSet bool
 	if d.state != nil && source >= getSourceState {
 		result, resultSet = d.state.Attributes[k]
@@ -509,6 +515,10 @@ func (d *ResourceData) getPrimitive(
 		if ok && !attrD.NewComputed {
 			result = attrD.New
 			if attrD.NewExtra != nil {
+				// If NewExtra != nil, then we have processed data as the New,
+				// so we store that but decode the unprocessed data into result
+				resultProcessed = result
+
 				err := mapstructure.WeakDecode(attrD.NewExtra, &result)
 				if err != nil {
 					panic(err)
@@ -565,6 +575,7 @@ func (d *ResourceData) getPrimitive(
 
 	return getResult{
 		Value:          resultValue,
+		ValueProcessed: resultProcessed,
 		Exists:         resultSet,
 		Schema:         schema,
 	}
@@ -858,11 +869,16 @@ func (d *ResourceData) stateObject(
 func (d *ResourceData) statePrimitive(
 	prefix string,
 	schema *Schema) map[string]string {
-	v := d.Get(prefix)
+	raw := d.getRaw(prefix)
-	if v == nil {
+	if !raw.Exists {
 		return nil
 	}
 
+	v := raw.Value
+	if raw.ValueProcessed != nil {
+		v = raw.ValueProcessed
+	}
+
 	var vs string
 	switch schema.Type {
 	case TypeBool:

helper/schema/resource_data_test.go

@@ -1474,6 +1474,7 @@ func TestResourceDataState(t *testing.T) {
 					"availability_zone": &terraform.ResourceAttrDiff{
 						Old:      "",
 						New:      "foo",
+						NewExtra: "foo!",
 					},
 				},
 			},