Small code fixes

elastic · Jan 31, 2020 · 8b11a5c · 8b11a5c
1 parent e776776
commit 8b11a5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -1531,7 +1531,7 @@ describe('delete()', () => {
     await alertsClient.delete({ id: '1' });
     expect(alertsClientParams.invalidateAPIKey).not.toHaveBeenCalled();
     expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
-      'delete(): Failed to load API key to invalidate: Fail'
+      'delete(): Failed to load API key to invalidate on alert 1: Fail'
     );
   });
 

diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -236,14 +236,16 @@ export class AlertsClient {
         .getDecryptedAsInternalUser<RawAlert>('alert', id, { namespace: this.namespace })
         .then(result => result.attributes.apiKey)
         .catch(e =>
-          this.logger.error(`delete(): Failed to load API key to invalidate: ${e.message}`)
+          this.logger.error(
+            `delete(): Failed to load API key to invalidate on alert ${id}: ${e.message}`
+          )
         ),
     ]);
 
     const removeResult = await this.savedObjectsClient.delete('alert', id);
 
     await Promise.all([
-      taskIdToRemove ? this.taskManager.remove(taskIdToRemove) : null,
+      taskIdToRemove && this.taskManager.remove(taskIdToRemove),
       apiKeyToInvalidate && this.invalidateApiKey({ apiKey: apiKeyToInvalidate }),
     ]);