fixed crash on zpd/api/event_log/alert/84c00970-5130-11eb-9fa7/_find …

…for non existing id
elastic · Jan 7, 2021 · 9c1cbd6 · 9c1cbd6
1 parent c1d7a14
commit 9c1cbd6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
@@ -334,11 +334,12 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
 
  this.eventLogService!.registerSavedObjectProvider('action', (request) => {
  const client = secureGetActionsClientWithRequest(request);
- return async (objects?: SavedObjectsBulkGetObject[]) => {
- if (objects) {
- Promise.all(objects.map(async (objectItem) => (await client).get({ id: objectItem.id })));
- }
- };
+ return (objects?: SavedObjectsBulkGetObject[]) =>
+ objects
+ ? Promise.all(
+ objects.map(async (objectItem) => await (await client).get({ id: objectItem.id }))
+ )
+ : new Promise(() => []);
  });
 
  const getScopedSavedObjectsClientWithoutAccessToActions = (request: KibanaRequest) =>

diff --git a/x-pack/plugins/alerts/server/plugin.ts b/x-pack/plugins/alerts/server/plugin.ts
@@ -371,11 +371,10 @@ export class AlertingPlugin {
 
  this.eventLogService!.registerSavedObjectProvider('alert', (request) => {
  const client = getAlertsClientWithRequest(request);
- return async (objects?: SavedObjectsBulkGetObject[]) => {
- if (objects) {
- Promise.all(objects.map(async (objectItem) => (await client).get({ id: objectItem.id })));
- }
- };
+ return (objects?: SavedObjectsBulkGetObject[]) =>
+ objects
+ ? Promise.all(objects.map(async (objectItem) => await client.get({ id: objectItem.id })))
+ : new Promise(() => []);
  });
 
  scheduleAlertingTelemetry(this.telemetryLogger, plugins.taskManager);