Move KibanaMigrator into Server SavedObjectsService

docs/development/core/server/kibana-plugin-server.internalcorestart.md

@@ -10,3 +10,10 @@
 ```typescript
 export interface InternalCoreStart 
 ```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [savedObjects](./kibana-plugin-server.internalcorestart.savedobjects.md) | <code>SavedObjectsServiceStart</code> |  |
+

docs/development/core/server/kibana-plugin-server.internalcorestart.savedobjects.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [InternalCoreStart](./kibana-plugin-server.internalcorestart.md) &gt; [savedObjects](./kibana-plugin-server.internalcorestart.savedobjects.md)
+
+## InternalCoreStart.savedObjects property
+
+<b>Signature:</b>
+
+```typescript
+savedObjects: SavedObjectsServiceStart;
+```

docs/development/core/server/kibana-plugin-server.md

@@ -95,7 +95,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsMigrationVersion](./kibana-plugin-server.savedobjectsmigrationversion.md) | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
 |  [SavedObjectsRawDoc](./kibana-plugin-server.savedobjectsrawdoc.md) | A raw document as represented directly in the saved object index. |
 |  [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-server.savedobjectsresolveimporterrorsoptions.md) | Options to control the "resolve import" operation. |
-|  [SavedObjectsService](./kibana-plugin-server.savedobjectsservice.md) |  |
 |  [SavedObjectsUpdateOptions](./kibana-plugin-server.savedobjectsupdateoptions.md) |  |
 |  [SavedObjectsUpdateResponse](./kibana-plugin-server.savedobjectsupdateresponse.md) |  |
 |  [SessionStorage](./kibana-plugin-server.sessionstorage.md) | Provides an interface to store and retrieve data across requests. |

kibana.d.ts

@@ -42,7 +42,7 @@ export namespace Legacy {
   export type Request = LegacyKibanaServer.Request;
   export type ResponseToolkit = LegacyKibanaServer.ResponseToolkit;
   export type SavedObjectsClient = LegacyKibanaServer.SavedObjectsClient;
-  export type SavedObjectsService = LegacyKibanaServer.SavedObjectsService;
+  export type SavedObjectsService = LegacyKibanaServer.SavedObjectsLegacyService;
   export type Server = LegacyKibanaServer.Server;
 
   export type InitPluginFunction = LegacyKibanaPluginSpec.InitPluginFunction;

src/cli/serve/integration_tests/reload_logging_config.test.js

@@ -83,7 +83,7 @@ describe('Server logging configuration', function () {
     it('should be reloadable via SIGHUP process signaling', async function () {
       expect.assertions(3);
 
-      child = spawn(process.execPath, [kibanaPath, '--config', testConfigFile, '--oss'], {
+      child = spawn(process.execPath, [kibanaPath, '--config', testConfigFile, '--oss', '--verbose'], {
         stdio: 'pipe'
       });
 
@@ -114,7 +114,9 @@ describe('Server logging configuration', function () {
               const data = JSON.parse(line);
               sawJson = true;
 
-              if (data.tags.includes('listening')) {
+              // We know the sighup handler will be registered before
+              // root.setup() is called
+              if (data.message.includes('setting up root')) {
                 isJson = false;
                 setLoggingJson(false);
 
@@ -128,10 +130,9 @@ describe('Server logging configuration', function () {
               // the switch yet, so we ignore before switching over.
             } else {
               // Kibana has successfully stopped logging json, so kill the server.
-
               sawNonjson = true;
 
-              child.kill();
+              child && child.kill();
               child = undefined;
             }
           })
@@ -178,10 +179,11 @@ describe('Server logging configuration', function () {
         '--config', testConfigFile,
         '--logging.dest', logPath,
         '--plugins.initialize', 'false',
-        '--logging.json', 'false'
+        '--logging.json', 'false',
+        '--verbose'
       ]);
 
-      watchFileUntil(logPath, /http server running/, 2 * minute)
+      watchFileUntil(logPath, /starting server/, 2 * minute)
         .then(() => {
           // once the server is running, archive the log file and issue SIGHUP
           fs.renameSync(logPath, logPathArchived);
@@ -190,8 +192,8 @@ describe('Server logging configuration', function () {
         .then(() => watchFileUntil(logPath, /Reloaded logging configuration due to SIGHUP/, 10 * second))
         .then(contents => {
           const lines = contents.toString().split('\n');
-          // should be the first and only new line of the log file
-          expect(lines).toHaveLength(2);
+          // should be the first line of the new log file
+          expect(lines[0]).toMatch(/Reloaded logging configuration due to SIGHUP/);
           child.kill();
         })
         .then(done, done);

src/cli/serve/serve.js

@@ -194,7 +194,6 @@ export default function (program) {
     .option('--plugins <path>', 'an alias for --plugin-dir', pluginDirCollector)
     .option('--optimize', 'Optimize and then stop the server');
 
-
   if (CAN_REPL) {
     command.option('--repl', 'Run the server with a REPL prompt and access to the server object');
   }
@@ -211,7 +210,8 @@ export default function (program) {
       .option('--ssl', 'Run the dev server using HTTPS')
       .option('--no-base-path', 'Don\'t put a proxy in front of the dev server, which adds a random basePath')
       .option('--no-watch', 'Prevents automatic restarts of the server in --dev mode')
-      .option('--no-dev-config', 'Prevents loading the kibana.dev.yml file in --dev mode');
+      .option('--no-dev-config', 'Prevents loading the kibana.dev.yml file in --dev mode')
+      .option('--skip-migrations', 'Don\'t run Saved Object migrations (testing only)');
   }
 
   command
@@ -241,6 +241,7 @@ export default function (program) {
           basePath: !!opts.basePath,
           optimize: !!opts.optimize,
           oss: !!opts.oss,
+          skipMigrations: !!opts.skipMigrations,
         },
         features: {
           isClusterModeSupported: CAN_CLUSTER,

src/core/server/bootstrap.ts

@@ -70,6 +70,22 @@ export async function bootstrap({
 
   const root = new Root(rawConfigService.getConfig$(), env, onRootShutdown);
 
+  process.on('SIGHUP', () => {
+    const cliLogger = root.logger.get('cli');
+    cliLogger.info('Reloading logging configuration due to SIGHUP.', { tags: ['config'] });
+
+    try {
+      rawConfigService.reloadConfig();
+    } catch (err) {
+      return shutdown(err);
+    }
+
+    cliLogger.info('Reloaded logging configuration due to SIGHUP.', { tags: ['config'] });
+  });
+
+  process.on('SIGINT', () => shutdown());
+  process.on('SIGTERM', () => shutdown());
+
   function shutdown(reason?: Error) {
     rawConfigService.stop();
     return root.shutdown(reason);
@@ -87,22 +103,6 @@ export async function bootstrap({
     cliLogger.info('Optimization done.');
     await shutdown();
   }
-
-  process.on('SIGHUP', () => {
-    const cliLogger = root.logger.get('cli');
-    cliLogger.info('Reloading logging configuration due to SIGHUP.', { tags: ['config'] });
-
-    try {
-      rawConfigService.reloadConfig();
-    } catch (err) {
-      return shutdown(err);
-    }
-
-    cliLogger.info('Reloaded logging configuration due to SIGHUP.', { tags: ['config'] });
-  });
-
-  process.on('SIGINT', () => shutdown());
-  process.on('SIGTERM', () => shutdown());
 }
 
 function onRootShutdown(reason?: any) {

src/core/server/config/__mocks__/env.ts

@@ -38,6 +38,7 @@ export function getEnvOptions(options: DeepPartial<EnvOptions> = {}): EnvOptions
       basePath: false,
       optimize: false,
       oss: false,
+      skipMigrations: false,
       ...(options.cliArgs || {}),
     },
     isDevClusterMaster:

src/core/server/config/env.ts

@@ -56,6 +56,7 @@ export interface CliArgs {
   optimize: boolean;
   open: boolean;
   oss: boolean;
+  skipMigrations: boolean;
 }
 
 export class Env {

src/core/server/index.test.mocks.ts

@@ -35,7 +35,11 @@ jest.doMock('./elasticsearch/elasticsearch_service', () => ({
   ElasticsearchService: jest.fn(() => mockElasticsearchService),
 }));
 
-export const mockLegacyService = { setup: jest.fn(), start: jest.fn(), stop: jest.fn() };
+export const mockLegacyService = {
+  setup: jest.fn().mockReturnValue({ uiExports: {} }),
+  start: jest.fn(),
+  stop: jest.fn(),
+};
 jest.mock('./legacy/legacy_service', () => ({
   LegacyService: jest.fn(() => mockLegacyService),
 }));
@@ -45,3 +49,9 @@ export const mockConfigService = configServiceMock.create();
 jest.doMock('./config/config_service', () => ({
   ConfigService: jest.fn(() => mockConfigService),
 }));
+
+import { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
+export const mockSavedObjectsService = savedObjectsServiceMock.create();
+jest.doMock('./saved_objects/saved_objects_service', () => ({
+  SavedObjectsService: jest.fn(() => mockSavedObjectsService),
+}));