From e96349085a68356e8940167be537468d2090bbb4 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 9 Sep 2020 19:37:08 +0200
Subject: [PATCH 1/2] IndexMigrator: fix non blocking migration wrapper promise
 rejection (#77018)

* fix transformNonBlocking

* add test for indexMigrator
---
 .../migrations/core/index_migrator.test.ts    | 24 +++++++++++++++++++
 .../migrations/core/migrate_raw_docs.test.ts  | 14 +++++++++++
 .../migrations/core/migrate_raw_docs.ts       |  8 +++++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index f8b203bf66d6a..42592179b9d27 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -365,6 +365,30 @@ describe('IndexMigrator', () => {
       },
     ]);
   });
+
+  test('rejects when the migration function throws an error', async () => {
+    const { client } = testOpts;
+    const migrateDoc = jest.fn((doc: SavedObjectUnsanitizedDoc) => {
+      throw new Error('error migrating document');
+    });
+
+    testOpts.documentMigrator = {
+      migrationVersion: { foo: '1.2.3' },
+      migrate: migrateDoc,
+    };
+
+    withIndex(client, {
+      numOutOfDate: 1,
+      docs: [
+        [{ _id: 'foo:1', _source: { type: 'foo', foo: { name: 'Bar' } } }],
+        [{ _id: 'foo:2', _source: { type: 'foo', foo: { name: 'Baz' } } }],
+      ],
+    });
+
+    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"error migrating document"`
+    );
+  });
 });
 
 function withIndex(callCluster: jest.Mock, opts: any = {}) {
diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts
index 4c9d2e870a7bb..83dc042d2b96b 100644
--- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts
+++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts
@@ -90,4 +90,18 @@ describe('migrateRawDocs', () => {
 
     expect(logger.error).toBeCalledTimes(1);
   });
+
+  test('rejects when the transform function throws an error', async () => {
+    const transform = jest.fn<any, any>((doc: any) => {
+      throw new Error('error during transform');
+    });
+    await expect(
+      migrateRawDocs(
+        new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+        transform,
+        [{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }],
+        createSavedObjectsMigrationLoggerMock()
+      )
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`"error during transform"`);
+  });
 });
diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts
index 2bdf59d25dc74..5a5048d8ad88f 100644
--- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts
+++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts
@@ -78,10 +78,14 @@ function transformNonBlocking(
 ): (doc: SavedObjectUnsanitizedDoc) => Promise<SavedObjectUnsanitizedDoc> {
   // promises aren't enough to unblock the event loop
   return (doc: SavedObjectUnsanitizedDoc) =>
-    new Promise((resolve) => {
+    new Promise((resolve, reject) => {
       // set immediate is though
       setImmediate(() => {
-        resolve(transform(doc));
+        try {
+          resolve(transform(doc));
+        } catch (e) {
+          reject(e);
+        }
       });
     });
 }

From 7e61a3234eb9c5b782767dc124ca42985219f7b1 Mon Sep 17 00:00:00 2001
From: pgayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 9 Sep 2020 20:34:28 +0200
Subject: [PATCH 2/2] adapt test for 7.9

---
 .../saved_objects/migrations/core/index_migrator.test.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index 42592179b9d27..e1a70f3eee4db 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -367,7 +367,7 @@ describe('IndexMigrator', () => {
   });
 
   test('rejects when the migration function throws an error', async () => {
-    const { client } = testOpts;
+    const { callCluster } = testOpts;
     const migrateDoc = jest.fn((doc: SavedObjectUnsanitizedDoc) => {
       throw new Error('error migrating document');
     });
@@ -377,7 +377,7 @@ describe('IndexMigrator', () => {
       migrate: migrateDoc,
     };
 
-    withIndex(client, {
+    withIndex(callCluster, {
       numOutOfDate: 1,
       docs: [
         [{ _id: 'foo:1', _source: { type: 'foo', foo: { name: 'Bar' } } }],