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.

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

Backport pr 12747 1.6 #12838

Merged
merged 2 commits into from Oct 14, 2021
Merged

Backport pr 12747 1.6 #12838

merged 2 commits into from Oct 14, 2021

Conversation

pmmukh
Copy link
Contributor

@pmmukh pmmukh commented Oct 14, 2021

  • Backport PR for VAULT-3252 Disallow alias creation if entity/accessor combination exists [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.
  • Another change is that the identity website page lives in a separate place in 1.6, so made a separate commit to update that 14ada3d

pmmukh and others added 2 commits October 14, 2021 11:39
…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
@vercel
Copy link

vercel bot commented Oct 14, 2021

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

vault – ./website

🔍 Inspect: https://vercel.com/hashicorp/vault/HZXK8sWaamEDRGf8iBYDFtkJhBta
✅ Preview: https://vault-git-backport-pr-12747-16-hashicorp.vercel.app

vault-storybook – ./ui

🔍 Inspect: https://vercel.com/hashicorp/vault-storybook/FKdChqsw5TsCkQzr9jeKgw89nVjn
✅ Preview: Canceled

@pmmukh pmmukh requested review from ncabatoff, vishalnayak and a team October 14, 2021 18:45
@pmmukh pmmukh merged commit b01189a into release/1.6.x Oct 14, 2021
@pmmukh pmmukh deleted the backport-pr-12747-1.6 branch October 14, 2021 19:10
@pmmukh pmmukh added this to the 1.6.8 milestone Oct 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants