Merge branch 'master' into data-streams/delete-action

elastic · Jun 24, 2020 · 729228e · 729228e
2 parents 4670f98 + fc9df72
commit 729228e
Show file tree

Hide file tree

Showing 81 changed files with 1,710 additions and 1,423 deletions.
diff --git a/src/core/server/http/__snapshots__/http_config.test.ts.snap b/src/core/server/http/__snapshots__/http_config.test.ts.snap
diff --git a/src/core/server/http/http_config.test.ts b/src/core/server/http/http_config.test.ts
@@ -78,6 +78,14 @@ test('throws if basepath appends a slash', () => {
   expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
 });
 
+test('throws if basepath is an empty string', () => {
+  const httpSchema = config.schema;
+  const obj = {
+    basePath: '',
+  };
+  expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
+});
+
 test('throws if basepath is not specified, but rewriteBasePath is set', () => {
   const httpSchema = config.schema;
   const obj = {

diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts
@@ -23,7 +23,7 @@ import { hostname } from 'os';
 import { CspConfigType, CspConfig, ICspConfig } from '../csp';
 import { SslConfig, sslSchema } from './ssl_config';
 
-const validBasePathRegex = /(^$|^\/.*[^\/]$)/;
+const validBasePathRegex = /^\/.*[^\/]$/;
 const uuidRegexp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
 const match = (regex: RegExp, errorMsg: string) => (str: string) =>

diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
@@ -21,8 +21,6 @@ import Fs from 'fs';
 import { resolve } from 'path';
 import { promisify } from 'util';
 
-import { importApi } from './server/routes/api/import';
-import { exportApi } from './server/routes/api/export';
 import { getUiSettingDefaults } from './server/ui_setting_defaults';
 import { registerCspCollector } from './server/lib/csp_usage_collector';
 import { injectVars } from './inject_vars';
@@ -91,9 +89,6 @@ export default function (kibana) {
 
     init: async function (server) {
       const { usageCollection } = server.newPlatform.setup.plugins;
-      // routes
-      importApi(server);
-      exportApi(server);
       registerCspCollector(usageCollection, server);
       server.injectUiAppVars('kibana', () => injectVars(server));
     },