Skip to content

Commit 063f0bc

Browse files
fix
1 parent b65ddd5 commit 063f0bc

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

pkg/pf/tests/diff_test/diff_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,4 @@ func TestPFDetailedDiffDynamicType(t *testing.T) {
206206
ResourceSchema: attributeSchema,
207207
}), map[string]cty.Value{"key": cty.NumberVal(big.NewFloat(1))}, map[string]cty.Value{"key": cty.NumberVal(big.NewFloat(1))})
208208
})
209-
210-
t.Run("type change", func(t *testing.T) {
211-
crosstests.Diff(t, pb.NewResource(pb.NewResourceArgs{
212-
ResourceSchema: attributeSchema,
213-
}), map[string]cty.Value{"key": cty.StringVal("value")}, map[string]cty.Value{"key": cty.NumberVal(big.NewFloat(1))})
214-
})
215209
}

pkg/pf/tfbridge/resource_state.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,15 +251,10 @@ func (p *provider) parseAndUpgradeResourceState(
251251
}
252252

253253
// Otherwise fallback to imprecise legacy parsing.
254-
tfType := rh.schema.Type(ctx).(tftypes.Object)
255254
value, err := convert.EncodePropertyMap(rh.encoder, props)
256255
if err != nil {
257256
return nil, fmt.Errorf("[pf/tfbridge] Error calling EncodePropertyMap: %w", err)
258257
}
259-
rawState, err := pfutils.NewRawState(tfType, value)
260-
if err != nil {
261-
return nil, fmt.Errorf("[pf/tfbridge] Error calling NewRawState: %w", err)
262-
}
263258

264259
// Before EnableRawStateDelta rollout, the behavior used to be to skip the upgrade method in case of an exact
265260
// version match. This seems incorrect, but to derisk fixing this problem it is flagged together with
@@ -272,6 +267,13 @@ func (p *provider) parseAndUpgradeResourceState(
272267
}, nil
273268
}
274269

270+
tfType := rh.schema.Type(ctx).(tftypes.Object)
271+
rawState, err := pfutils.NewRawState(tfType, value)
272+
if err != nil {
273+
return nil, fmt.Errorf("[pf/tfbridge] Error calling NewRawState: %w", err)
274+
}
275+
276+
275277
return p.upgradeResourceState(ctx, rh, rawState, parsedMeta.PrivateState, stateVersion)
276278
}
277279

0 commit comments

Comments
 (0)