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 1.17.x auto rolling #27880

Merged
merged 3 commits into from
Jul 26, 2024
Merged

Conversation

mpalmi
Copy link
Contributor

@mpalmi mpalmi commented Jul 26, 2024

Description

This PR contains all of the CE backports for the auto-rolling billing start date.

Enterprise PR: https://github.com/hashicorp/vault-enterprise/pull/6279
Addresses: VAULT-28005

TODO only if you're a HashiCorp employee

  • Labels: If this PR is the CE portion of an ENT change, and that ENT change is
    getting backported to N-2, use the new style backport/ent/x.x.x+ent labels
    instead of the old style backport/x.x.x labels.
  • Labels: If this PR is a CE only change, it can only be backported to N, so use
    the normal backport/x.x.x label (there should be only 1).
  • 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.

mpalmi and others added 3 commits July 26, 2024 14:44
This PR adds the CE plumbing and stubs for forcing agent instantiation
whenever the Vault license changes.

Resolves: VAULT-28583
Enterprise PR: hashicorp/vault-enterprise#6168

(cherry picked from commit 3229cf1)
* add NormalizeToYear function and test

* add ent changelog

* test name typo

(cherry picked from commit 01f78f5)
@mpalmi mpalmi added this to the 1.17.3 milestone Jul 26, 2024
@mpalmi mpalmi requested a review from akshya96 July 26, 2024 19:10
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 26, 2024
Copy link

Build Results:
All builds succeeded! ✅

Copy link

CI Results:
All Go tests succeeded! ✅

Copy link
Contributor

@akshya96 akshya96 left a comment

Choose a reason for hiding this comment

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

LGTM!

@mpalmi mpalmi merged commit 2bbfc49 into release/1.17.x Jul 26, 2024
77 checks passed
@mpalmi mpalmi deleted the backport/1.17.x/auto-rolling branch July 26, 2024 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants