bug: data conflict between branches is not being detected

[wvandeun]

Component

API Server / GraphQL

Infrahub version

1.0.0.dev.0

Current Behavior

Data conflicts between branches don't always seem to be properly detected. This leads to situations where we can rebase branch with a data conflict or even that we can merge them when we should not be able to.

Expected Behavior

Data conflicts are properly reported and the user is given an option to resolve them. As long as there is a conflict, we should not be able to merge or rebase a branch

Steps to Reproduce

• load an instance of Infrahub
• create a branch
• in the branch create a BuiltinTag node with name orange
• switch to the main branch
• in the branch create a BuiltinTag node with name orange
• open a proposed change for the earlier created branch
• generate the data diff, no conflict will be detected, there should be a conflict because we create an object with the same name, breaking the uniqueness constraint on a "BuiltinTag"
• The data integrity check will report a data conflict
• Rebase the branch (this should not be possible because of the conflict)
• Merge the proposed change (this should not be possible)

Additional Information

No response

[exalate-issue-sync]

[From ajtmccarty]

after investigating this some more I found that we do correctly identify uniqueness constraint violations within the proposed change pipeline as part of the schema integrity checks. we don’t know why these checks failed to run for Wim during his testing

however, there are still outstanding problems documented in this issue. we allow rebasing and merging a branch that has uniqueness violations or data conflicts, which will cause the database to contain unexpected data. before rebasing or merging a branch, we need to check for uniqueness constraint violations and data conflicts and raise an error if either exists