Link schema type propagation together

t0yv0 · VenelinMartinov · commit 5c89fe1f304b · 2025-06-03T19:30:22.000+03:00
diff --git a/pkg/pf/internal/schemashim/datasource.go b/pkg/pf/internal/schemashim/datasource.go
@@ -15,9 +15,13 @@
 package schemashim
 
 import (
+	"context"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 )
 
 type schemaOnlyDataSource struct {
@@ -27,6 +31,12 @@ type schemaOnlyDataSource struct {
 
 var _ shim.Resource = (*schemaOnlyDataSource)(nil)
 
+func (r *schemaOnlyDataSource) SchemaType() valueshim.Type {
+	protoSchema, err := r.tf.ResourceProtoSchema(context.Background())
+	contract.AssertNoErrorf(err, "ResourceProtoSchema failed")
+	return valueshim.FromTType(protoSchema.ValueType())
+}
+
 func (r *schemaOnlyDataSource) Schema() shim.SchemaMap {
 	return r.tf.Shim()
 }
diff --git a/pkg/pf/internal/schemashim/object_pseudoresource.go b/pkg/pf/internal/schemashim/object_pseudoresource.go
@@ -28,6 +28,7 @@ import (
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 // An Object type that masquerades as a Resource. This is a workaround to reusing tfgen code for generating schemas,
@@ -77,6 +78,10 @@ func (r *objectPseudoResource) Schema() shim.SchemaMap {
 	return r
 }
 
+func (r *objectPseudoResource) SchemaType() valueshim.Type {
+	return valueshim.FromTType(tftypes.Object{})
+}
+
 func (*objectPseudoResource) SchemaVersion() int {
 	panic("This is an Object type encoded as a shim.Resource, and " +
 		"SchemaVersion() should not be called on this entity during schema generation")
@@ -200,6 +205,10 @@ func newTuplePseudoResource(t attr.TypeWithElementTypes) shim.Resource {
 	}
 }
 
+func (r *tuplePseudoResource) SchemaType() valueshim.Type {
+	return valueshim.FromTType(tftypes.Object{})
+}
+
 func (*tuplePseudoResource) SchemaVersion() int         { panic("TODO") }
 func (*tuplePseudoResource) DeprecationMessage() string { panic("TODO") }
 
diff --git a/pkg/pf/internal/schemashim/resource.go b/pkg/pf/internal/schemashim/resource.go
@@ -15,9 +15,13 @@
 package schemashim
 
 import (
+	"context"
+
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/runtypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 )
 
 type schemaOnlyResource struct {
@@ -43,6 +47,12 @@ func (r *schemaOnlyResource) DeprecationMessage() string {
 	return r.tf.DeprecationMessage()
 }
 
+func (r *schemaOnlyResource) SchemaType() valueshim.Type {
+	s, err := r.tf.ResourceProtoSchema(context.Background())
+	contract.AssertNoErrorf(err, "failed to extract schema")
+	return valueshim.FromTType(s.ValueType())
+}
+
 func (*schemaOnlyResource) Importer() shim.ImportFunc {
 	panic("schemaOnlyResource does not implement runtime operation ImporterFunc")
 }
diff --git a/pkg/pf/proto/element.go b/pkg/pf/proto/element.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 var (
@@ -113,6 +114,10 @@ func (o elementObject) Schema() shim.SchemaMap {
 	return elementObjectMap(o.typ)
 }
 
+func (o elementObject) SchemaType() valueshim.Type {
+	return valueshim.FromTType(o.typ)
+}
+
 func (m elementObjectMap) Len() int { return len(m.AttributeTypes) }
 
 func (m elementObjectMap) Get(key string) shim.Schema { return getSchemaMap(m, key) }
diff --git a/pkg/pf/proto/object.go b/pkg/pf/proto/object.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 var (
@@ -33,6 +34,11 @@ type object struct {
 	internalinter.Internal
 }
 
+func (o object) SchemaType() valueshim.Type {
+	ty := o.obj.ValueType()
+	return valueshim.FromTType(ty)
+}
+
 func (o object) Schema() shim.SchemaMap {
 	contract.Assertf(o.obj.Nesting != tfprotov6.SchemaObjectNestingModeMap,
 		"%T cannot be a map, since that would require `o` to represent a Map<Object> type", o)
diff --git a/pkg/pf/proto/resource.go b/pkg/pf/proto/resource.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 var (
@@ -70,6 +71,11 @@ func newResource(r *tfprotov6.Schema) *resource {
 	return &resource{r, internalinter.Internal{}}
 }
 
+func (r resource) SchemaType() valueshim.Type {
+	ty := r.r.Block.ValueType()
+	return valueshim.FromTType(ty)
+}
+
 func (r resource) Schema() shim.SchemaMap {
 	return blockMap{r.r.Block}
 }
diff --git a/pkg/pf/proto/schema.go b/pkg/pf/proto/schema.go
@@ -17,12 +17,18 @@ package proto
 import (
 	// "github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
 
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 // pseudoResource represents a type that must pretent to be a [shim.Resource], but does not represent a resource.
 type pseudoResource struct{}
 
+func (pseudoResource) SchemaType() valueshim.Type {
+	return valueshim.FromTType(tftypes.Object{}) // not a top-level resource
+}
+
 func (pseudoResource) SchemaVersion() int              { return 0 }
 func (pseudoResource) Importer() shim.ImportFunc       { return nil }
 func (pseudoResource) Timeouts() *shim.ResourceTimeout { return nil }
diff --git a/pkg/pf/tfbridge/provider.go b/pkg/pf/tfbridge/provider.go
@@ -339,7 +339,8 @@ func (p *provider) returnTerraformConfig() (resource.PropertyMap, error) {
 	}
 	// use valueshim package to marshal tfConfigValue into raw json,
 	// which can be unmarshaled into a map[string]interface{}
-	configJSONMessage, err := valueshim.FromTValue(tfConfigValue).Marshal()
+	value := valueshim.FromTValue(tfConfigValue)
+	configJSONMessage, err := value.Marshal(value.Type())
 	if err != nil {
 		return nil, fmt.Errorf("error marshaling into raw JSON message: %v", err)
 	}
diff --git a/pkg/pf/tfbridge/resource_state.go b/pkg/pf/tfbridge/resource_state.go
@@ -185,7 +185,8 @@ func insertRawStateDelta(ctx context.Context, rh *resourceHandle, pm resource.Pr
 	schemaInfos := rh.pulumiResourceInfo.GetFields()
 	v := valueshim.FromTValue(state)
 
-	delta, err := tfbridge.RawStateComputeDelta(ctx, rh.schema.Shim(), schemaInfos, pm, v)
+	st := valueshim.FromTType(rh.schema.Type(ctx))
+	delta, err := tfbridge.RawStateComputeDelta(ctx, rh.schema.Shim(), schemaInfos, pm, st, v)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/tfbridge/provider.go b/pkg/tfbridge/provider.go
@@ -1365,7 +1365,8 @@ func (p *Provider) Create(ctx context.Context, req *pulumirpc.CreateRequest) (*p
 	}
 
 	if p.info.RawStateDeltaEnabled() {
-		if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, newstate); err != nil {
+		s := res.TF.SchemaType()
+		if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, s, newstate); err != nil {
 			return nil, err
 		}
 	}
@@ -1515,7 +1516,8 @@ func (p *Provider) Read(ctx context.Context, req *pulumirpc.ReadRequest) (*pulum
 		}
 
 		if p.info.RawStateDeltaEnabled() {
-			err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, newstate)
+			s := res.TF.SchemaType()
+			err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, s, newstate)
 			if err != nil {
 				return nil, err
 			}
@@ -1744,7 +1746,8 @@ func (p *Provider) Update(ctx context.Context, req *pulumirpc.UpdateRequest) (*p
 	}
 
 	if p.info.RawStateDeltaEnabled() {
-		if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, newstate); err != nil {
+		s := res.TF.SchemaType()
+		if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, s, newstate); err != nil {
 			return nil, err
 		}
 	}
diff --git a/pkg/tfbridge/rawstate.go b/pkg/tfbridge/rawstate.go
@@ -454,6 +454,7 @@ func RawStateInjectDelta(
 	schemaMap shim.SchemaMap, // top-level schema for a resource
 	schemaInfos map[string]*SchemaInfo, // top-level schema overrides for a resource
 	outMap resource.PropertyMap,
+	schemaType valueshim.Type,
 	instanceState shim.InstanceState,
 ) error {
 	// If called in a pulumi preview e.g. Create(preview=true) or in a continue-on-error scenario, bail because the
@@ -467,7 +468,7 @@ func RawStateInjectDelta(
 		return nil
 	}
 	v := instanceStateCty.Value()
-	d, err := RawStateComputeDelta(ctx, schemaMap, schemaInfos, outMap, v)
+	d, err := RawStateComputeDelta(ctx, schemaMap, schemaInfos, outMap, schemaType, v)
 	if err != nil {
 		return err
 	}
@@ -480,6 +481,7 @@ func RawStateComputeDelta(
 	schemaMap shim.SchemaMap, // top-level schema for a resource
 	schemaInfos map[string]*SchemaInfo, // top-level schema overrides for a resource
 	outMap resource.PropertyMap,
+	schemaType valueshim.Type,
 	v valueshim.Value,
 ) (RawStateDelta, error) {
 	ih := &rawStateDeltaHelper{
@@ -491,7 +493,7 @@ func RawStateComputeDelta(
 
 	vWithoutTimeouts := v.Remove("timeouts")
 	delta := ih.delta(pv, vWithoutTimeouts)
-	err := delta.turnaroundCheck(ctx, newRawStateFromValue(vWithoutTimeouts), pv)
+	err := delta.turnaroundCheck(ctx, newRawStateFromValue(schemaType, vWithoutTimeouts), pv)
 	if err != nil {
 		return RawStateDelta{}, err
 	}
@@ -571,6 +573,7 @@ type rawStateDeltaHelper struct {
 	schemaMap   shim.SchemaMap         // top-level schema for a resource
 	schemaInfos map[string]*SchemaInfo // top-level schema overrides for a resource
 	logger      log.Logger
+	schemaType  valueshim.Type
 }
 
 func (ih *rawStateDeltaHelper) delta(pv resource.PropertyValue, v valueshim.Value) RawStateDelta {
@@ -603,7 +606,14 @@ func (ih *rawStateDeltaHelper) replaceDeltaAt(
 			err,
 		))
 	}
-	return RawStateDelta{Replace: &replaceDelta{Raw: newRawStateFromValue(v)}}
+
+	relevantSchemaType, err := walk.LookupType(path, ih.schemaType)
+	if err != nil {
+		// If lookup failed, ignore the schema type; will only affect DynamicPseudoType.
+		relevantSchemaType = v.Type()
+	}
+
+	return RawStateDelta{Replace: &replaceDelta{Raw: newRawStateFromValue(relevantSchemaType, v)}}
 }
 
 // Errors returned from this inner function are simply missed opportunities for optimization, as [deltaAt] will always
@@ -834,8 +844,8 @@ func (ih *rawStateDeltaHelper) computeDeltaAt(
 	}
 }
 
-func newRawStateFromValue(v valueshim.Value) rawstate.RawState {
-	raw, err := v.Marshal()
+func newRawStateFromValue(schemaType valueshim.Type, v valueshim.Value) rawstate.RawState {
+	raw, err := v.Marshal(schemaType)
 	contract.AssertNoErrorf(err, "v.Marshal() failed")
 	return rawstate.RawState(raw)
 }
diff --git a/pkg/tfshim/schema/resource.go b/pkg/tfshim/schema/resource.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 var _ = shim.ResourceMap(ResourceMap{})
@@ -15,6 +16,7 @@ type Resource struct {
 	Importer           shim.ImportFunc
 	DeprecationMessage string
 	Timeouts           *shim.ResourceTimeout
+	SchemaType         valueshim.Type
 }
 
 func (r *Resource) Shim() shim.Resource {
@@ -42,6 +44,10 @@ func (r ResourceShim) DeprecationMessage() string {
 	return r.V.DeprecationMessage
 }
 
+func (r ResourceShim) SchemaType() valueshim.Type {
+	return r.V.SchemaType
+}
+
 func (r ResourceShim) Timeouts() *shim.ResourceTimeout {
 	return r.V.Timeouts
 }
diff --git a/pkg/tfshim/sdk-v1/resource.go b/pkg/tfshim/sdk-v1/resource.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 var (
@@ -32,6 +33,10 @@ func (r v1Resource) SchemaVersion() int {
 	return r.tf.SchemaVersion
 }
 
+func (r v1Resource) SchemaType() valueshim.Type {
+	return valueshim.FromCtyType(r.tf.CoreConfigSchema().ImpliedType())
+}
+
 func (r v1Resource) Importer() shim.ImportFunc {
 	if r.tf.Importer == nil {
 		return nil
diff --git a/pkg/tfshim/sdk-v2/provider2.go b/pkg/tfshim/sdk-v2/provider2.go
@@ -75,6 +75,10 @@ func (r *v2Resource2) DecodeTimeouts(config shim.ResourceConfig) (*shim.Resource
 	return v2Resource{tf: r.tf}.DecodeTimeouts(config)
 }
 
+func (r *v2Resource2) SchemaType() valueshim.Type {
+	return valueshim.FromHCtyType(r.tf.CoreConfigSchema().ImpliedType())
+}
+
 type v2InstanceState2 struct {
 	resourceType string
 	stateValue   cty.Value
diff --git a/pkg/tfshim/sdk-v2/resource.go b/pkg/tfshim/sdk-v2/resource.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"
 	shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"
+	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"
 )
 
 var (
@@ -33,6 +34,10 @@ func (r v2Resource) SchemaVersion() int {
 	return r.tf.SchemaVersion
 }
 
+func (r v2Resource) SchemaType() valueshim.Type {
+	return valueshim.FromHCtyType(r.tf.CoreConfigSchema().ImpliedType())
+}
+
 func (r v2Resource) Importer() shim.ImportFunc {
 	// When v2Resource represents resources, it is wrapped in v2Resource2 and v2Resource2.Importer() is called.
 	// The residual use case is v2Resource representing data sources, but those do not support importers.
diff --git a/pkg/tfshim/sdk-v2/resource_config.go b/pkg/tfshim/sdk-v2/resource_config.go
@@ -42,7 +42,8 @@ func (c v2ResourceConfig) GetRawConfigMap() (map[string]any, error) {
 		msg := "ConfigMap contains unknowns"
 		return nil, fmt.Errorf("%s", msg)
 	}
-	configJSONMessage, err := valueshim.FromHCtyValue(ctyValue).Marshal()
+	value := valueshim.FromHCtyValue(ctyValue)
+	configJSONMessage, err := value.Marshal(value.Type())
 	if err != nil {
 		return nil, fmt.Errorf("error marshaling into raw JSON message: %v", err)
 	}
diff --git a/pkg/tfshim/shim.go b/pkg/tfshim/shim.go
@@ -263,6 +263,7 @@ type Resource interface {
 
 	DecodeTimeouts(config ResourceConfig) (*ResourceTimeout, error)
 
+	SchemaType() valueshim.Type
 	// This is a no-op internal interface to prevent external users from implementing the interface.
 	internalinter.InternalInterface
 }
diff --git a/pkg/valueshim/cty.go b/pkg/valueshim/cty.go
diff --git a/pkg/valueshim/hcty.go b/pkg/valueshim/hcty.go

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import (`
`28`	`28`	`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"`
`29`	`29`	`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/internal/pfutils"`
`30`	`30`	`shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"`
	`31`	`+ "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"`
`31`	`32`	`)`
`32`	`33`
`33`	`34`	`// An Object type that masquerades as a Resource. This is a workaround to reusing tfgen code for generating schemas,`
`@@ -77,6 +78,10 @@ func (r *objectPseudoResource) Schema() shim.SchemaMap {`
`77`	`78`	`return r`
`78`	`79`	`}`
`79`	`80`
	`81`	`+func (r *objectPseudoResource) SchemaType() valueshim.Type {`
	`82`	`+ return valueshim.FromTType(tftypes.Object{})`
	`83`	`+}`
	`84`	`+`
`80`	`85`	`func (*objectPseudoResource) SchemaVersion() int {`
`81`	`86`	`panic("This is an Object type encoded as a shim.Resource, and " +`
`82`	`87`	`"SchemaVersion() should not be called on this entity during schema generation")`
`@@ -200,6 +205,10 @@ func newTuplePseudoResource(t attr.TypeWithElementTypes) shim.Resource {`
`200`	`205`	`}`
`201`	`206`	`}`
`202`	`207`
	`208`	`+func (r *tuplePseudoResource) SchemaType() valueshim.Type {`
	`209`	`+ return valueshim.FromTType(tftypes.Object{})`
	`210`	`+}`
	`211`	`+`
`203`	`212`	`func (*tuplePseudoResource) SchemaVersion() int { panic("TODO") }`
`204`	`213`	`func (*tuplePseudoResource) DeprecationMessage() string { panic("TODO") }`
`205`	`214`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`
`20`	`20`	`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"`
`21`	`21`	`shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"`
	`22`	`+ "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`var (`
`@@ -113,6 +114,10 @@ func (o elementObject) Schema() shim.SchemaMap {`
`113`	`114`	`return elementObjectMap(o.typ)`
`114`	`115`	`}`
`115`	`116`
	`117`	`+func (o elementObject) SchemaType() valueshim.Type {`
	`118`	`+ return valueshim.FromTType(o.typ)`
	`119`	`+}`
	`120`	`+`
`116`	`121`	`func (m elementObjectMap) Len() int { return len(m.AttributeTypes) }`
`117`	`122`
`118`	`123`	`func (m elementObjectMap) Get(key string) shim.Schema { return getSchemaMap(m, key) }`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`
`21`	`21`	`"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/internalinter"`
`22`	`22`	`shim "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim"`
	`23`	`+ "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/valueshim"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`var (`
`@@ -70,6 +71,11 @@ func newResource(r tfprotov6.Schema) resource {`
`70`	`71`	`return &resource{r, internalinter.Internal{}}`
`71`	`72`	`}`
`72`	`73`
	`74`	`+func (r resource) SchemaType() valueshim.Type {`
	`75`	`+ ty := r.r.Block.ValueType()`
	`76`	`+ return valueshim.FromTType(ty)`
	`77`	`+}`
	`78`	`+`
`73`	`79`	`func (r resource) Schema() shim.SchemaMap {`
`74`	`80`	`return blockMap{r.r.Block}`
`75`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,8 @@ func (p *provider) returnTerraformConfig() (resource.PropertyMap, error) {`
`339`	`339`	`}`
`340`	`340`	`// use valueshim package to marshal tfConfigValue into raw json,`
`341`	`341`	`// which can be unmarshaled into a map[string]interface{}`
`342`		`- configJSONMessage, err := valueshim.FromTValue(tfConfigValue).Marshal()`
	`342`	`+ value := valueshim.FromTValue(tfConfigValue)`
	`343`	`+ configJSONMessage, err := value.Marshal(value.Type())`
`343`	`344`	`if err != nil {`
`344`	`345`	`return nil, fmt.Errorf("error marshaling into raw JSON message: %v", err)`
`345`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ func insertRawStateDelta(ctx context.Context, rh *resourceHandle, pm resource.Pr`
`185`	`185`	`schemaInfos := rh.pulumiResourceInfo.GetFields()`
`186`	`186`	`v := valueshim.FromTValue(state)`
`187`	`187`
`188`		`- delta, err := tfbridge.RawStateComputeDelta(ctx, rh.schema.Shim(), schemaInfos, pm, v)`
	`188`	`+ st := valueshim.FromTType(rh.schema.Type(ctx))`
	`189`	`+ delta, err := tfbridge.RawStateComputeDelta(ctx, rh.schema.Shim(), schemaInfos, pm, st, v)`
`189`	`190`	`if err != nil {`
`190`	`191`	`return err`
`191`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1365,7 +1365,8 @@ func (p Provider) Create(ctx context.Context, req pulumirpc.CreateRequest) (*p`
`1365`	`1365`	`}`
`1366`	`1366`
`1367`	`1367`	`if p.info.RawStateDeltaEnabled() {`
`1368`		`- if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, newstate); err != nil {`
	`1368`	`+ s := res.TF.SchemaType()`
	`1369`	`+ if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, s, newstate); err != nil {`
`1369`	`1370`	`return nil, err`
`1370`	`1371`	`}`
`1371`	`1372`	`}`
`@@ -1515,7 +1516,8 @@ func (p Provider) Read(ctx context.Context, req pulumirpc.ReadRequest) (*pulum`
`1515`	`1516`	`}`
`1516`	`1517`
`1517`	`1518`	`if p.info.RawStateDeltaEnabled() {`
`1518`		`- err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, newstate)`
	`1519`	`+ s := res.TF.SchemaType()`
	`1520`	`+ err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, s, newstate)`
`1519`	`1521`	`if err != nil {`
`1520`	`1522`	`return nil, err`
`1521`	`1523`	`}`
`@@ -1744,7 +1746,8 @@ func (p Provider) Update(ctx context.Context, req pulumirpc.UpdateRequest) (*p`
`1744`	`1746`	`}`
`1745`	`1747`
`1746`	`1748`	`if p.info.RawStateDeltaEnabled() {`
`1747`		`- if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, newstate); err != nil {`
	`1749`	`+ s := res.TF.SchemaType()`
	`1750`	`+ if err := RawStateInjectDelta(ctx, res.TF.Schema(), res.Schema.Fields, props, s, newstate); err != nil {`
`1748`	`1751`	`return nil, err`
`1749`	`1752`	`}`
`1750`	`1753`	`}`