From f1f5c8444a3886fdb7843595ddfa040d409e7ca2 Mon Sep 17 00:00:00 2001 From: Tom Proctor Date: Mon, 20 Mar 2023 11:14:14 +0000 Subject: [PATCH] Suppress event broker not started log warning (#19593) --- changelog/19593.txt | 4 ++++ sdk/plugin/grpc_events.go | 4 ++++ vault/auth.go | 15 +++++++++------ vault/mount.go | 15 +++++++++------ 4 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 changelog/19593.txt diff --git a/changelog/19593.txt b/changelog/19593.txt new file mode 100644 index 000000000..8f170578e --- /dev/null +++ b/changelog/19593.txt @@ -0,0 +1,4 @@ +```release-note:improvement +events: Suppress log warnings triggered when events are sent but the events system is not enabled. +``` + diff --git a/sdk/plugin/grpc_events.go b/sdk/plugin/grpc_events.go index 8f08e230d..05d788c66 100644 --- a/sdk/plugin/grpc_events.go +++ b/sdk/plugin/grpc_events.go @@ -37,6 +37,10 @@ type GRPCEventsServer struct { } 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) if err != nil { return nil, err diff --git a/vault/auth.go b/vault/auth.go index e3fc75d5d..ee590bc22 100644 --- a/vault/auth.go +++ b/vault/auth.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/builtin/plugin" + "github.com/hashicorp/vault/helper/experiments" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/versions" "github.com/hashicorp/vault/sdk/helper/consts" @@ -1004,12 +1005,14 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV } config := &logical.BackendConfig{ - StorageView: view, - Logger: authLogger, - Config: conf, - System: sysView, - BackendUUID: entry.BackendAwareUUID, - EventsSender: pluginEventSender, + StorageView: view, + Logger: authLogger, + Config: conf, + System: sysView, + BackendUUID: entry.BackendAwareUUID, + } + if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) { + config.EventsSender = pluginEventSender } b, err := f(ctx, config) diff --git a/vault/mount.go b/vault/mount.go index baf41c9f1..9936e6bda 100644 --- a/vault/mount.go +++ b/vault/mount.go @@ -18,6 +18,7 @@ import ( "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/builtin/plugin" + "github.com/hashicorp/vault/helper/experiments" "github.com/hashicorp/vault/helper/metricsutil" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/versions" @@ -1663,12 +1664,14 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView return nil, "", err } config := &logical.BackendConfig{ - StorageView: view, - Logger: backendLogger, - Config: conf, - System: sysView, - BackendUUID: entry.BackendAwareUUID, - EventsSender: pluginEventSender, + StorageView: view, + Logger: backendLogger, + Config: conf, + System: sysView, + BackendUUID: entry.BackendAwareUUID, + } + if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) { + config.EventsSender = pluginEventSender } ctx = context.WithValue(ctx, "core_number", c.coreNumber)