Skip to content

Refactor detailed diff v2 to short circuit on nulls and unknowns #2496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 29, 2024
Merged

Refactor detailed diff v2 to short circuit on nulls and unknowns #2496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
629a5ff
refactor detailed diff v2 to short circuit on nulls and unknowns
VenelinMartinov Oct 17, 2024
49ec2be
move type mismatch check and short-circuit logic
VenelinMartinov Oct 18, 2024
e13ae47
rename
VenelinMartinov Oct 18, 2024
e6837ce
use propertyvalue.TransformPropertyValue instead of the new visitor f…
VenelinMartinov Oct 25, 2024
05a625c
Tests for the existing behaviour with collection ForceNew
VenelinMartinov Oct 28, 2024
6b563be
Merge branch 'vvm/collection_force_new_detailed_diff_tests' into vvm/…
VenelinMartinov Oct 28, 2024
cf8bebc
re-record tests under detailed diff v2
VenelinMartinov Oct 28, 2024
03cbcb8
Merge branch 'vvm/detailed_diff_v2_unknown_collections' into vvm/refa…
VenelinMartinov Oct 28, 2024
7a26700
address review
VenelinMartinov Oct 28, 2024
5638587
handle type mismatches better and test it
VenelinMartinov Oct 29, 2024
8ea0660
handle property value outputs
VenelinMartinov Oct 29, 2024
2ca5b2c
fix unknowns in typeShapemismatched
VenelinMartinov Oct 29, 2024
83dc151
Revert "handle property value outputs"
VenelinMartinov Oct 29, 2024
749dfbb
lint
VenelinMartinov Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/tfbridge/detailed_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,15 @@ func (differ detailedDiffer) makePropDiff(
return nil
}
propType := differ.getEffectiveType(differ.propertyPathToSchemaPath(path))
if !isPresent(old) || isTypeShapeMismatched(old, propType) {

if isTypeShapeMismatched(old, propType) || isTypeShapeMismatched(new, propType) {
return differ.makePlainPropDiff(path, old, new)
}

if !isPresent(old) {
old = resource.NewNullProperty()
}
if !new.IsComputed() && (!isPresent(new) || isTypeShapeMismatched(new, propType)) {
if !new.IsComputed() && !isPresent(new) {
new = resource.NewNullProperty()
}
if old.IsNull() || new.IsNull() || new.IsComputed() {
Expand Down
113 changes: 113 additions & 0 deletions pkg/tfbridge/detailed_diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1747,3 +1747,116 @@ func TestDetailedDiffPulumiSchemaOverride(t *testing.T) {
})
})
}

func TestDetailedDiffMismatchedSchemas(t *testing.T) {
stringSchema := map[string]*schema.Schema{
"foo": {
Type: schema.TypeString,
Optional: true,
},
}

listSchema := map[string]*schema.Schema{
"foo": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
}

setSchema := map[string]*schema.Schema{
"foo": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
}

mapSchema := map[string]*schema.Schema{
"foo": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
}

stringValue := resource.NewPropertyMapFromMap(
map[string]interface{}{
"foo": "string-value",
},
)

listValue := resource.NewPropertyMapFromMap(
map[string]interface{}{
"foo": []interface{}{"list-value"},
},
)

mapValue := resource.NewPropertyMapFromMap(
map[string]interface{}{
"foo": map[string]interface{}{"bar": "map-value"},
},
)

t.Run("list schema with string value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(listSchema)
runDetailedDiffTest(t, stringValue, listValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("list schema with map value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(listSchema)
runDetailedDiffTest(t, mapValue, listValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("set schema with string value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(setSchema)
runDetailedDiffTest(t, stringValue, listValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("set schema with map value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(setSchema)
runDetailedDiffTest(t, mapValue, listValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("string schema with list value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(stringSchema)
runDetailedDiffTest(t, listValue, stringValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("string schema with map value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(stringSchema)
runDetailedDiffTest(t, mapValue, stringValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("map schema with string value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(mapSchema)
runDetailedDiffTest(t, stringValue, mapValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})

t.Run("map schema with list value", func(t *testing.T) {
tfs := shimv2.NewSchemaMap(mapSchema)
runDetailedDiffTest(t, listValue, mapValue, tfs, nil, map[string]*pulumirpc.PropertyDiff{
"foo": {Kind: pulumirpc.PropertyDiff_UPDATE},
})
})
}
Loading