Skip to content

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core commented Jun 5, 2025

Backport

This PR is auto-generated from #30794 to be assessed for backporting due to the inclusion of the label backport/1.19.x.

Ent PR: https://github.com/hashicorp/vault-enterprise/pull/8226

The below text is copied from the body of the original PR.


Description

This PR adds a nonce for rekey cancellations
Enterprise PR: https://github.com/hashicorp/vault-enterprise/pull/8169

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.

Overview of commits

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jun 5, 2025
* require nonce for rekey

* update doc

* add changelog

* Apply suggestions from code review

Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com>

---------

Co-authored-by: Sarah Chavis <62406755+schavis@users.noreply.github.com>
@miagilepner miagilepner force-pushed the backport/miagilepner/VAULT-36229-recovery-rekey-cancel/definitely-nice-filly branch from 46cf3a0 to 69f82d8 Compare June 6, 2025 11:26
@miagilepner miagilepner marked this pull request as ready for review June 6, 2025 11:28
@miagilepner miagilepner requested review from a team as code owners June 6, 2025 11:28
@miagilepner miagilepner added this to the 1.19.6 milestone Jun 6, 2025
Copy link

github-actions bot commented Jun 6, 2025

Build Results:
All builds succeeded! ✅

Copy link

github-actions bot commented Jun 6, 2025

CI Results:
All Go tests succeeded! ✅

@miagilepner miagilepner merged commit c1fc9f1 into release/1.19.x Jun 9, 2025
96 of 97 checks passed
@miagilepner miagilepner deleted the backport/miagilepner/VAULT-36229-recovery-rekey-cancel/definitely-nice-filly branch June 9, 2025 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants