Skip to content

Conversation

mpalmi
Copy link
Contributor

@mpalmi mpalmi commented Apr 25, 2025

Description

This PR introduces the logic to handle local alias conflicts on Perf
Secondaries. Rather than follow the merge and persist behavior we use
for non-local aliases, we instead delete the duplicate from its parent
entity and remove the parent entity from the local alias packer.

This decision is a compromise, which will prevent complex distributed
state problems which would otherwise result in non-deterministic
behavior when there are local alias conflicts.

Enterprise PR: https://github.com/hashicorp/vault-enterprise/pull/7770
Resolves: VAULT-33671

TODO only if you're a HashiCorp employee

  • Backport Labels: If this fix needs to be backported, use the appropriate backport/ label that matches the desired release branch. Note that in the CE repo, the latest release branch will look like backport/x.x.x, but older release branches will be backport/ent/x.x.x+ent.
    • LTS: If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

mpalmi added 2 commits April 25, 2025 11:54
This PR introduces the logic to handle local alias conflicts on Perf
Secondaries. Rather than follow the merge and persist behavior we use
for non-local aliases, we instead delete the duplicate from its parent
entity and remove the parent entity from the local alias packer.

This decision is a compromise, which will prevent complex distributed
state problems, resulting in non-deterministic behavior when there are
local alias conflicts.
@mpalmi mpalmi added this to the 1.19.3 milestone Apr 25, 2025
@mpalmi mpalmi requested a review from biazmoreira April 25, 2025 16:04
@mpalmi mpalmi requested a review from a team as a code owner April 25, 2025 16:04
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Apr 25, 2025
Copy link

github-actions bot commented Apr 25, 2025

CI Results:
All Go tests succeeded! ✅

Copy link

github-actions bot commented Apr 25, 2025

Build Results:
All builds succeeded! ✅

@mpalmi mpalmi merged commit bbe458d into main Apr 28, 2025
92 checks passed
@mpalmi mpalmi deleted the identity/localalias-bugfix branch April 28, 2025 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants