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

Fix return certificate expiry time from NearExpiration #29128

Merged
merged 3 commits into from
Dec 9, 2024

Conversation

stevendpclark
Copy link
Contributor

@stevendpclark stevendpclark commented Dec 9, 2024

Description

  • The duration returned from the NearExpiration is supposed to represent the time till expiry from now and not the calculated time a month from now.
  • Also flip the returned value to be a duration value that can be added to time.Now() to get to the expiration value, instead of a negative value that was previously returned.

VAULT-32988

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.

 - The duration returned from the NearExpiration is supposed to
   represent the time till expiry from now and not the calculated
   time a month from now.
@stevendpclark stevendpclark added pr/no-milestone backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/1.18.x backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent labels Dec 9, 2024
@stevendpclark stevendpclark self-assigned this Dec 9, 2024
@stevendpclark stevendpclark requested a review from a team as a code owner December 9, 2024 17:39
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Dec 9, 2024
Copy link

github-actions bot commented Dec 9, 2024

CI Results:
All Go tests succeeded! ✅

Copy link

github-actions bot commented Dec 9, 2024

Build Results:
All builds succeeded! ✅

victorr
victorr previously approved these changes Dec 9, 2024
Copy link
Contributor

@victorr victorr left a comment

Choose a reason for hiding this comment

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

All good! 💯

vault/diagnose/tls_verification.go Outdated Show resolved Hide resolved
Copy link
Contributor

@victorr victorr left a comment

Choose a reason for hiding this comment

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

👍

@stevendpclark stevendpclark enabled auto-merge (squash) December 9, 2024 18:36
@stevendpclark stevendpclark merged commit 56fa43f into main Dec 9, 2024
92 checks passed
@stevendpclark stevendpclark deleted the stevendpclark/fix-near-expiration branch December 9, 2024 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent backport/1.18.x hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants