Invalid searchSourceJSON causes saved object migration to fail

Closes: #78530

src/plugins/dashboard/server/saved_objects/dashboard_migrations.ts

@@ -101,17 +101,7 @@ const migrations700: SavedObjectMigrationFn<any, any> = (doc): DashboardDoc700To
 };
 
 export const dashboardSavedObjectTypeMigrations = {
-  /**
-   * We need to have this migration twice, once with a version prior to 7.0.0 once with a version
-   * after it. The reason for that is, that this migration has been introduced once 7.0.0 was already
-   * released. Thus a user who already had 7.0.0 installed already got the 7.0.0 migrations below running,
-   * so we need a version higher than that. But this fix was backported to the 6.7 release, meaning if we
-   * would only have the 7.0.1 migration in here a user on the 6.7 release will migrate their saved objects
-   * to the 7.0.1 state, and thus when updating their Kibana to 7.0, will never run the 7.0.0 migrations introduced
-   * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7
-   * only contained the 6.7.2 migration and not the 7.0.1 migration.
-   */
-  '6.7.2': flow(migrateMatchAllQuery),
   '7.0.0': flow(migrations700),
   '7.3.0': flow(migrations730),
+  '7.8.2': flow(migrateMatchAllQuery),
 };

src/plugins/dashboard/server/saved_objects/migrate_match_all_query.test.ts

@@ -49,4 +49,21 @@ describe('migrate match_all query', () => {
       },
     });
   });
+
+  it('should return original doc if searchSourceJSON cannot be parsed', () => {
+    const migratedDoc = migrateMatchAllQuery(
+      {
+        attributes: {
+          kibanaSavedObjectMeta: 'kibanaSavedObjectMeta',
+        },
+      } as Parameters<SavedObjectMigrationFn>[0],
+      savedObjectMigrationContext
+    );
+
+    expect(migratedDoc).toEqual({
+      attributes: {
+        kibanaSavedObjectMeta: 'kibanaSavedObjectMeta',
+      },
+    });
+  });
 });

src/plugins/dashboard/server/saved_objects/migrate_match_all_query.ts

@@ -21,6 +21,12 @@ import { SavedObjectMigrationFn } from 'kibana/server';
 import { get } from 'lodash';
 import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
 
+/**
+ * This migration script is related to:
+ *   @link https://github.com/elastic/kibana/pull/62194
+ *   @link https://github.com/elastic/kibana/pull/14644
+ * This is only a problem when you import an object from 5.x into 6.x but to be sure that all saved objects migrated that script was added into 7.8.2
+ */
 export const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
   const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
 
@@ -31,6 +37,7 @@ export const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
       searchSource = JSON.parse(searchSourceJSON);
     } catch (e) {
       // Let it go, the data is invalid and we'll leave it as is
+      return doc;
     }
 
     if (searchSource.query?.match_all) {

src/plugins/discover/server/saved_objects/search_migrations.test.ts

@@ -23,38 +23,6 @@ import { searchMigrations } from './search_migrations';
 const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;
 
 describe('migration search', () => {
-  describe('6.7.2', () => {
-    const migrationFn = searchMigrations['6.7.2'];
-
-    it('should migrate obsolete match_all query', () => {
-      const migratedDoc = migrationFn(
-        {
-          type: 'search',
-          attributes: {
-            kibanaSavedObjectMeta: {
-              searchSourceJSON: JSON.stringify({
-                query: {
-                  match_all: {},
-                },
-              }),
-            },
-          },
-        },
-        savedObjectMigrationContext
-      );
-      const migratedSearchSource = JSON.parse(
-        migratedDoc.attributes.kibanaSavedObjectMeta.searchSourceJSON
-      );
-
-      expect(migratedSearchSource).toEqual({
-        query: {
-          query: '',
-          language: 'kuery',
-        },
-      });
-    });
-  });
-
   describe('7.0.0', () => {
     const migrationFn = searchMigrations['7.0.0'];
 
@@ -328,4 +296,55 @@ Object {
       expect(migratedDoc).toEqual(doc);
     });
   });
+
+  describe('7.8.2', () => {
+    const migrationFn = searchMigrations['7.8.2'];
+
+    it('should migrate obsolete match_all query', () => {
+      const migratedDoc = migrationFn(
+        {
+          type: 'search',
+          attributes: {
+            kibanaSavedObjectMeta: {
+              searchSourceJSON: JSON.stringify({
+                query: {
+                  match_all: {},
+                },
+              }),
+            },
+          },
+        },
+        savedObjectMigrationContext
+      );
+      const migratedSearchSource = JSON.parse(
+        migratedDoc.attributes.kibanaSavedObjectMeta.searchSourceJSON
+      );
+
+      expect(migratedSearchSource).toEqual({
+        query: {
+          query: '',
+          language: 'kuery',
+        },
+      });
+    });
+
+    it('should return original doc if searchSourceJSON cannot be parsed', () => {
+      const migratedDoc = migrationFn(
+        {
+          type: 'search',
+          attributes: {
+            kibanaSavedObjectMeta: 'kibanaSavedObjectMeta',
+          },
+        },
+        savedObjectMigrationContext
+      );
+
+      expect(migratedDoc).toEqual({
+        type: 'search',
+        attributes: {
+          kibanaSavedObjectMeta: 'kibanaSavedObjectMeta',
+        },
+      });
+    });
+  });
 });

src/plugins/discover/server/saved_objects/search_migrations.ts

@@ -21,6 +21,12 @@ import { flow, get } from 'lodash';
 import { SavedObjectMigrationFn } from 'kibana/server';
 import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
 
+/**
+ * This migration script is related to:
+ *   @link https://github.com/elastic/kibana/pull/62194
+ *   @link https://github.com/elastic/kibana/pull/14644
+ * This is only a problem when you import an object from 5.x into 6.x but to be sure that all saved objects migrated that script was added into 7.8.2
+ */
 const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
   const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
 
@@ -31,6 +37,7 @@ const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
       searchSource = JSON.parse(searchSourceJSON);
     } catch (e) {
       // Let it go, the data is invalid and we'll leave it as is
+      return doc;
     }
 
     if (searchSource.query?.match_all) {
@@ -122,7 +129,7 @@ const migrateSearchSortToNestedArray: SavedObjectMigrationFn<any, any> = (doc) =
 };
 
 export const searchMigrations = {
-  '6.7.2': flow(migrateMatchAllQuery),
   '7.0.0': flow(setNewReferences),
   '7.4.0': flow(migrateSearchSortToNestedArray),
+  '7.8.2': flow(migrateMatchAllQuery),
 };

src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts

@@ -150,32 +150,6 @@ describe('migration visualization', () => {
         expect(aggs[3]).not.toHaveProperty('params.customBucket.params.time_zone');
         expect(aggs[2]).not.toHaveProperty('params.time_zone');
       });
-
-      it('should migrate obsolete match_all query', () => {
-        const migratedDoc = migrate({
-          ...doc,
-          attributes: {
-            ...doc.attributes,
-            kibanaSavedObjectMeta: {
-              searchSourceJSON: JSON.stringify({
-                query: {
-                  match_all: {},
-                },
-              }),
-            },
-          },
-        });
-        const migratedSearchSource = JSON.parse(
-          migratedDoc.attributes.kibanaSavedObjectMeta.searchSourceJSON
-        );
-
-        expect(migratedSearchSource).toEqual({
-          query: {
-            query: '',
-            language: 'kuery',
-          },
-        });
-      });
     });
   });
 
@@ -1487,6 +1461,57 @@ describe('migration visualization', () => {
     });
   });
 
+  describe('7.8.2', () => {
+    const migrationFn = visualizationSavedObjectTypeMigrations['7.8.2'];
+
+    it('should migrate obsolete match_all query', () => {
+      const migratedDoc = migrationFn(
+        {
+          type: 'area',
+          attributes: {
+            kibanaSavedObjectMeta: {
+              searchSourceJSON: JSON.stringify({
+                query: {
+                  match_all: {},
+                },
+              }),
+            },
+          },
+        },
+        savedObjectMigrationContext
+      );
+      const migratedSearchSource = JSON.parse(
+        migratedDoc.attributes.kibanaSavedObjectMeta.searchSourceJSON
+      );
+
+      expect(migratedSearchSource).toEqual({
+        query: {
+          query: '',
+          language: 'kuery',
+        },
+      });
+    });
+
+    it('should return original doc if searchSourceJSON cannot be parsed', () => {
+      const migratedDoc = migrationFn(
+        {
+          type: 'area',
+          attributes: {
+            kibanaSavedObjectMeta: 'kibanaSavedObjectMeta',
+          },
+        },
+        savedObjectMigrationContext
+      );
+
+      expect(migratedDoc).toEqual({
+        type: 'area',
+        attributes: {
+          kibanaSavedObjectMeta: 'kibanaSavedObjectMeta',
+        },
+      });
+    });
+  });
+
   describe('7.8.0 tsvb split_color_mode', () => {
     const migrate = (doc: any) =>
       visualizationSavedObjectTypeMigrations['7.8.0'](

src/plugins/visualizations/server/saved_objects/visualization_migrations.ts

@@ -655,6 +655,12 @@ const migrateTableSplits: SavedObjectMigrationFn<any, any> = (doc) => {
   }
 };
 
+/**
+ * This migration script is related to:
+ *   @link https://github.com/elastic/kibana/pull/62194
+ *   @link https://github.com/elastic/kibana/pull/14644
+ * This is only a problem when you import an object from 5.x into 6.x but to be sure that all saved objects migrated that script was added into 7.8.2
+ */
 const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
   const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
 
@@ -665,6 +671,7 @@ const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = (doc) => {
       searchSource = JSON.parse(searchSourceJSON);
     } catch (e) {
       // Let it go, the data is invalid and we'll leave it as is
+      return doc;
     }
 
     if (searchSource.query?.match_all) {
@@ -761,7 +768,7 @@ export const visualizationSavedObjectTypeMigrations = {
    * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7
    * only contained the 6.7.2 migration and not the 7.0.1 migration.
    */
-  '6.7.2': flow(migrateMatchAllQuery, removeDateHistogramTimeZones),
+  '6.7.2': flow(removeDateHistogramTimeZones),
   '7.0.0': flow(
     addDocReferences,
     migrateIndexPattern,
@@ -781,5 +788,6 @@ export const visualizationSavedObjectTypeMigrations = {
   '7.4.2': flow(transformSplitFiltersStringToQueryObject),
   '7.7.0': flow(migrateOperatorKeyTypo, migrateSplitByChartRow),
   '7.8.0': flow(migrateTsvbDefaultColorPalettes),
+  '7.8.2': flow(migrateMatchAllQuery),
   '7.10.0': flow(migrateFilterRatioQuery, removeTSVBSearchSource),
 };