tftypes: Allow DynamicPseudoType with known values

.changelog/136.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+tftypes: Fixed regression with DynamicPseudoType handling since v0.4.0, allowing usage of known values again and preventing msgpack decoding errors in Terraform CLI
+```

tftypes/diff.go

@@ -283,6 +283,9 @@ func (val1 Value) Diff(val2 Value) ([]ValueDiff, error) {
 			// if we have the same keys, we can just let recursion
 			// from the walk check the sub-values match
 			return true, nil
+		case value1.Type().Is(DynamicPseudoType):
+			// Let recursion from the walk check the sub-values match
+			return true, nil
 		}
 		return false, fmt.Errorf("unexpected type %v in Diff at %s", value1.Type(), path)
 	})

tftypes/list.go

@@ -70,9 +70,7 @@ func valueFromList(typ Type, in interface{}) (Value, error) {
 	case []Value:
 		var valType Type
 		for pos, v := range value {
-			if v.Type().Is(DynamicPseudoType) && v.IsKnown() {
-				return Value{}, NewAttributePath().WithElementKeyInt(pos).NewErrorf("invalid value %s for %s", v, v.Type())
-			} else if !v.Type().Is(DynamicPseudoType) && !v.Type().UsableAs(typ) {
+			if !v.Type().UsableAs(typ) {
 				return Value{}, NewAttributePath().WithElementKeyInt(pos).NewErrorf("can't use %s as %s", v.Type(), typ)
 			}
 			if valType == nil {

tftypes/map.go

@@ -89,9 +89,7 @@ func valueFromMap(typ Type, in interface{}) (Value, error) {
 		var elType Type
 		for _, k := range keys {
 			v := value[k]
-			if v.Type().Is(DynamicPseudoType) && v.IsKnown() {
-				return Value{}, NewAttributePath().WithElementKeyString(k).NewErrorf("invalid value %s for %s", v, v.Type())
-			} else if !v.Type().Is(DynamicPseudoType) && !v.Type().UsableAs(typ) {
+			if !v.Type().UsableAs(typ) {
 				return Value{}, NewAttributePath().WithElementKeyString(k).NewErrorf("can't use %s as %s", v.Type(), typ)
 			}
 			if elType == nil {

tftypes/object.go

@@ -183,9 +183,7 @@ func valueFromObject(types map[string]Type, optionalAttrs map[string]struct{}, i
 				if v.Type() == nil {
 					return Value{}, NewAttributePath().WithAttributeName(k).NewErrorf("missing value type")
 				}
-				if v.Type().Is(DynamicPseudoType) && v.IsKnown() && !v.IsNull() {
-					return Value{}, NewAttributePath().WithAttributeName(k).NewErrorf("invalid value %s for %s", v, v.Type())
-				} else if !v.Type().Is(DynamicPseudoType) && !v.Type().UsableAs(typ) {
+				if !v.Type().UsableAs(typ) {
 					return Value{}, NewAttributePath().WithAttributeName(k).NewErrorf("can't use %s as %s", v.Type(), typ)
 				}
 			}

tftypes/primitive.go

@@ -102,7 +102,16 @@ func (p primitive) supportedGoTypes() []string {
 	case Bool.name:
 		return []string{"bool", "*bool"}
 	case DynamicPseudoType.name:
-		return []string{"nil", "UnknownValue"}
+		// List/Set is covered by Tuple, Map is covered by Object
+		possibleTypes := []Type{
+			String, Bool, Number,
+			Tuple{}, Object{},
+		}
+		results := []string{}
+		for _, t := range possibleTypes {
+			results = append(results, t.supportedGoTypes()...)
+		}
+		return results
 	}
 	panic(fmt.Sprintf("unknown primitive type %q", p.name))
 }
@@ -346,3 +355,45 @@ func valueFromNumber(in interface{}) (Value, error) {
 		return Value{}, fmt.Errorf("tftypes.NewValue can't use %T as a tftypes.Number; expected types are: %s", in, formattedSupportedGoTypes(Number))
 	}
 }
+
+func valueFromDynamicPseudoType(val interface{}) (Value, error) {
+	switch val := val.(type) {
+	case string, *string:
+		v, err := valueFromString(val)
+		if err != nil {
+			return Value{}, err
+		}
+		v.typ = DynamicPseudoType
+		return v, nil
+	case *big.Float, float64, *float64, int, *int, int8, *int8, int16, *int16, int32, *int32, int64, *int64, uint, *uint, uint8, *uint8, uint16, *uint16, uint32, *uint32, uint64, *uint64:
+		v, err := valueFromNumber(val)
+		if err != nil {
+			return Value{}, err
+		}
+		v.typ = DynamicPseudoType
+		return v, nil
+	case bool, *bool:
+		v, err := valueFromBool(val)
+		if err != nil {
+			return Value{}, err
+		}
+		v.typ = DynamicPseudoType
+		return v, nil
+	case map[string]Value:
+		v, err := valueFromObject(nil, nil, val)
+		if err != nil {
+			return Value{}, err
+		}
+		v.typ = DynamicPseudoType
+		return v, nil
+	case []Value:
+		v, err := valueFromTuple(nil, val)
+		if err != nil {
+			return Value{}, err
+		}
+		v.typ = DynamicPseudoType
+		return v, nil
+	default:
+		return Value{}, fmt.Errorf("tftypes.NewValue can't use %T as a tftypes.DynamicPseudoType; expected types are: %s", val, formattedSupportedGoTypes(DynamicPseudoType))
+	}
+}

tftypes/set.go

@@ -70,9 +70,7 @@ func valueFromSet(typ Type, in interface{}) (Value, error) {
 	case []Value:
 		var elType Type
 		for _, v := range value {
-			if v.Type().Is(DynamicPseudoType) && v.IsKnown() {
-				return Value{}, NewAttributePath().WithElementKeyValue(v).NewErrorf("invalid value %s for %s", v, v.Type())
-			} else if !v.Type().Is(DynamicPseudoType) && !v.Type().UsableAs(typ) {
+			if !v.Type().UsableAs(typ) {
 				return Value{}, NewAttributePath().WithElementKeyValue(v).NewErrorf("can't use %s as %s", v.Type(), typ)
 			}
 			if elType == nil {

tftypes/tuple.go

@@ -109,9 +109,7 @@ func valueFromTuple(types []Type, in interface{}) (Value, error) {
 			}
 			for pos, v := range value {
 				typ := types[pos]
-				if v.Type().Is(DynamicPseudoType) && v.IsKnown() {
-					return Value{}, NewAttributePath().WithElementKeyInt(pos).NewErrorf("invalid value %s for %s", v, v.Type())
-				} else if !v.Type().Is(DynamicPseudoType) && !v.Type().UsableAs(typ) {
+				if !v.Type().UsableAs(typ) {
 					return Value{}, NewAttributePath().WithElementKeyInt(pos).NewErrorf("can't use %s as %s", v.Type(), typ)
 				}
 			}

tftypes/value.go

@@ -2,7 +2,6 @@ package tftypes
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"math/big"
 	"sort"
@@ -296,10 +295,6 @@ func newValue(t Type, val interface{}) (Value, error) {
 		}, nil
 	}
 
-	if t.Is(DynamicPseudoType) {
-		return Value{}, errors.New("cannot have DynamicPseudoType with known value, DynamicPseudoType can only contain null or unknown values")
-	}
-
 	if creator, ok := val.(ValueCreator); ok {
 		var err error
 		val, err = creator.ToTerraform5Value()
@@ -357,6 +352,12 @@ func newValue(t Type, val interface{}) (Value, error) {
 			return Value{}, err
 		}
 		return v, nil
+	case t.Is(DynamicPseudoType):
+		v, err := valueFromDynamicPseudoType(val)
+		if err != nil {
+			return Value{}, err
+		}
+		return v, nil
 	default:
 		return Value{}, fmt.Errorf("unknown type %s passed to tftypes.NewValue", t)
 	}

tftypes/value_dpt_test.go

@@ -1,6 +1,7 @@
 package tftypes
 
 import (
+	"math/big"
 	"regexp"
 	"testing"
 )
@@ -14,10 +15,93 @@ func Test_newValue_dpt(t *testing.T) {
 		expected Value
 	}
 	tests := map[string]testCase{
-		"known": {
+		"*big.Float": {
 			typ: DynamicPseudoType,
-			val: "hello",
-			err: regexp.MustCompile(`cannot have DynamicPseudoType with known value, DynamicPseudoType can only contain null or unknown values`),
+			val: big.NewFloat(123),
+			expected: Value{
+				typ: DynamicPseudoType,
+				value: Value{
+					typ:   Number,
+					value: big.NewFloat(123),
+				},
+			},
+		},
+		"bool": {
+			typ: DynamicPseudoType,
+			val: true,
+			expected: Value{
+				typ:   DynamicPseudoType,
+				value: true,
+			},
+		},
+		"float64": {
+			typ: DynamicPseudoType,
+			val: float64(123),
+			expected: Value{
+				typ: DynamicPseudoType,
+				value: Value{
+					typ:   Number,
+					value: big.NewFloat(123),
+				},
+			},
+		},
+		"int": {
+			typ: DynamicPseudoType,
+			val: 123,
+			expected: Value{
+				typ: DynamicPseudoType,
+				value: Value{
+					typ:   Number,
+					value: big.NewFloat(123),
+				},
+			},
+		},
+		"int64": {
+			typ: DynamicPseudoType,
+			val: int64(123),
+			expected: Value{
+				typ: DynamicPseudoType,
+				value: Value{
+					typ:   Number,
+					value: big.NewFloat(123),
+				},
+			},
+		},
+		"object": {
+			typ: DynamicPseudoType,
+			val: map[string]Value{
+				"testkey": NewValue(String, "testvalue"),
+			},
+			expected: Value{
+				typ: DynamicPseudoType,
+				value: map[string]Value{
+					"testkey": {
+						typ:   String,
+						value: "testvalue",
+					},
+				},
+			},
+		},
+		"string": {
+			typ: DynamicPseudoType,
+			val: "test",
+			expected: Value{
+				typ:   DynamicPseudoType,
+				value: "test",
+			},
+		},
+		"tuple": {
+			typ: DynamicPseudoType,
+			val: []Value{NewValue(String, "test")},
+			expected: Value{
+				typ: DynamicPseudoType,
+				value: []Value{
+					{
+						typ:   String,
+						value: "test",
+					},
+				},
+			},
 		},
 		"null": {
 			typ: DynamicPseudoType,

tftypes/value_json.go

@@ -355,20 +355,8 @@ func jsonUnmarshalMap(buf []byte, attrType Type, p *AttributePath) (Value, error
 		return Value{}, p.NewErrorf("invalid JSON, expected %q, got %q", json.Delim('}'), tok)
 	}
 
-	elTyp := attrType
-	if attrType.Is(DynamicPseudoType) {
-		var elements []Value
-		for _, val := range vals {
-			elements = append(elements, val)
-		}
-		elTyp, err = TypeFromElements(elements)
-		if err != nil {
-			return Value{}, p.NewErrorf("invalid elements for map: %w", err)
-		}
-	}
-
 	return NewValue(Map{
-		ElementType: elTyp,
+		ElementType: attrType,
 	}, vals), nil
 }
 
@@ -393,7 +381,6 @@ func jsonUnmarshalTuple(buf []byte, elementTypes []Type, p *AttributePath) (Valu
 	// while generally in Go it's undesirable to treat empty and nil slices
 	// separately, in this case we're surfacing a non-Go-in-origin
 	// distinction, so we'll allow it.
-	types := []Type{}
 	vals := []Value{}
 
 	var idx int
@@ -415,7 +402,6 @@ func jsonUnmarshalTuple(buf []byte, elementTypes []Type, p *AttributePath) (Valu
 		if err != nil {
 			return Value{}, err
 		}
-		types = append(types, val.Type())
 		vals = append(vals, val)
 	}
 
@@ -432,7 +418,7 @@ func jsonUnmarshalTuple(buf []byte, elementTypes []Type, p *AttributePath) (Valu
 	}
 
 	return NewValue(Tuple{
-		ElementTypes: types,
+		ElementTypes: elementTypes,
 	}, vals), nil
 }
 
@@ -447,7 +433,6 @@ func jsonUnmarshalObject(buf []byte, attrTypes map[string]Type, p *AttributePath
 		return Value{}, p.NewErrorf("invalid JSON, expected %q, got %q", json.Delim('{'), tok)
 	}
 
-	types := map[string]Type{}
 	vals := map[string]Value{}
 	for dec.More() {
 		innerPath := p.WithElementKeyValue(NewValue(String, UnknownValue))
@@ -474,7 +459,6 @@ func jsonUnmarshalObject(buf []byte, attrTypes map[string]Type, p *AttributePath
 		if err != nil {
 			return Value{}, err
 		}
-		types[key] = val.Type()
 		vals[key] = val
 	}
 
@@ -494,6 +478,6 @@ func jsonUnmarshalObject(buf []byte, attrTypes map[string]Type, p *AttributePath
 	}
 
 	return NewValue(Object{
-		AttributeTypes: types,
+		AttributeTypes: attrTypes,
 	}, vals), nil
 }

tftypes/value_json_test.go

@@ -302,7 +302,7 @@ func TestValueFromJSON(t *testing.T) {
 		},
 		"tuple-of-dynamic-bools": {
 			value: NewValue(Tuple{
-				ElementTypes: []Type{Bool, Bool},
+				ElementTypes: []Type{DynamicPseudoType, DynamicPseudoType},
 			}, []Value{
 				NewValue(Bool, true),
 				NewValue(Bool, false),
@@ -324,7 +324,7 @@ func TestValueFromJSON(t *testing.T) {
 		},
 		"map-of-dynamic-bools": {
 			value: NewValue(Map{
-				ElementType: Bool,
+				ElementType: DynamicPseudoType,
 			}, map[string]Value{
 				"true":  NewValue(Bool, true),
 				"false": NewValue(Bool, false),
@@ -338,7 +338,7 @@ func TestValueFromJSON(t *testing.T) {
 			value: NewValue(Object{
 				AttributeTypes: map[string]Type{
 					"static":  Bool,
-					"dynamic": Bool,
+					"dynamic": DynamicPseudoType,
 				},
 			}, map[string]Value{
 				"static":  NewValue(Bool, true),