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

Show Current Month When Future Month Start Date is Provided #28042

Merged
merged 3 commits into from
Aug 9, 2024

Conversation

divyaac
Copy link
Contributor

@divyaac divyaac commented Aug 9, 2024

Description

ENT PR :
https://github.com/hashicorp/vault-enterprise/pull/6427

Adjusts the query response to include current month data when endTime = future date. Once this is approved, I will make a subsequent CE PR.

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.

@divyaac divyaac requested a review from VioletHynes August 9, 2024 18:44
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Aug 9, 2024
@divyaac divyaac added this to the 1.18.0-rc milestone Aug 9, 2024
@VioletHynes
Copy link
Contributor

We should add a changelog for this :)

Copy link

github-actions bot commented Aug 9, 2024

CI Results:
All Go tests succeeded! ✅

Copy link

github-actions bot commented Aug 9, 2024

Build Results:
All builds succeeded! ✅

@divyaac divyaac added backport/ent/1.15.x+ent backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent labels Aug 9, 2024
@@ -0,0 +1,3 @@
```release-note:bug
activity: The sys/internal/counters/activity endpoint will return current month data when the start_date parameter is set to a future date.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
activity: The sys/internal/counters/activity endpoint will return current month data when the start_date parameter is set to a future date.
activity: Fixed issue where sys/internal/counters/activity endpoint would not return current month data when the end_date parameter is set to a future date.

Copy link
Contributor

Choose a reason for hiding this comment

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

Some of this is subjective wording, but it should be end_date, not start_date. Feel free to take just the end_date fix

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.

Looks good! The only thing we should definitely change before merging is the typo of start_date to end_date in the changelog (suggestion given for easy application to PR)

Thanks for the quick fix on this, and the awesome coverage!

@divyaac divyaac enabled auto-merge (squash) August 9, 2024 19:24
@divyaac divyaac merged commit ad6871e into main Aug 9, 2024
83 checks passed
@divyaac divyaac deleted the VAULT-29491_Current_Month_Not_Showing branch August 9, 2024 19:41
miagilepner pushed a commit that referenced this pull request Aug 15, 2024
* Show current month data

* Added changelog

* Edited changelog
miagilepner added a commit that referenced this pull request Aug 15, 2024
* Handle Query Updates (#27547)

* Simplify handle query to return updated estimation values

* Added changelog

* remove comment

* Revert "Simplify handle query to return updated estimation values"

This reverts commit b67969c.

* temp

* Revert "temp"

This reverts commit 4932979.

* CE files handle query update

* Revert "CE files handle query update"

This reverts commit 8dafa2d.

* CE Changes

* Delete vault/external_tests/upgrade_testing/upgrade_testing_binary/upgrade_test.go

* Sort namespaces, mounts, and clients before adding them to HLL (#28062)

* sort namespaces and mounts before adding them

* also sort clients

* add comments

* pr comment fixes

* changelog

* changelog update

* cleanup after handlequery changes (#27776)

* Show Current Month When Future Month Start Date is Provided (#28042)

* Show current month data

* Added changelog

* Edited changelog

* Client Count Docs Updates/Cleanup (#27862)

* Docs changes

* More condensation of docs

* Added some clarity on date ranges

* Edited wording'

* Added estimation client count info

* Update website/content/api-docs/system/internal-counters.mdx

Co-authored-by: miagilepner <[email protected]>

---------

Co-authored-by: miagilepner <[email protected]>

---------

Co-authored-by: divyaac <[email protected]>
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 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