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

[backport -> release/3.6.x] fix(vault): use global query when finding a vault by prefix #12576

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

team-gateway-bot
Copy link
Collaborator

Automated backport to release/3.6.x, triggered by a label in #12572.

Original description

Summary

In FTI-5762 it was reported that there is a problem with secret rotation when vaults are stored inside a workspace. This commit will fix it by passing workspace = null aka making a call a global call which will not then use the possibly incorrect workspace (default) to find vault entity (the vault config). The vault entity prefix is unique across workspaces.

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix FTI-5762

### Summary

In FTI-5762 it was reported that there is a problem with secret rotation when vaults are stored
inside a workspace. This commit will fix it by passing `workspace = null` aka making a call
a global call which will not then use the possibly incorrect workspace (default) to find vault
entity (the vault config). The vault entity prefix is unique across workspaces.

Signed-off-by: Aapo Talvensaari <[email protected]>
(cherry picked from commit 2fb898d)
@bungle bungle merged commit f6868a8 into release/3.6.x Mar 13, 2024
39 checks passed
@bungle bungle deleted the backport-12572-to-release/3.6.x branch March 13, 2024 14:07
@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x: couldn't find remote ref release/3.6.x.
Please ensure that this Github repo has a branch named release/3.6.x.

@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x, because it was unable to create a new branch.

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream release/3.6.x
git worktree add -d .worktree/cherry-pick-12576-to-release/3.6.x-to-upstream upstream/release/3.6.x
cd .worktree/cherry-pick-12576-to-release/3.6.x-to-upstream
git checkout -b cherry-pick-12576-to-release/3.6.x-to-upstream
ancref=$(git merge-base 510b137268703dece7d0f1a00a439375d2ff9311 cdb1a4b463516e226bc37b697fa6fa7a4ff24363)
git cherry-pick -x $ancref..cdb1a4b463516e226bc37b697fa6fa7a4ff24363

@AndyZhang0707 AndyZhang0707 removed the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Apr 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants