fix marshalling of dynamic type values

Author: VenelinMartinov

pkg/valueshim/tftype_json.go

@@ -16,6 +16,7 @@ package valueshim
 
 import (
 	"encoding/json"
+	"fmt"
 	"math/big"
 
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -31,21 +32,22 @@ func tftypeValueToJSON(typ tftypes.Type, v tftypes.Value) ([]byte, error) {
 }
 
 func jsonMarshal(v tftypes.Value, typ tftypes.Type, p *tftypes.AttributePath) (interface{}, error) {
-	if v.IsNull() {
-		return nil, nil
-	}
 	if !v.IsKnown() {
 		return nil, p.NewErrorf("unknown values cannot be serialized to JSON")
 	}
+	if typ.Is(tftypes.DynamicPseudoType) {
+		return jsonMarshalDynamicPseudoType(v, typ, p)
+	}
+	if v.IsNull() {
+		return nil, nil
+	}
 	switch {
 	case typ.Is(tftypes.String):
 		return jsonMarshalString(v, typ, p)
 	case typ.Is(tftypes.Number):
 		return jsonMarshalNumber(v, typ, p)
 	case typ.Is(tftypes.Bool):
 		return jsonMarshalBool(v, typ, p)
-	case typ.Is(tftypes.DynamicPseudoType):
-		return jsonMarshalDynamicPseudoType(v, typ, p)
 	case typ.Is(tftypes.List{}):
 		return jsonMarshalList(v, typ.(tftypes.List).ElementType, p)
 	case typ.Is(tftypes.Set{}):
@@ -99,10 +101,11 @@ func jsonMarshalDynamicPseudoType(v tftypes.Value, _ tftypes.Type, p *tftypes.At
 	if err != nil {
 		return nil, p.NewError(err)
 	}
-	return map[string]interface{}{
-		"type":  string(typeJSON),
-		"value": valJSON,
-	}, nil
+	marshalledValJSON, err := json.Marshal(valJSON)
+	if err != nil {
+		return nil, p.NewError(err)
+	}
+	return json.RawMessage(fmt.Sprintf(`{"value": %s, "type": %s}`, marshalledValJSON, typeJSON)), nil
 }
 
 func jsonMarshalList(v tftypes.Value, elementType tftypes.Type, p *tftypes.AttributePath) (interface{}, error) {

pkg/valueshim/tftype_json_test.go

@@ -367,22 +367,22 @@ func TestValueToJSON_DynamicPseudoType(t *testing.T) {
 	require.NoError(t, err)
 
 	// The result should be a JSON object with type and value fields
-	expected := `{"type":"\"string\"","value":"dynamic content"}`
+	expected := `{"type":"string","value":"dynamic content"}`
 	assert.JSONEq(t, expected, string(result))
 
 	// Also test with other types
 	numberValue := tftypes.NewValue(tftypes.Number, 42)
 	result, err = tftypeValueToJSON(tftypes.DynamicPseudoType, numberValue)
 	require.NoError(t, err)
 
-	expected = `{"type":"\"number\"","value":42}`
+	expected = `{"type":"number","value":42}`
 	assert.JSONEq(t, expected, string(result))
 
 	boolValue := tftypes.NewValue(tftypes.Bool, true)
 	result, err = tftypeValueToJSON(tftypes.DynamicPseudoType, boolValue)
 	require.NoError(t, err)
 
-	expected = `{"type":"\"bool\"","value":true}`
+	expected = `{"type":"bool","value":true}`
 	assert.JSONEq(t, expected, string(result))
 }