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

remove multierror package - from entry formatter (#28253)

Browse Source
This commit is contained in:
Peter Wilson
2024-09-03 12:00:15 +01:00
committed by GitHub
parent aea2151dc3
commit a7026acef9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audit/entry_formatter.go
View File

@@ -5,6 +5,7 @@ package audit
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"reflect" "reflect"
"runtime/debug" "runtime/debug"
@@ -14,7 +15,6 @@ import (
"github.com/go-jose/go-jose/v3/jwt" "github.com/go-jose/go-jose/v3/jwt"
"github.com/hashicorp/eventlogger" "github.com/hashicorp/eventlogger"
"github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-multierror"
nshelper "github.com/hashicorp/vault/helper/namespace" nshelper "github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/salt" "github.com/hashicorp/vault/sdk/helper/salt"
@@ -121,7 +121,7 @@ func (f *entryFormatter) Process(ctx context.Context, e *eventlogger.Event) (_ *
"stacktrace", string(debug.Stack())) "stacktrace", string(debug.Stack()))
// Ensure that we add this error onto any pre-existing error that was being returned. // Ensure that we add this error onto any pre-existing error that was being returned.
retErr = multierror.Append(retErr, fmt.Errorf("panic generating audit log: %q", f.name)).ErrorOrNil() retErr = errors.Join(retErr, fmt.Errorf("panic generating audit log: %q", f.name))
}() }()
// Using 'any' to make exclusion easier, the JSON encoder doesn't care about types. // Using 'any' to make exclusion easier, the JSON encoder doesn't care about types.