Consolidate our handling of JSON types.

We had two separate implementations of JSON type parsing, and that just
seems wasteful. One was similar to cty's, and used a custom JSON decoder
to parse types. One was a novel algorithm that decoded the JSON bytes
into an `interface{}` and read the resulting Go types using a switch
statement to understand the type information.

This consolidates to only use the cty-esque implementation, which is
presumably more accurate and stable.

Author: Paddy Carver

tfprotov5/dynamic_value_json.go

@@ -3,7 +3,6 @@ package tfprotov5
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
 )
@@ -127,7 +126,7 @@ func jsonUnmarshalDynamicPseudoType(buf []byte, typ tftypes.Type, p tftypes.Attr
 		}
 		switch key {
 		case "type":
-			t, err = parseJSONType(rawVal)
+			t, err = tftypes.ParseJSONType(rawVal)
 			if err != nil {
 				return tftypes.Value{}, p.NewErrorf("error decoding type information: %w", err)
 			}
@@ -432,129 +431,3 @@ func jsonUnmarshalObject(buf []byte, attrTypes map[string]tftypes.Type, p tftype
 		AttributeTypes: attrTypes,
 	}, vals), nil
 }
-
-type jsonType struct {
-	t tftypes.Type
-}
-
-func parseJSONType(buf []byte) (tftypes.Type, error) {
-	var t jsonType
-	err := json.Unmarshal(buf, &t)
-	return t.t, err
-}
-
-func (t *jsonType) UnmarshalJSON(buf []byte) error {
-	r := bytes.NewReader(buf)
-	dec := json.NewDecoder(r)
-
-	tok, err := dec.Token()
-	if err != nil {
-		return err
-	}
-
-	switch v := tok.(type) {
-	case string:
-		switch v {
-		case "bool":
-			t.t = tftypes.Bool
-		case "number":
-			t.t = tftypes.Number
-		case "string":
-			t.t = tftypes.String
-		case "dynamic":
-			t.t = tftypes.DynamicPseudoType
-		default:
-			return fmt.Errorf("invalid primitive type name %q", v)
-		}
-
-		if dec.More() {
-			return fmt.Errorf("extraneous data after type description")
-		}
-		return nil
-	case json.Delim:
-		if rune(v) != '[' {
-			return fmt.Errorf("invalid complex type description")
-		}
-
-		tok, err = dec.Token()
-		if err != nil {
-			return err
-		}
-
-		kind, ok := tok.(string)
-		if !ok {
-			return fmt.Errorf("invalid complex type kind name")
-		}
-
-		switch kind {
-		case "list":
-			var ety jsonType
-			err = dec.Decode(&ety)
-			if err != nil {
-				return err
-			}
-			t.t = tftypes.List{
-				ElementType: ety.t,
-			}
-		case "map":
-			var ety jsonType
-			err = dec.Decode(&ety)
-			if err != nil {
-				return err
-			}
-			t.t = tftypes.Map{
-				AttributeType: ety.t,
-			}
-		case "set":
-			var ety jsonType
-			err = dec.Decode(&ety)
-			if err != nil {
-				return err
-			}
-			t.t = tftypes.Set{
-				ElementType: ety.t,
-			}
-		case "object":
-			var atys map[string]jsonType
-			err = dec.Decode(&atys)
-			if err != nil {
-				return err
-			}
-			types := make(map[string]tftypes.Type, len(atys))
-			for k, v := range atys {
-				types[k] = v.t
-			}
-			t.t = tftypes.Object{
-				AttributeTypes: types,
-			}
-		case "tuple":
-			var etys []jsonType
-			err = dec.Decode(&etys)
-			if err != nil {
-				return err
-			}
-			types := make([]tftypes.Type, 0, len(etys))
-			for _, ty := range etys {
-				types = append(types, ty.t)
-			}
-			t.t = tftypes.Tuple{
-				ElementTypes: types,
-			}
-		default:
-			return fmt.Errorf("invalid complex type kind name")
-		}
-
-		tok, err = dec.Token()
-		if err != nil {
-			return err
-		}
-		if delim, ok := tok.(json.Delim); !ok || rune(delim) != ']' || dec.More() {
-			return fmt.Errorf("unexpected extra data in type description")
-		}
-
-		return nil
-
-	default:
-		return fmt.Errorf("invalid type description")
-	}
-}

tfprotov5/dynamic_value_msgpack.go

@@ -306,7 +306,7 @@ func msgpackUnmarshalDynamic(dec *msgpack.Decoder, path tftypes.AttributePath) (
 	if err != nil {
 		return tftypes.Value{}, path.NewErrorf("error decoding bytes: %w", err)
 	}
-	typ, err := parseJSONType(typeJSON)
+	typ, err := tftypes.ParseJSONType(typeJSON)
 	if err != nil {
 		return tftypes.Value{}, path.NewErrorf("error parsing type information: %w", err)
 	}

tfprotov5/internal/fromproto/schema.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/internal/tfplugin5"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
 )
 
 func Schema(in *tfplugin5.Schema) (*tfprotov5.Schema, error) {
@@ -51,7 +52,7 @@ func SchemaAttribute(in *tfplugin5.Schema_Attribute) (*tfprotov5.SchemaAttribute
 		DescriptionKind: StringKind(in.DescriptionKind),
 		Deprecated:      in.Deprecated,
 	}
-	typ, err := TerraformTypesType(in.Type)
+	typ, err := tftypes.ParseJSONType(in.Type)
 	if err != nil {
 		return resp, err
 	}

tfprotov5/internal/fromproto/types.go

@@ -1,12 +1,8 @@
 package fromproto
 
 import (
-	"encoding/json"
-	"fmt"
-
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5/internal/tfplugin5"
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5/tftypes"
 )
 
 func DynamicValue(in *tfplugin5.DynamicValue) *tfprotov5.DynamicValue {
@@ -15,12 +11,3 @@ func DynamicValue(in *tfplugin5.DynamicValue) *tfprotov5.DynamicValue {
 		JSON:    in.Json,
 	}
 }
-
-func TerraformTypesType(in []byte) (tftypes.Type, error) {
-	var raw interface{}
-	err := json.Unmarshal(in, &raw)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing type, not valid JSON: %w", err)
-	}
-	return tftypes.ParseType(raw)
-}