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 of Fix tidy with maintain_stored_certificate_counts == publish_stored_certificate_count_metrics == false into release/1.13.x #20679

Conversation

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

Backport

This PR is auto-generated from #20664 to be assessed for backporting due to the inclusion of the label backport/1.13.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:
@cipherboy
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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.


The logic around the check to set both to false was wrong, and should be validated independently.

Additionally, these fields should only exist on auto-tidy and not on the manual tidy endpoint.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/cipherboy-fix-bug-setting-both-fields-false/thoroughly-capable-gazelle branch 2 times, most recently from 0d23907 to 6b99ca7 Compare May 19, 2023 12:10
@hashicorp-cla
Copy link

hashicorp-cla commented May 19, 2023

CLA assistant check
All committers have signed the CLA.

@cipherboy cipherboy self-assigned this May 19, 2023
Fix tidy with maintain_stored_certificate_counts == publish_stored_certificate_count_metrics == false (#20664)

* Fix tidy with maintain_stored_certificate_counts == publish_stored_certificate_count_metrics == false

The logic around the check to set both to false was wrong, and should
be validated independently.

Additionally, these fields should only exist on auto-tidy and not on the
manual tidy endpoint.

Signed-off-by: Alexander Scheel <[email protected]>

* Update builtin/logical/pki/path_tidy.go

Co-authored-by: claire bontempo <[email protected]>

---------

Signed-off-by: Alexander Scheel <[email protected]>
Co-authored-by: claire bontempo <[email protected]>

Signed-off-by: Alexander Scheel <[email protected]>
@cipherboy cipherboy force-pushed the backport/cipherboy-fix-bug-setting-both-fields-false/thoroughly-capable-gazelle branch from fa6ca7b to ec26e22 Compare May 19, 2023 19:37
@cipherboy cipherboy marked this pull request as ready for review May 19, 2023 19:37
@cipherboy cipherboy requested a review from a team May 19, 2023 19:37
@cipherboy cipherboy enabled auto-merge (squash) May 19, 2023 19:38
@cipherboy
Copy link
Contributor

See note here: #18186; closing. If we later revisit that PR to backport it to 1.13 and 1.12, we'll need to finish these backports as well.

@cipherboy cipherboy closed this May 22, 2023
auto-merge was automatically disabled May 22, 2023 14:40

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants