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

Undo additions to the barrier encryption count if persisting those encryptions fails #29506

Merged
merged 2 commits into from
Feb 5, 2025

Conversation

sgmiller
Copy link
Collaborator

@sgmiller sgmiller commented Feb 5, 2025

Fixes VAULT-33823

Description

What does this PR do?

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.

@sgmiller sgmiller requested a review from a team as a code owner February 5, 2025 17:21
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Feb 5, 2025
@sgmiller sgmiller requested a review from a team as a code owner February 5, 2025 17:22
@sgmiller sgmiller requested a review from swayne275 February 5, 2025 17:22
Copy link

github-actions bot commented Feb 5, 2025

CI Results:
All required Go tests succeeded but failures were detected ⚠️
Failures:

Test Type Package Test Logs
race plugins/database/cassandra TestSelfSignedCA view test results

@sgmiller sgmiller added backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/1.18.x backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent labels Feb 5, 2025
Copy link

github-actions bot commented Feb 5, 2025

Build Results:
All builds succeeded! ✅

@sgmiller sgmiller added this to the 1.19.0-rc milestone Feb 5, 2025
@sgmiller sgmiller merged commit 0a2049c into main Feb 5, 2025
101 of 108 checks passed
@sgmiller sgmiller deleted the sgm/enc-count-amplification/vault-33823 branch February 5, 2025 19:22
@sgmiller sgmiller added backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent and removed backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent labels Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent backport/1.18.x 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