Skip to content

Backport of CE changes for plugin download into release/1.20.x#30929

Merged
lursu merged 2 commits into
release/1.20.xfrom
backport/VAULT-34895/import-secure-plugin-api/basically-adequate-gobbler
Jun 10, 2025
Merged

Backport of CE changes for plugin download into release/1.20.x#30929
lursu merged 2 commits into
release/1.20.xfrom
backport/VAULT-34895/import-secure-plugin-api/basically-adequate-gobbler

Conversation

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

Backport

This PR is auto-generated from #30927 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:
@lursu
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

This PR follows the How To Merge PRs Containing CE + Ent Changes guide to generate the subset of CE changes from https://github.com/hashicorp/vault-enterprise/pull/8193.

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


1 out of 2 committers have signed the CLA.

  • helenfufu
  • 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 github-actions Bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jun 10, 2025
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 10, 2025

CI Results:
All Go tests succeeded! ✅

---------

Co-authored-by: Ben Ash <bash@hashicorp.com>
@helenfufu helenfufu marked this pull request as ready for review June 10, 2025 18:56
@helenfufu helenfufu requested review from a team as code owners June 10, 2025 18:56
@helenfufu helenfufu requested review from benashz and maithyton June 10, 2025 18:56
@helenfufu helenfufu added this to the 1.20.0-rc milestone Jun 10, 2025
Copy link
Copy Markdown
Contributor

@maithyton maithyton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@helenfufu helenfufu enabled auto-merge (squash) June 10, 2025 18:59
@github-actions
Copy link
Copy Markdown

Build Results:
All builds succeeded! ✅

@lursu lursu disabled auto-merge June 10, 2025 19:22
@lursu lursu merged commit fa6e45c into release/1.20.x Jun 10, 2025
99 of 112 checks passed
@lursu lursu deleted the backport/VAULT-34895/import-secure-plugin-api/basically-adequate-gobbler branch June 10, 2025 19:22
@helenfufu helenfufu mentioned this pull request Jun 10, 2025
6 tasks
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