Skip to content

crdupgradesafety: CalculateFlatSchemaDiff should ignore child items #1054

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

crdupgradesafety: CalculateFlatSchemaDiff should ignore child items #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/kapp/crdupgradesafety/change_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,8 @@ func CalculateFlatSchemaDiff(o, n FlatSchema) (map[string]FieldDiff, error) {
// we should still detect changes in the children fields.
oldCopy := schema.DeepCopy()
newCopy := newSchema.DeepCopy()
oldCopy.Properties = nil
newCopy.Properties = nil
oldCopy.Properties, oldCopy.Items = nil, nil
newCopy.Properties, newCopy.Items = nil, nil
if !reflect.DeepEqual(oldCopy, newCopy) {
diffMap[field] = FieldDiff{
Old: oldCopy,
Expand Down
18 changes: 18 additions & 0 deletions pkg/kapp/crdupgradesafety/change_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,24 @@ func TestCalculateFlatSchemaDiff(t *testing.T) {
},
expectedDiff: map[string]crdupgradesafety.FieldDiff{},
},
{
name: "diff in child items only, no diff returned, no error",
old: crdupgradesafety.FlatSchema{
"foo": &v1.JSONSchemaProps{
Items: &v1.JSONSchemaPropsOrArray{Schema: &v1.JSONSchemaProps{
ID: "bar",
}},
},
},
new: crdupgradesafety.FlatSchema{
"foo": &v1.JSONSchemaProps{
Items: &v1.JSONSchemaPropsOrArray{Schema: &v1.JSONSchemaProps{
ID: "baz",
}},
},
},
expectedDiff: map[string]crdupgradesafety.FieldDiff{},
},
{
name: "field exists in old but not new, no diff returned, error",
old: crdupgradesafety.FlatSchema{
Expand Down
Loading