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

Add auto-roll billing start date changes CE changes #27656

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Conversation

akshya96
Copy link
Contributor

@akshya96 akshya96 commented Jul 1, 2024

Description

What does this PR do?
Adding CE changes for ENT PR https://github.com/hashicorp/vault-enterprise/pull/5681/files that auto-rolls billing start date.
JIRA: https://hashicorp.atlassian.net/browse/VAULT-24059

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.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 1, 2024
@akshya96 akshya96 requested a review from mpalmi July 1, 2024 22:30
Copy link

github-actions bot commented Jul 1, 2024

CI Results:
All Go tests succeeded! ✅

Copy link

github-actions bot commented Jul 1, 2024

Build Results:
All builds succeeded! ✅

@akshya96 akshya96 requested review from miagilepner and ccapurso July 1, 2024 22:34
Copy link
Contributor

@mpalmi mpalmi left a comment

Choose a reason for hiding this comment

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

I think this looks good, but don't we need the API changes as well? (edit: nevermind, looks like we no longer have those changes!)

Copy link
Contributor

@miagilepner miagilepner left a comment

Choose a reason for hiding this comment

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

LGTM!

@akshya96
Copy link
Contributor Author

akshya96 commented Jul 2, 2024

I think this looks good, but don't we need the API changes as well?

I reverted those changes on the ent PR we can use core.BillingStart now https://github.com/hashicorp/vault-enterprise/pull/5681/commits/9ddebd4e20a57068663fed5960c4067ebc9d1579 as we can use core.BillingStart()

@akshya96 akshya96 merged commit 01f78f5 into main Jul 2, 2024
83 checks passed
@akshya96 akshya96 deleted the vault-24059-ce branch July 2, 2024 17:59
mpalmi pushed a commit that referenced this pull request Jul 26, 2024
* add NormalizeToYear function and test

* add ent changelog

* test name typo

(cherry picked from commit 01f78f5)
mpalmi added a commit that referenced this pull request Jul 26, 2024
* Prepare CE changes for [census.Agent] SetMetadata (#27577)

(cherry picked from commit 93682b0)

* Add CE plumbing for CensusManager reload (#27664)

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 auto-roll billing start date changes CE changes (#27656)

* add NormalizeToYear function and test

* add ent changelog

* test name typo

(cherry picked from commit 01f78f5)

---------

Co-authored-by: akshya96 <[email protected]>
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 pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants