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

(OSS Port) Restrict Quota Deletion to Primary Cluster [vault-2399] #12339

Merged
merged 5 commits into from Aug 17, 2021

Conversation

HridoyRoy
Copy link
Contributor

@HridoyRoy HridoyRoy commented Aug 17, 2021

Ent testing: https://github.com/hashicorp/vault-enterprise/pull/2051/files

Description: This PR restricts quota deletion when an auth backend is removed to the primary cluster only. The PR above has a test that verifies the bug with quota deletion does not occur when secrets backends are deleted. We do not need to check if the cluster is a DR cluster, as DR clusters cannot utilize the quota deletion path or disable auth paths. Therefore, the bug doesn't show up in those areas.

vault/quotas/quotas.go Outdated Show resolved Hide resolved
Copy link
Member

@vishalnayak vishalnayak left a comment

Choose a reason for hiding this comment

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

One minor suggestion. Otherwise, LGTM!

Co-authored-by: Vishal Nayak <vishalnayak@users.noreply.github.com>
@vercel vercel bot temporarily deployed to Preview – vault August 17, 2021 17:52 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook August 17, 2021 17:52 Inactive
@vercel vercel bot temporarily deployed to Preview – vault August 17, 2021 21:36 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook August 17, 2021 21:36 Inactive
@HridoyRoy HridoyRoy merged commit 032aa5d into main Aug 17, 2021
@HridoyRoy HridoyRoy deleted the vault-2399 branch August 17, 2021 22:34
@HridoyRoy HridoyRoy modified the milestone: 1.9 Sep 1, 2021
@HridoyRoy HridoyRoy added this to the 1.6.7 milestone Sep 1, 2021
jartek pushed a commit to jartek/vault that referenced this pull request Sep 11, 2021
…ashicorp#12339)

* oss part of vault 2399

* Update vault/quotas/quotas.go

Co-authored-by: Vishal Nayak <vishalnayak@users.noreply.github.com>

* use OSS PR number as changelog entry as indicated by the changelog guide

Co-authored-by: Vishal Nayak <vishalnayak@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants