VAULT-34674 #30164
Merged
VAULT-34674 #30164
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CI Results: |
|
Build Results: |
… of github.com:hashicorp/vault into aslamovamir-vault-34674-counters-by-billing-period-oss
akshya96
reviewed
Apr 14, 2025
akshya96
reviewed
Apr 14, 2025
akshya96
reviewed
Apr 14, 2025
@akshya96 Thanks for the review! I reverted go mod changes and removed the oss patch file |
divyaac
approved these changes
Apr 14, 2025
divyaac
requested changes
Apr 14, 2025
Added the changelog entree for CE, let me know if we need to add the ENT changelog here too? |
divyaac
approved these changes
Apr 14, 2025
divyaac
approved these changes
Apr 14, 2025
Erfankam
pushed a commit
to Erfankam/vault
that referenced
this pull request
Sep 1, 2025
* apply oss changes * comment fix * fix TestOperatorUsageCommandRun by defining billing start via license * update go mod * revert the changes in operator usage test * fix operator usage test * fix acme regeneration tests * revert the changes for activity testonly test * fix activity testonly tests * seperate tests into ce and ent * move 2 more tests to oss and ent * remove left over test from common * updates after feedback * updates * added unit tests to tests oss get start and end time function * bring updates from ent * carry over updates from ent pr * fix the wording in ce warning * add a dot to ent warning * update comment * revert go mod and go sum changes, remove the unintended oss changes patch * add changelog entree for ce
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
What does this PR do?
This api endpoint will be updated to only show client counts for an entire billing period. By default, it will return the activity information of the current billing period.
The start_time and end_time parameters will still be available but can only be used to specify the beginning or end of a billing period, not specific dates within/outside a billing period. If specified, The counters API will return data for the billing period corresponding to the specified start time, meaning the start time of the query will be aligned with the start of the billing period to which it belongs, regardless of the exact date provided by the user. If only end_time is specified, the query will be aligned with the start of the billing period to which the end_time belongs to.
On CE, the counters api will be able to return results for any time-ranges except for the current month. What this means is that, by default, the counters api returns results until the end of last month. If current month is specified as the end_time, data is only returned until the last month with a warning end_time parameter can only be used to specify until the end of last month. The value provided for this parameter is not supported and is ignored. Showing counts until the end of last month.
Associated ENT PR: https://github.com/hashicorp/vault-enterprise/pull/7704
TODO only if you're a HashiCorp employee
backport/label that matches the desired release branch. Note that in the CE repo, the latest release branch will look likebackport/x.x.x, but older release branches will bebackport/ent/x.x.x+ent.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.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.