Skip to content

manual Backport of Stub updates for Ent into release/1.20.x and fix DownloadExtractVerifyPlugin stub#30936

Merged
lursu merged 4 commits into
release/1.20.xfrom
backport/VAULT-34895/stub-updates/luckily-profound-mink
Jun 13, 2025
Merged

manual Backport of Stub updates for Ent into release/1.20.x and fix DownloadExtractVerifyPlugin stub#30936
lursu merged 4 commits into
release/1.20.xfrom
backport/VAULT-34895/stub-updates/luckily-profound-mink

Conversation

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

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

Backport

Manually backport the missing pieces from https://github.com/hashicorp/vault-enterprise/commit/9fe8945005b47071ab3e6b77adfb9711da375765 into release/1.20.x+ent for plugin download to work.

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@benashz
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

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


Description

What does this PR do?

Stub updates for Enterprise.

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

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app Bot commented Jun 10, 2025

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


2 out of 3 committers have signed the CLA.

  • maithyton
  • benashz
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 10, 2025

CI Results:
All Go tests succeeded! ✅

@helenfufu helenfufu requested review from helenfufu and maithyton June 10, 2025 23:08
@helenfufu helenfufu marked this pull request as ready for review June 10, 2025 23:16
@helenfufu helenfufu requested a review from a team as a code owner June 10, 2025 23:16
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 10, 2025

Build Results:
All builds succeeded! ✅

@helenfufu helenfufu changed the title Backport of Stub updates for Ent into release/1.20.x manual Backport of Stub updates for Ent into release/1.20.x and fix DownloadExtractVerifyPlugin stub Jun 11, 2025
@maithyton maithyton added this to the 1.20.0-rc2 milestone Jun 12, 2025
@maithyton maithyton added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jun 12, 2025
@lursu lursu merged commit 542417e into release/1.20.x Jun 13, 2025
193 of 236 checks passed
@lursu lursu deleted the backport/VAULT-34895/stub-updates/luckily-profound-mink branch June 13, 2025 13:28
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.

4 participants