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

backport of commit e6427b2b30 (#19620)

Browse Source 
Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-03-20 09:27:45 -04:00
committed by GitHub
parent 4285eb5c54
commit 435824c26c
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog/19593.txt Normal file
View File

@@ -0,0 +1,4 @@
```release-note:improvement
events: Suppress log warnings triggered when events are sent but the events system is not enabled.
```

4
sdk/plugin/grpc_events.go
View File

@@ -34,6 +34,10 @@ type GRPCEventsServer struct {
} }
func (s *GRPCEventsServer) SendEvent(ctx context.Context, req *pb.SendEventRequest) (*pb.Empty, error) { func (s *GRPCEventsServer) SendEvent(ctx context.Context, req *pb.SendEventRequest) (*pb.Empty, error) {
if s.impl == nil {
return &pb.Empty{}, nil
}
err := s.impl.Send(ctx, logical.EventType(req.EventType), req.Event) err := s.impl.Send(ctx, logical.EventType(req.EventType), req.Event)
if err != nil { if err != nil {
return nil, err return nil, err

15
vault/auth.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/builtin/plugin" "github.com/hashicorp/vault/builtin/plugin"
"github.com/hashicorp/vault/helper/experiments"
"github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/versions" "github.com/hashicorp/vault/helper/versions"
"github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/sdk/helper/consts"
@@ -1001,12 +1002,14 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
} }
config := &logical.BackendConfig{ config := &logical.BackendConfig{
StorageView: view, StorageView: view,
Logger: authLogger, Logger: authLogger,
Config: conf, Config: conf,
System: sysView, System: sysView,
BackendUUID: entry.BackendAwareUUID, BackendUUID: entry.BackendAwareUUID,
EventsSender: pluginEventSender, }
if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
config.EventsSender = pluginEventSender
} }
b, err := f(ctx, config) b, err := f(ctx, config)

15
vault/mount.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/builtin/plugin" "github.com/hashicorp/vault/builtin/plugin"
"github.com/hashicorp/vault/helper/experiments"
"github.com/hashicorp/vault/helper/metricsutil" "github.com/hashicorp/vault/helper/metricsutil"
"github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/versions" "github.com/hashicorp/vault/helper/versions"
@@ -1660,12 +1661,14 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
return nil, "", err return nil, "", err
} }
config := &logical.BackendConfig{ config := &logical.BackendConfig{
StorageView: view, StorageView: view,
Logger: backendLogger, Logger: backendLogger,
Config: conf, Config: conf,
System: sysView, System: sysView,
BackendUUID: entry.BackendAwareUUID, BackendUUID: entry.BackendAwareUUID,
EventsSender: pluginEventSender, }
if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
config.EventsSender = pluginEventSender
} }
ctx = context.WithValue(ctx, "core_number", c.coreNumber) ctx = context.WithValue(ctx, "core_number", c.coreNumber)