adapt new calls

src/core/server/saved_objects/migrations/core/index.ts

@@ -21,5 +21,5 @@ export { DocumentMigrator } from './document_migrator';
 export { IndexMigrator } from './index_migrator';
 export { buildActiveMappings } from './build_active_mappings';
 export { CallCluster } from './call_cluster';
-export { LogFn } from './migration_logger';
+export { LogFn, SavedObjectsMigrationLogger } from './migration_logger';
 export { MigrationResult, MigrationStatus } from './migration_coordinator';

src/core/server/saved_objects/migrations/mocks.ts

@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectMigrationContext } from './types';
+import { SavedObjectsMigrationLogger } from './core';
+
+const createLoggerMock = (): jest.Mocked<SavedObjectsMigrationLogger> => {
+  const mock = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warning: jest.fn(),
+    warn: jest.fn(),
+  };
+
+  return mock;
+};
+
+const createContextMock = (): jest.Mocked<SavedObjectMigrationContext> => {
+  const mock = {
+    log: createLoggerMock(),
+  };
+  return mock;
+};
+
+export const migrationMocks = {
+  createContext: createContextMock,
+};

src/core/server/saved_objects/saved_objects_service.mock.ts

@@ -31,6 +31,7 @@ import { savedObjectsClientProviderMock } from './service/lib/scoped_client_prov
 import { savedObjectsRepositoryMock } from './service/lib/repository.mock';
 import { savedObjectsClientMock } from './service/saved_objects_client.mock';
 import { typeRegistryMock } from './saved_objects_type_registry.mock';
+import { migrationMocks } from './migrations/mocks';
 import { ServiceStatusLevels } from '../status';
 
 type SavedObjectsServiceContract = PublicMethodsOf<SavedObjectsService>;
@@ -105,4 +106,5 @@ export const savedObjectsServiceMock = {
   createSetupContract: createSetupContractMock,
   createInternalStartContract: createInternalStartContractMock,
   createStartContract: createStartContractMock,
+  createMigrationContext: migrationMocks.createContext,
 };

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

@@ -18,14 +18,17 @@
  */
 
 import { SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { savedObjectsServiceMock } from '../../../../core/server/mocks';
 import { dashboardSavedObjectTypeMigrations as migrations } from './dashboard_migrations';
 
+const contextMock = savedObjectsServiceMock.createMigrationContext();
+
 describe('dashboard', () => {
   describe('7.0.0', () => {
     const migration = migrations['7.0.0'];
 
     test('skips error on empty object', () => {
-      expect(migration({} as SavedObjectUnsanitizedDoc)).toMatchInlineSnapshot(`
+      expect(migration({} as SavedObjectUnsanitizedDoc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "references": Array [],
 }
@@ -44,7 +47,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      const migratedDoc = migration(doc);
+      const migratedDoc = migration(doc, contextMock);
       expect(migratedDoc).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
@@ -83,7 +86,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      const migratedDoc = migration(doc);
+      const migratedDoc = migration(doc, contextMock);
       expect(migratedDoc).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
@@ -122,7 +125,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "kibanaSavedObjectMeta": Object {
@@ -160,7 +163,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "kibanaSavedObjectMeta": Object {
@@ -198,7 +201,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      const migratedDoc = migration(doc);
+      const migratedDoc = migration(doc, contextMock);
       expect(migratedDoc).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
@@ -237,7 +240,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      const migratedDoc = migration(doc);
+      const migratedDoc = migration(doc, contextMock);
       expect(migratedDoc).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
@@ -291,7 +294,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       };
-      const migratedDoc = migration(doc);
+      const migratedDoc = migration(doc, contextMock);
 
       expect(migratedDoc).toMatchInlineSnapshot(`
 Object {
@@ -331,7 +334,7 @@ Object {
           panelsJSON: 123,
         },
       } as SavedObjectUnsanitizedDoc;
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "panelsJSON": 123,
@@ -349,7 +352,7 @@ Object {
           panelsJSON: '{123abc}',
         },
       } as SavedObjectUnsanitizedDoc;
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "panelsJSON": "{123abc}",
@@ -367,7 +370,7 @@ Object {
           panelsJSON: '{}',
         },
       } as SavedObjectUnsanitizedDoc;
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "panelsJSON": "{}",
@@ -385,7 +388,7 @@ Object {
           panelsJSON: '[{"id":"123"}]',
         },
       } as SavedObjectUnsanitizedDoc;
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "panelsJSON": "[{\\"id\\":\\"123\\"}]",
@@ -403,7 +406,7 @@ Object {
           panelsJSON: '[{"type":"visualization"}]',
         },
       } as SavedObjectUnsanitizedDoc;
-      expect(migration(doc)).toMatchInlineSnapshot(`
+      expect(migration(doc, contextMock)).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {
     "panelsJSON": "[{\\"type\\":\\"visualization\\"}]",
@@ -422,7 +425,7 @@ Object {
             '[{"id":"1","type":"visualization","foo":true},{"id":"2","type":"visualization","bar":true}]',
         },
       } as SavedObjectUnsanitizedDoc;
-      const migratedDoc = migration(doc);
+      const migratedDoc = migration(doc, contextMock);
       expect(migratedDoc).toMatchInlineSnapshot(`
 Object {
   "attributes": Object {

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

@@ -19,7 +19,7 @@
 
 import { get, flow } from 'lodash';
 
-import { SavedObjectMigrationFn, SavedObjectUnsanitizedDoc } from 'kibana/server';
+import { SavedObjectMigrationFn } from 'kibana/server';
 import { migrations730 } from './migrations_730';
 import { migrateMatchAllQuery } from './migrate_match_all_query';
 import { DashboardDoc700To720 } from '../../common';
@@ -62,7 +62,7 @@ function migrateIndexPattern(doc: DashboardDoc700To720) {
   doc.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.stringify(searchSource);
 }
 
-const migrations700: SavedObjectMigrationFn = (doc): DashboardDoc700To720 => {
+const migrations700: SavedObjectMigrationFn<any, any> = (doc): DashboardDoc700To720 => {
   // Set new "references" attribute
   doc.references = doc.references || [];
 
@@ -111,7 +111,7 @@ export const dashboardSavedObjectTypeMigrations = {
    * 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<SavedObjectMigrationFn>(migrateMatchAllQuery),
-  '7.0.0': flow<(doc: SavedObjectUnsanitizedDoc) => DashboardDoc700To720>(migrations700),
-  '7.3.0': flow<SavedObjectMigrationFn>(migrations730),
+  '6.7.2': flow<SavedObjectMigrationFn<any, any>>(migrateMatchAllQuery),
+  '7.0.0': flow<SavedObjectMigrationFn<any, DashboardDoc700To720['attributes']>>(migrations700),
+  '7.3.0': flow<SavedObjectMigrationFn<any, any>>(migrations730),
 };

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

@@ -21,7 +21,7 @@ import { SavedObjectMigrationFn } from 'kibana/server';
 import { get } from 'lodash';
 import { DEFAULT_QUERY_LANGUAGE } from '../../../data/common';
 
-export const migrateMatchAllQuery: SavedObjectMigrationFn = doc => {
+export const migrateMatchAllQuery: SavedObjectMigrationFn<any, any> = doc => {
   const searchSourceJSON = get<string>(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
 
   if (searchSourceJSON) {

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

@@ -17,19 +17,13 @@
  * under the License.
  */
 
+import { savedObjectsServiceMock } from '../../../../core/server/mocks';
 import { dashboardSavedObjectTypeMigrations as migrations } from './dashboard_migrations';
 import { migrations730 } from './migrations_730';
 import { DashboardDoc700To720, DashboardDoc730ToLatest, DashboardDocPre700 } from '../../common';
 import { RawSavedDashboardPanel730ToLatest } from '../../common';
 
-const mockContext = {
-  log: {
-    warning: () => {},
-    warn: () => {},
-    debug: () => {},
-    info: () => {},
-  },
-};
+const mockContext = savedObjectsServiceMock.createMigrationContext();
 
 test('dashboard migration 7.3.0 migrates filters to query on search source', () => {
   const doc: DashboardDoc700To720 = {
@@ -95,7 +89,7 @@ test('dashboard migration 7.3.0 migrates filters to query on search source when
     },
   };
 
-  const doc700: DashboardDoc700To720 = migrations['7.0.0'](doc);
+  const doc700 = migrations['7.0.0'](doc, mockContext);
   const newDoc = migrations['7.3.0'](doc700, mockContext);
 
   const parsedSearchSource = JSON.parse(newDoc.attributes.kibanaSavedObjectMeta.searchSourceJSON);
@@ -127,7 +121,7 @@ test('dashboard migration works when panelsJSON is missing panelIndex', () => {
     },
   };
 
-  const doc700: DashboardDoc700To720 = migrations['7.0.0'](doc);
+  const doc700 = migrations['7.0.0'](doc, mockContext);
   const newDoc = migrations['7.3.0'](doc700, mockContext);
 
   const parsedSearchSource = JSON.parse(newDoc.attributes.kibanaSavedObjectMeta.searchSourceJSON);

x-pack/plugins/graph/server/saved_objects/migrations.ts

@@ -8,7 +8,7 @@ import { get } from 'lodash';
 import { SavedObjectUnsanitizedDoc } from 'kibana/server';
 
 export const graphMigrations = {
-  '7.0.0': (doc: SavedObjectUnsanitizedDoc) => {
+  '7.0.0': (doc: SavedObjectUnsanitizedDoc<any>) => {
     // Set new "references" attribute
     doc.references = doc.references || [];
     // Migrate index pattern