Revert "Allow opting into using json.Number in state."

This reverts commit 272df8b.

This commit causes compatibility issues when decoding timeouts.

Author: pgavlin

helper/resource/json.go

@@ -1,7 +1,6 @@
 package resource
 
 import (
-	"encoding/json"
 	"fmt"
 	"strconv"
 
@@ -71,11 +70,11 @@ func shimOutputState(so *tfjson.StateOutput) (*terraform.OutputState, error) {
 				elements[i] = el.(bool)
 			}
 			os.Value = elements
-		// unmarshalled number from JSON will always be json.Number
-		case json.Number:
+		// unmarshalled number from JSON will always be float64
+		case float64:
 			elements := make([]interface{}, len(v))
 			for i, el := range v {
-				elements[i] = el.(json.Number)
+				elements[i] = el.(float64)
 			}
 			os.Value = elements
 		case []interface{}:
@@ -94,10 +93,10 @@ func shimOutputState(so *tfjson.StateOutput) (*terraform.OutputState, error) {
 		os.Type = "string"
 		os.Value = strconv.FormatBool(v)
 		return os, nil
-	// unmarshalled number from JSON will always be json.Number
-	case json.Number:
+	// unmarshalled number from JSON will always be float64
+	case float64:
 		os.Type = "string"
-		os.Value = v.String()
+		os.Value = strconv.FormatFloat(v, 'f', -1, 64)
 		return os, nil
 	}
 
@@ -156,13 +155,8 @@ func shimResourceStateKey(res *tfjson.StateResource) (string, error) {
 
 	var index int
 	switch idx := res.Index.(type) {
-	case json.Number:
-		i, err := idx.Int64()
-		if err != nil {
-			return "", fmt.Errorf("unexpected index value (%q) for %q, ",
-				idx, res.Address)
-		}
-		index = int(i)
+	case float64:
+		index = int(idx)
 	default:
 		return "", fmt.Errorf("unexpected index type (%T) for %q, "+
 			"for_each is not supported", res.Index, res.Address)
@@ -262,8 +256,8 @@ func (sf *shimmedFlatmap) AddEntry(key string, value interface{}) error {
 		return nil
 	case bool:
 		sf.m[key] = strconv.FormatBool(el)
-	case json.Number:
-		sf.m[key] = el.String()
+	case float64:
+		sf.m[key] = strconv.FormatFloat(el, 'f', -1, 64)
 	case string:
 		sf.m[key] = el
 	case map[string]interface{}:

helper/resource/state_shim.go

@@ -171,18 +171,18 @@ func TestShimState(t *testing.T) {
 							"list_of_int": {
 								Type: "list",
 								Value: []interface{}{
-									json.Number("1"),
-									json.Number("4"),
-									json.Number("9"),
+									// TODO: Not sure if this is expectable
+									// but we have no way of distinguishing between int and float
+									// due outputs being schema-less and numbers
+									// always being unmarshaled into float64
+									1.0, 4.0, 9.0,
 								},
 								Sensitive: false,
 							},
 							"list_of_float": {
 								Type: "list",
 								Value: []interface{}{
-									json.Number("1.2"),
-									json.Number("4.2"),
-									json.Number("9.8"),
+									1.2, 4.2, 9.8,
 								},
 								Sensitive: false,
 							},
@@ -280,12 +280,12 @@ func TestShimState(t *testing.T) {
 								Value: []interface{}{
 									map[string]interface{}{
 										"allow_bool": true,
-										"port":       json.Number("443"),
+										"port":       float64(443),
 										"rule":       "allow",
 									},
 									map[string]interface{}{
 										"allow_bool": false,
-										"port":       json.Number("80"),
+										"port":       float64(80),
 										"rule":       "deny",
 									},
 								},
@@ -1088,7 +1088,7 @@ func TestShimState(t *testing.T) {
 			var rawState tfjson.State
 			rawState.UseJSONNumber(true)
 
-			err := unmarshalJSON([]byte(tc.RawState), &rawState)
+			err := json.Unmarshal([]byte(tc.RawState), &rawState)
 			if err != nil {
 				t.Fatal(err)
 			}

helper/resource/testing_new_test.go

@@ -88,15 +88,6 @@ func TestMapFieldWriter(t *testing.T) {
 			},
 		},
 
-		"bigint": {
-			[]string{"int"},
-			7227701560655103598,
-			false,
-			map[string]string{
-				"int": "7227701560655103598",
-			},
-		},
-
 		"string": {
 			[]string{"string"},
 			"42",

helper/schema/field_writer_map_test.go

@@ -282,11 +282,7 @@ func (s *GRPCProviderServer) UpgradeResourceState(ctx context.Context, req *tfpr
 		}
 	// if there's a JSON state, we need to decode it.
 	case len(req.RawState.JSON) > 0:
-		if res.UseJSONNumber {
-			err = unmarshalJSON(req.RawState.JSON, &jsonMap)
-		} else {
-			err = json.Unmarshal(req.RawState.JSON, &jsonMap)
-		}
+		err = json.Unmarshal(req.RawState.JSON, &jsonMap)
 		if err != nil {
 			resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)
 			return resp, nil
@@ -413,7 +409,7 @@ func UpgradeFlatmapState(ctx context.Context, version int, m map[string]string,
 		return nil, 0, err
 	}
 
-	jsonMap, err := stateValueToJSONMap(newConfigVal, schemaType, res.UseJSONNumber)
+	jsonMap, err := StateValueToJSONMap(newConfigVal, schemaType)
 	return jsonMap, upgradedVersion, err
 }
 
@@ -563,7 +559,7 @@ func (s *GRPCProviderServer) ReadResource(ctx context.Context, req *tfprotov5.Re
 
 	private := make(map[string]interface{})
 	if len(req.Private) > 0 {
-		if err := unmarshalJSON(req.Private, &private); err != nil {
+		if err := json.Unmarshal(req.Private, &private); err != nil {
 			resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)
 			return resp, nil
 		}
@@ -671,7 +667,7 @@ func (s *GRPCProviderServer) PlanResourceChange(ctx context.Context, req *tfprot
 	}
 	priorPrivate := make(map[string]interface{})
 	if len(req.PriorPrivate) > 0 {
-		if err := unmarshalJSON(req.PriorPrivate, &priorPrivate); err != nil {
+		if err := json.Unmarshal(req.PriorPrivate, &priorPrivate); err != nil {
 			resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)
 			return resp, nil
 		}
@@ -885,7 +881,7 @@ func (s *GRPCProviderServer) ApplyResourceChange(ctx context.Context, req *tfpro
 
 	private := make(map[string]interface{})
 	if len(req.PlannedPrivate) > 0 {
-		if err := unmarshalJSON(req.PlannedPrivate, &private); err != nil {
+		if err := json.Unmarshal(req.PlannedPrivate, &private); err != nil {
 			resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)
 			return resp, nil
 		}