Skip to content
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

Jump to bottom

[VAULT-3252] Disallow alias creation if entity/accessor combination e… #12836

Merged
merged 1 commit into from Oct 14, 2021
Merged

[VAULT-3252] Disallow alias creation if entity/accessor combination e… #12836

merged 1 commit into from Oct 14, 2021

Conversation

pmmukh
Copy link
Contributor

@pmmukh pmmukh commented Oct 14, 2021 •
edited

  • Backport PR for [VAULT-3252] Disallow alias creation if entity/accessor combination exists #12747
  • Some differences exist between the changes there and here, due to some other identity changes that haven't been backported. The mergeEntity code uses i.core vs i.localNode, fromEntityIDs versus sanitizedFromEntityIDs, and does not use fromEntityGroups. The missing sanitizedFromEntityIDs is the only one relevant to the actual lines changes.

@pmmukh
[VAULT-3252] Disallow alias creation if entity/accessor combination e…
0a1e99d 
…xists (#12747)

* Disallow alias creation if entity/accessor combination exists

* Add changelog

* Address review comments

* Add handling to aliasUpdate, some field renaming

* Update tests to work under new entity-alias constraint

* Add check to entity merge, other review fixes

* Log duplicated accessors only once

* Fix flaky test

* Add note about new constraint to docs

* Update entity merge warn log
@pmmukh pmmukh requested review from ncabatoff, vishalnayak and a team October 14, 2021 18:20
@ncabatoff ncabatoff added this to the 1.8.5 milestone Oct 14, 2021
@pmmukh pmmukh merged commit 5fbc168 into release/1.8.x Oct 14, 2021
@pmmukh pmmukh deleted the backport-pr-12747-1.8 branch October 14, 2021 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vishalnayak vishalnayak vishalnayak approved these changes

@ncabatoff ncabatoff ncabatoff approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.8.5
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@pmmukh @vishalnayak @ncabatoff