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

VAULT-28329: Fix months activity log counts when querying for a namespace #27790

Merged
merged 3 commits into from
Jul 22, 2024

Conversation

miagilepner
Copy link
Contributor

@miagilepner miagilepner commented Jul 16, 2024

Description

Previously, when you queried the activity log from a namespace you would get the following responses:

{
  "by_namespace": [{...}], // filtered by the request namespace
  "months": [{
    "counts": {...}, // NOT filtered
    "namespaces": [{...}], // filtered by the request namespace
    "new_clients": {
      "counts: {...}, // NOT filtered
      "namespaces": [{...}], // filtered by the request namespace
    }
  }],
  "total": {...} // filtered by the request namespace
}

This was very confusing, and also makes the UI a bad experience if you try to look at only one namespace.

This PR fixes this for the /activity and /activity/monthly endpoints.

Ent PR: https://github.com/hashicorp/vault-enterprise/pull/6260

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.

@miagilepner miagilepner added this to the 1.18.0-rc milestone Jul 16, 2024
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jul 16, 2024
Copy link

github-actions bot commented Jul 16, 2024

CI Results:
All Go tests succeeded! ✅

Copy link

github-actions bot commented Jul 16, 2024

Build Results:
All builds succeeded! ✅

@@ -0,0 +1,3 @@
```release-note:improvement
Copy link
Contributor

Choose a reason for hiding this comment

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

While I agree that this fixes buggy behaviour, this is, strictly speaking, an API behaviour change -- so maybe this should be a change instead of an improvement?

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree with this. The current output is inconsistent but it is always possible that someone has become dependent on the existing behavior.

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.

Approved! I do think this should be a change but I don't feel strongly enough to block the PR. Awesome fix!

@@ -0,0 +1,3 @@
```release-note:improvement
Copy link
Contributor

Choose a reason for hiding this comment

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

I agree with this. The current output is inconsistent but it is always possible that someone has become dependent on the existing behavior.

Copy link
Contributor

@divyaac divyaac 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! You can probably push this because my only comments were involving the tests in the ENT pr!

@miagilepner miagilepner enabled auto-merge (squash) July 22, 2024 08:43
@miagilepner miagilepner merged commit 4b8ecf5 into main Jul 22, 2024
83 checks passed
@miagilepner miagilepner deleted the miagilepner/namespace-query-counts branch July 22, 2024 09:01
Monkeychip pushed a commit that referenced this pull request Jul 24, 2024
…espace (#27790)

* start implementation and testing

* changelog

* switch changelog description to change
Monkeychip pushed a commit that referenced this pull request Jul 24, 2024
…espace (#27790)

* start implementation and testing

* changelog

* switch changelog description to change
@miagilepner miagilepner added backport/ent/1.15.x+ent Changes are backported to 1.15.x+ent backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/1.17.x labels Aug 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/ent/1.15.x+ent Changes are backported to 1.15.x+ent backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/1.17.x 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.

4 participants