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.

Sign up for GitHub

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

Jump to bottom

Redo reverted 1.17.4 prep changes #28221

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Redo reverted 1.17.4 prep changes #28221

merged 2 commits into from
Aug 29, 2024

Conversation

ryancragun
Copy link
Collaborator

Description

Redo the changes that were reverted in #28220 for the 1.17.4 release

TODO only if you're a HashiCorp employee

  • Backport Labels: If this PR is in the ENT repo and needs to be backported, backport
    to N, N-1, and N-2, using the backport/ent/x.x.x+ent labels. If this PR is in the CE repo, you should only backport to N, using the backport/x.x.x label, not the enterprise labels.
    • 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.

@hc-github-team-secure-vault-core @VioletHynes @ryancragun
backport of commit a5262e0 (#28210)
01b096a 
Co-authored-by: Violet Hynes <[email protected]>
@hashishaw @ryancragun
UI: remove renew self call after login (#28204) (#28211)
774515f 
* check for renewAfterEpoch before comparing it

* add test coverage for regression

* add comment. Fixes VAULT-4630

* throw error

* add changelog
@ryancragun ryancragun requested review from a team as code owners August 29, 2024 16:00
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Aug 29, 2024
@ryancragun ryancragun changed the title Ryan/unrevert 1.17.4 prep Redo reverted 1.17.4 prep changes Aug 29, 2024
hashishaw
hashishaw approved these changes Aug 29, 2024
View reviewed changes
Copy link
Contributor

@hashishaw hashishaw left a comment

Choose a reason for hiding this comment

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

Thank you!

VioletHynes
VioletHynes approved these changes Aug 29, 2024
View reviewed changes
Copy link
Contributor

@VioletHynes VioletHynes left a comment

Choose a reason for hiding this comment

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

Is there a reason we're not reverting https://github.com/hashicorp/vault/pull/28220/files#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557 ? I think the answer is yes, but I wanted to draw attention to it. Otherwise, looks good :)

@ryancragun
Copy link
Collaborator Author

Yup, that was the fix that we needed in 1.17.x to get the release out the door

@github-actions GitHub Actions
Copy link

Build Results:
All builds succeeded! ✅

@github-actions GitHub Actions
Copy link

CI Results:
All Go tests succeeded! ✅

@ryancragun ryancragun merged commit 0cf0ad7 into release/1.17.x Aug 29, 2024
78 of 79 checks passed
@ryancragun ryancragun deleted the ryan/unrevert-1.17.4-prep branch August 29, 2024 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hashishaw hashishaw hashishaw approved these changes

@VioletHynes VioletHynes VioletHynes approved these changes

Assignees
No one assigned
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-milestone
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ryancragun @VioletHynes @hashishaw @hc-github-team-secure-vault-core