scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 11:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* start implementation and testing

* changelog

* switch changelog description to change
This commit is contained in:
miagilepner
2024-07-22 11:01:14 +02:00
committed by GitHub
parent 6d4cb5e49a
commit 4b8ecf5e05
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/27790.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:change
activity (enterprise): filter all fields in client count responses by the request namespace
```

31
vault/activity_log.go
View File

@@ -2779,11 +2779,11 @@ func (a *ActivityLog) prepareMonthsResponseForQuery(ctx context.Context, byMonth
for _, monthsRecord := range byMonth { for _, monthsRecord := range byMonth {
newClientsResponse := &ResponseNewClients{} newClientsResponse := &ResponseNewClients{}
if monthsRecord.NewClients.Counts.HasCounts() { if monthsRecord.NewClients.Counts.HasCounts() {
newClientsNSResponse, err := a.prepareNamespaceResponse(ctx, monthsRecord.NewClients.Namespaces) newClientsTotal, newClientsNSResponse, err := a.prepareNamespaceResponse(ctx, monthsRecord.NewClients.Namespaces)
if err != nil { if err != nil {
return nil, err return nil, err
} }
newClientsResponse.Counts = a.countsRecordToCountsResponse(monthsRecord.NewClients.Counts, false) newClientsResponse.Counts = newClientsTotal
newClientsResponse.Namespaces = newClientsNSResponse newClientsResponse.Namespaces = newClientsNSResponse
} }
@@ -2791,11 +2791,11 @@ func (a *ActivityLog) prepareMonthsResponseForQuery(ctx context.Context, byMonth
Timestamp: time.Unix(monthsRecord.Timestamp, 0).UTC().Format(time.RFC3339), Timestamp: time.Unix(monthsRecord.Timestamp, 0).UTC().Format(time.RFC3339),
} }
if monthsRecord.Counts.HasCounts() { if monthsRecord.Counts.HasCounts() {
nsResponse, err := a.prepareNamespaceResponse(ctx, monthsRecord.Namespaces) monthTotal, nsResponse, err := a.prepareNamespaceResponse(ctx, monthsRecord.Namespaces)
if err != nil { if err != nil {
return nil, err return nil, err
} }
monthResponse.Counts = a.countsRecordToCountsResponse(monthsRecord.Counts, false) monthResponse.Counts = monthTotal
monthResponse.Namespaces = nsResponse monthResponse.Namespaces = nsResponse
monthResponse.NewClients = newClientsResponse monthResponse.NewClients = newClientsResponse
months = append(months, monthResponse) months = append(months, monthResponse)
@@ -2804,14 +2804,16 @@ func (a *ActivityLog) prepareMonthsResponseForQuery(ctx context.Context, byMonth
return months, nil return months, nil
} }
// prepareNamespaceResponse populates the namespace portion of the activity log response struct // prepareNamespaceResponse takes monthly namespace records and converts them
// from // into the response namespace format. The function also returns counts for the
func (a *ActivityLog) prepareNamespaceResponse(ctx context.Context, nsRecords []*activity.MonthlyNamespaceRecord) ([]*ResponseNamespace, error) { // total number of clients per type seen that month.
func (a *ActivityLog) prepareNamespaceResponse(ctx context.Context, nsRecords []*activity.MonthlyNamespaceRecord) (*ResponseCounts, []*ResponseNamespace, error) {
queryNS, err := namespace.FromContext(ctx) queryNS, err := namespace.FromContext(ctx)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
nsResponse := make([]*ResponseNamespace, 0, len(nsRecords)) totalCounts := &ResponseCounts{}
nsResponses := make([]*ResponseNamespace, 0, len(nsRecords))
for _, nsRecord := range nsRecords { for _, nsRecord := range nsRecords {
if !nsRecord.Counts.HasCounts() { if !nsRecord.Counts.HasCounts() {
continue continue
@@ -2819,7 +2821,7 @@ func (a *ActivityLog) prepareNamespaceResponse(ctx context.Context, nsRecords []
ns, err := NamespaceByID(ctx, nsRecord.NamespaceID, a.core) ns, err := NamespaceByID(ctx, nsRecord.NamespaceID, a.core)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
if a.includeInResponse(queryNS, ns) { if a.includeInResponse(queryNS, ns) {
mountResponse := make([]*ResponseMount, 0, len(nsRecord.Mounts)) mountResponse := make([]*ResponseMount, 0, len(nsRecord.Mounts))
@@ -2840,15 +2842,18 @@ func (a *ActivityLog) prepareNamespaceResponse(ctx context.Context, nsRecords []
} else { } else {
displayPath = ns.Path displayPath = ns.Path
} }
nsResponse = append(nsResponse, &ResponseNamespace{ nsResponse := &ResponseNamespace{
NamespaceID: nsRecord.NamespaceID, NamespaceID: nsRecord.NamespaceID,
NamespacePath: displayPath, NamespacePath: displayPath,
Counts: *a.countsRecordToCountsResponse(nsRecord.Counts, false), Counts: *a.countsRecordToCountsResponse(nsRecord.Counts, false),
Mounts: mountResponse, Mounts: mountResponse,
}) }
nsResponses = append(nsResponses, nsResponse)
totalCounts.Add(&nsResponse.Counts)
} }
} }
return nsResponse, nil return totalCounts, nsResponses, nil
} }
// partialMonthClientCount returns the number of clients used so far this month. // partialMonthClientCount returns the number of clients used so far this month.