Move KibanaMigrator into Server SavedObjectsService

src/core/server/config/config_service.mock.ts

@@ -22,7 +22,10 @@ import { ObjectToConfigAdapter } from './object_to_config_adapter';
 
 import { IConfigService } from './config_service';
 
-const createConfigServiceMock = () => {
+const createConfigServiceMock = ({
+  atPath = {},
+  getConfig$ = {},
+}: { atPath?: unknown; getConfig$?: Record<string, any> } = {}) => {
   const mocked: jest.Mocked<IConfigService> = {
     atPath: jest.fn(),
     getConfig$: jest.fn(),
@@ -32,8 +35,8 @@ const createConfigServiceMock = () => {
     isEnabledAtPath: jest.fn(),
     setSchema: jest.fn(),
   };
-  mocked.atPath.mockReturnValue(new BehaviorSubject({}));
-  mocked.getConfig$.mockReturnValue(new BehaviorSubject(new ObjectToConfigAdapter({})));
+  mocked.atPath.mockReturnValue(new BehaviorSubject(atPath));
+  mocked.getConfig$.mockReturnValue(new BehaviorSubject(new ObjectToConfigAdapter(getConfig$)));
   mocked.getUsedPaths.mockResolvedValue([]);
   mocked.getUnusedPaths.mockResolvedValue([]);
   mocked.isEnabledAtPath.mockResolvedValue(true);

src/core/server/core_context.mock.ts

@@ -24,15 +24,15 @@ import { loggingServiceMock } from './logging/logging_service.mock';
 import { configServiceMock } from './config/config_service.mock';
 import { ILoggingService } from './logging';
 
-function create(
-  env?: Env,
-  logger?: jest.Mocked<ILoggingService>,
-  configService?: jest.Mocked<IConfigService>
-): CoreContext {
-  env = env || Env.createDefault(getEnvOptions());
-  logger = logger || loggingServiceMock.create();
-  configService = configService || configServiceMock.create();
-
+function create({
+  env = Env.createDefault(getEnvOptions()),
+  logger = loggingServiceMock.create(),
+  configService = configServiceMock.create(),
+}: {
+  env?: Env;
+  logger?: jest.Mocked<ILoggingService>;
+  configService?: jest.Mocked<IConfigService>;
+} = {}): CoreContext {
   return { coreId: Symbol(), env, logger, configService };
 }
 

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

@@ -25,11 +25,8 @@ import { mockCoreContext } from '../core_context.mock';
 import { KibanaMigrator } from './migrations/kibana/kibana_migrator';
 import { of } from 'rxjs';
 import elasticsearch from 'elasticsearch';
-
-let coreContext: CoreContext;
-beforeEach(() => {
-  coreContext = mockCoreContext.create();
-});
+import { Env } from '../config';
+import { configServiceMock } from '../mocks';
 
 afterEach(() => {
   jest.clearAllMocks();
@@ -38,6 +35,7 @@ afterEach(() => {
 describe('SavedObjectsService', () => {
   describe('#setup()', () => {
     it('creates a KibanaMigrator which retries NoConnections errors from callAsInternalUser', async () => {
+      const coreContext = mockCoreContext.create();
       let i = 0;
       const clusterClient = {
         callAsInternalUser: jest
@@ -64,7 +62,40 @@ describe('SavedObjectsService', () => {
   });
 
   describe('#start()', () => {
+    it('skips KibanaMigrator migrations when --optimize=true', async () => {
+      const coreContext = mockCoreContext.create({
+        env: ({ cliArgs: { optimize: true }, packageInfo: { version: 'x.x.x' } } as unknown) as Env,
+      });
+      const soService = new SavedObjectsService(coreContext);
+      const coreSetup = ({
+        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        legacy: { uiExports: {}, pluginExtendedConfig: {} },
+      } as unknown) as SavedObjectsSetupDeps;
+
+      await soService.setup(coreSetup);
+      const migrator = (KibanaMigrator as jest.Mock<KibanaMigrator>).mock.instances[0];
+      await soService.start({});
+      expect(migrator.awaitMigration).toHaveBeenCalledWith(true);
+    });
+
+    it('skips KibanaMigrator migrations when migrations.skip=true', async () => {
+      const configService = configServiceMock.create({ atPath: { skip: true } });
+      const coreContext = mockCoreContext.create({ configService });
+      const soService = new SavedObjectsService(coreContext);
+      const coreSetup = ({
+        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        legacy: { uiExports: {}, pluginExtendedConfig: {} },
+      } as unknown) as SavedObjectsSetupDeps;
+
+      await soService.setup(coreSetup);
+      const migrator = (KibanaMigrator as jest.Mock<KibanaMigrator>).mock.instances[0];
+      await soService.start({});
+      expect(migrator.awaitMigration).toHaveBeenCalledWith(true);
+    });
+
     it('resolves with KibanaMigrator after waiting for migrations to complete', async () => {
+      const configService = configServiceMock.create({ atPath: { skip: false } });
+      const coreContext = mockCoreContext.create({ configService });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
         elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
@@ -74,9 +105,9 @@ describe('SavedObjectsService', () => {
       await soService.setup(coreSetup);
       const migrator = (KibanaMigrator as jest.Mock<KibanaMigrator>).mock.instances[0];
       expect(migrator.awaitMigration).toHaveBeenCalledTimes(0);
-      await soService.start({}).then(result => {
-        expect(result.migrator).toBeInstanceOf(KibanaMigrator);
-      });
+      const startContract = await soService.start({});
+      expect(startContract.migrator).toBeInstanceOf(KibanaMigrator);
+      expect(migrator.awaitMigration).toHaveBeenCalledWith(false);
       expect(migrator.awaitMigration).toHaveBeenCalledTimes(1);
     });
   });

src/core/server/saved_objects/saved_objects_service.ts

@@ -92,7 +92,7 @@ export class SavedObjectsService
       config: coreSetup.legacy.pluginExtendedConfig,
       savedObjectsConfig,
       kibanaConfig,
-      callCluster: retryCallCluster(adminClient.callAsInternalUser.bind(adminClient)),
+      callCluster: retryCallCluster(adminClient.callAsInternalUser),
     });
 
     return ({} as any) as Promise<SavedObjectsServiceSetup>;

src/es_archiver/lib/indices/kibana_index.js

@@ -101,7 +101,10 @@ export async function migrateKibanaIndex({ client, log, kibanaPluginIds }) {
       error: log.error.bind(log),
     },
     version: kibanaVersion,
-    ...uiExports,
+    savedObjectSchemas: uiExports.savedObjectSchemas,
+    savedObjectMappings: uiExports.savedObjectMappings,
+    savedObjectMigrations: uiExports.savedObjectMigrations,
+    savedObjectValidations: uiExports.savedObjectValidations,
     callCluster: (path, ...args) => _.get(client, path).call(client, ...args),
   };