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

Revert "Added LocalMount field to Export API (#29145)" (#29251)

Browse Source 
This reverts commit af6d983404.
This commit is contained in:
divyaac
2024-12-20 11:38:59 -08:00
committed by GitHub
parent 6501a562f6
commit df73491763
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog/29145.txt
View File

@@ -1,4 +0,0 @@
```release-note:improvement
activity: Add a "local_mount" field to the Export API response. This field is true if the client is a token or created on a
local mount.
```

11
vault/activity_log.go
View File

@@ -336,9 +336,6 @@ type ActivityLogExportRecord struct {
// MountPath is the path of the auth mount associated with the token used // MountPath is the path of the auth mount associated with the token used
MountPath string `json:"mount_path" mapstructure:"mount_path"` MountPath string `json:"mount_path" mapstructure:"mount_path"`
// LocalMount indicates if the mount only belongs to the current cluster
LocalMount bool `json:"local_mount" mapstructure:"local_mount"`
// Timestamp denotes the time at which the activity occurred formatted using RFC3339 // Timestamp denotes the time at which the activity occurred formatted using RFC3339
Timestamp string `json:"timestamp" mapstructure:"timestamp"` Timestamp string `json:"timestamp" mapstructure:"timestamp"`
@@ -919,7 +916,7 @@ func (a *ActivityLog) getLastSegmentNumberByEntityPath(ctx context.Context, enti
} }
// WalkEntitySegments loads each of the entity segments for a particular start time // WalkEntitySegments loads each of the entity segments for a particular start time
func (a *ActivityLog) WalkEntitySegments(ctx context.Context, startTime time.Time, hll *hyperloglog.Sketch, walkFn func(*activity.EntityActivityLog, time.Time, bool) error) error { func (a *ActivityLog) WalkEntitySegments(ctx context.Context, startTime time.Time, hll *hyperloglog.Sketch, walkFn func(*activity.EntityActivityLog, time.Time, *hyperloglog.Sketch) error) error {
baseGlobalPath := activityGlobalPathPrefix + activityEntityBasePath + fmt.Sprint(startTime.Unix()) + "/" baseGlobalPath := activityGlobalPathPrefix + activityEntityBasePath + fmt.Sprint(startTime.Unix()) + "/"
baseLocalPath := activityLocalPathPrefix + activityEntityBasePath + fmt.Sprint(startTime.Unix()) + "/" baseLocalPath := activityLocalPathPrefix + activityEntityBasePath + fmt.Sprint(startTime.Unix()) + "/"
@@ -943,7 +940,7 @@ func (a *ActivityLog) WalkEntitySegments(ctx context.Context, startTime time.Tim
if err != nil { if err != nil {
return fmt.Errorf("unable to parse segment %v%v: %w", basePath, path, err) return fmt.Errorf("unable to parse segment %v%v: %w", basePath, path, err)
} }
err = walkFn(out, startTime, basePath == baseLocalPath) err = walkFn(out, startTime, hll)
if err != nil { if err != nil {
return fmt.Errorf("unable to walk entities: %w", err) return fmt.Errorf("unable to walk entities: %w", err)
} }
@@ -3837,7 +3834,7 @@ func (a *ActivityLog) writeExport(ctx context.Context, rw http.ResponseWriter, f
return err return err
} }
walkEntities := func(l *activity.EntityActivityLog, startTime time.Time, isLocal bool) error { walkEntities := func(l *activity.EntityActivityLog, startTime time.Time, hll *hyperloglog.Sketch) error {
for _, e := range l.Clients { for _, e := range l.Clients {
if _, ok := dedupIDs[e.ClientID]; ok { if _, ok := dedupIDs[e.ClientID]; ok {
continue continue
@@ -3869,7 +3866,6 @@ func (a *ActivityLog) writeExport(ctx context.Context, rw http.ResponseWriter, f
NamespacePath: nsDisplayPath, NamespacePath: nsDisplayPath,
Timestamp: ts.UTC().Format(time.RFC3339), Timestamp: ts.UTC().Format(time.RFC3339),
MountAccessor: e.MountAccessor, MountAccessor: e.MountAccessor,
LocalMount: isLocal,
// Default following to empty versus nil, will be overwritten if necessary // Default following to empty versus nil, will be overwritten if necessary
Policies: []string{}, Policies: []string{},
@@ -4265,7 +4261,6 @@ func baseActivityExportCSVHeader() []string {
"client_id", "client_id",
"client_type", "client_type",
"local_entity_alias", "local_entity_alias",
"local_mount",
"namespace_id", "namespace_id",
"namespace_path", "namespace_path",
"mount_accessor", "mount_accessor",

3
vault/external_tests/activity_testonly/activity_testonly_test.go
View File

@@ -1,7 +1,7 @@
// Copyright (c) HashiCorp, Inc. // Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1 // SPDX-License-Identifier: BUSL-1.1
//go:build testonly ////go:build testonly
package activity_testonly package activity_testonly
@@ -549,7 +549,6 @@ func getCSVExport(t *testing.T, client *api.Client, monthsPreviousTo int, now ti
boolFields := map[string]struct{}{ boolFields := map[string]struct{}{
"local_entity_alias": {}, "local_entity_alias": {},
"local_mount": {},
} }
mapFields := map[string]struct{}{ mapFields := map[string]struct{}{