Upgrade Hapi in legacy platform to v17

docs/development/core/development-basepath.asciidoc

@@ -55,8 +55,8 @@ Append `config.get('server.basePath')` to any absolute URL path.
 const basePath = server.config().get('server.basePath');
 server.route({
   path: '/redirect',
-  handler(req, reply) {
-    reply.redirect(`${basePath}/otherLocation`);
+  handler(req, h) {
+    return h.redirect(`${basePath}/otherLocation`);
   }
 });
 -----------

package.json

@@ -84,7 +84,7 @@
     "babel-polyfill": "6.20.0",
     "babel-register": "6.18.0",
     "bluebird": "2.9.34",
-    "boom": "5.2.0",
+    "boom": "7.2.0",
     "brace": "0.11.1",
     "cache-loader": "1.0.3",
     "chalk": "^2.4.1",
@@ -100,25 +100,24 @@
     "elasticsearch": "^14.2.1",
     "elasticsearch-browser": "^14.2.1",
     "encode-uri-query": "1.0.0",
-    "even-better": "7.0.2",
     "execa": "^0.10.0",
     "expiry-js": "0.1.7",
     "extract-text-webpack-plugin": "3.0.1",
     "file-loader": "1.1.4",
     "font-awesome": "4.4.0",
     "glob": "^7.1.2",
     "glob-all": "^3.1.0",
+    "good": "github:elastic/good#17.5.3-kibana1",
     "good-squeeze": "2.1.0",
-    "h2o2": "5.1.1",
+    "h2o2": "8.1.2",
     "h2o2-latest": "npm:[email protected]",
     "handlebars": "4.0.5",
-    "hapi": "14.2.0",
-    "hapi-latest": "npm:[email protected]",
+    "hapi": "17.5.3",
     "hjson": "3.1.0",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.1",
-    "inert": "4.0.2",
-    "joi": "10.4.1",
+    "inert": "5.1.0",
+    "joi": "13.5.2",
     "jquery": "^3.3.1",
     "js-yaml": "3.4.1",
     "json-stringify-pretty-compact": "1.0.4",
@@ -192,11 +191,11 @@
     "vega-lite": "^2.4.0",
     "vega-schema-url-parser": "1.0.0",
     "vega-tooltip": "^0.9.14",
-    "vision": "4.1.0",
+    "vision": "5.3.3",
     "webpack": "3.6.0",
     "webpack-merge": "4.1.0",
     "whatwg-fetch": "^2.0.3",
-    "wreck": "12.4.0",
+    "wreck": "14.0.2",
     "x-pack": "link:x-pack",
     "yauzl": "2.7.0"
   },
@@ -222,10 +221,10 @@
     "@types/fetch-mock": "^5.12.2",
     "@types/getopts": "^2.0.0",
     "@types/glob": "^5.0.35",
-    "@types/hapi-latest": "npm:@types/hapi@17.0.12",
+    "@types/hapi": "17.0.18",
     "@types/has-ansi": "^3.0.0",
     "@types/jest": "^22.2.3",
-    "@types/joi": "^10.4.4",
+    "@types/joi": "^13.4.2",
     "@types/jquery": "3.3.1",
     "@types/js-yaml": "^3.11.1",
     "@types/listr": "^0.13.0",

packages/kbn-plugin-generator/sao_template/template/server/routes/example.js

@@ -3,8 +3,8 @@ export default function (server) {
   server.route({
     path: '/api/<%= name %>/example',
     method: 'GET',
-    handler(req, reply) {
-      reply({ time: (new Date()).toISOString() });
+    handler() {
+      return { time: (new Date()).toISOString() };
     }
   });
 

src/cli/cluster/configure_base_path_proxy.test.js

@@ -25,7 +25,6 @@ jest.mock('../../server/logging', () => ({
   setupLogging: jest.fn(),
 }));
 
-import { Server } from 'hapi';
 import { createBasePathProxy as createBasePathProxyMock } from '../../core';
 import { setupLogging as setupLoggingMock } from '../../server/logging';
 import { configureBasePathProxy } from './configure_base_path_proxy';
@@ -49,7 +48,7 @@ describe('configureBasePathProxy()', () => {
 
     // Check that logging is configured with the right parameters.
     expect(setupLoggingMock).toHaveBeenCalledWith(
-      expect.any(Server),
+      expect.anything(),
       configMock
     );
 

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

@@ -22,7 +22,6 @@ import { writeFileSync } from 'fs';
 import { relative, resolve } from 'path';
 import { safeDump } from 'js-yaml';
 import es from 'event-stream';
-import stripAnsi from 'strip-ansi';
 import { readYamlConfig } from '../read_yaml_config';
 
 const testConfigFile = follow('__fixtures__/reload_logging_config/kibana.test.yml');
@@ -42,19 +41,7 @@ function setLoggingJson(enabled) {
   writeFileSync(testConfigFile, yaml);
 }
 
-const prepareJson = obj => ({
-  ...obj,
-  pid: '## PID ##',
-  '@timestamp': '## @timestamp ##'
-});
-
-const prepareLogLine = str =>
-  stripAnsi(str.replace(
-    /\[\d{2}:\d{2}:\d{2}.\d{3}\]/,
-    '[## timestamp ##]'
-  ));
-
-describe.skip('Server logging configuration', function () {
+describe('Server logging configuration', function () {
   let child;
   let isJson;
 
@@ -80,20 +67,23 @@ describe.skip('Server logging configuration', function () {
     });
   } else {
     it('should be reloadable via SIGHUP process signaling', function (done) {
-      expect.assertions(1);
+      expect.assertions(3);
 
       child = spawn('node', [kibanaPath, '--config', testConfigFile]);
 
       child.on('error', err => {
         done(new Error(`error in child process while attempting to reload config. ${err.stack || err.message || err}`));
       });
 
-      const lines = [];
+      let sawJson = false;
+      let sawNonjson = false;
 
       child.on('exit', _code => {
         const code = _code === null ? 0 : _code;
 
-        expect({ code, lines }).toMatchSnapshot();
+        expect(code).toEqual(0);
+        expect(sawJson).toEqual(true);
+        expect(sawNonjson).toEqual(true);
         done();
       });
 
@@ -107,23 +97,18 @@ describe.skip('Server logging configuration', function () {
 
           if (isJson) {
             const data = JSON.parse(line);
-            lines.push(prepareJson(data));
+            sawJson = true;
 
             if (data.tags.includes('listening')) {
               switchToPlainTextLog();
             }
           } else if (line.startsWith('{')) {
             // We have told Kibana to stop logging json, but it hasn't completed
-            // the switch yet, so we verify the messages that are logged while
-            // switching over.
-
-            const data = JSON.parse(line);
-            lines.push(prepareJson(data));
+            // the switch yet, so we ignore before switching over.
           } else {
-            // Kibana has successfully stopped logging json, so we verify the
-            // log line and kill the server.
+            // Kibana has successfully stopped logging json, so kill the server.
 
-            lines.push(prepareLogLine(line));
+            sawNonjson = true;
 
             child.kill();
             child = undefined;

src/cli_plugin/install/downloaders/http.js

@@ -19,7 +19,6 @@
 
 import Wreck from 'wreck';
 import Progress from '../progress';
-import { fromNode as fn } from 'bluebird';
 import { createWriteStream } from 'fs';
 import HttpProxyAgent from 'http-proxy-agent';
 import HttpsProxyAgent from 'https-proxy-agent';
@@ -41,32 +40,27 @@ function getProxyAgent(sourceUrl, logger) {
   }
 }
 
-function sendRequest({ sourceUrl, timeout }, logger) {
+async function sendRequest({ sourceUrl, timeout }, logger) {
   const maxRedirects = 11; //Because this one goes to 11.
-  return fn(cb => {
-    const reqOptions = { timeout, redirects: maxRedirects };
-    const proxyAgent = getProxyAgent(sourceUrl, logger);
+  const reqOptions = { timeout, redirects: maxRedirects };
+  const proxyAgent = getProxyAgent(sourceUrl, logger);
 
-    if (proxyAgent) {
-      reqOptions.agent = proxyAgent;
-    }
-
-    const req = Wreck.request('GET', sourceUrl, reqOptions, (err, resp) => {
-      if (err) {
-        if (err.code === 'ECONNREFUSED') {
-          err = new Error('ENOTFOUND');
-        }
-
-        return cb(err);
-      }
+  if (proxyAgent) {
+    reqOptions.agent = proxyAgent;
+  }
 
-      if (resp.statusCode >= 400) {
-        return cb(new Error('ENOTFOUND'));
-      }
+  try {
+    const promise = Wreck.request('GET', sourceUrl, reqOptions);
+    const req = promise.req;
+    const resp = await promise;
+    if (resp.statusCode >= 400) {
+      throw new Error('ENOTFOUND');
+    }
 
-      cb(null, { req, resp });
-    });
-  });
+    return { req, resp };
+  } catch (err) {
+    throw new Error('ENOTFOUND');
+  }
 }
 
 function downloadResponse({ resp, targetPath, progress }) {

src/core/server/config/schema/internals/index.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as Joi from 'joi';
+import Joi from 'joi';
 import {
   AnySchema,
   JoiRoot,

src/core/server/config/schema/types/type.ts

@@ -98,12 +98,7 @@ export abstract class Type<V> {
       return error;
     }
 
-    const { context = {}, type, path: rawPath, message } = error;
-
-    // Before v11.0.0 Joi reported paths as `.`-delimited strings, but more
-    // recent version use arrays instead. Once we upgrade Joi, we should just
-    // remove this split logic and use `path` provided by Joi directly.
-    const path = rawPath ? rawPath.split('.') : [];
+    const { context = {}, type, path, message } = error;
 
     const errorHandleResult = this.handleError(type, context, path);
     if (errorHandleResult instanceof SchemaTypeError) {

src/core/server/http/base_path_proxy_server.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Server } from 'hapi-latest';
+import { Server } from 'hapi';
 import { Agent as HttpsAgent, ServerOptions as TlsOptions } from 'https';
 import { sample } from 'lodash';
 import { ByteSizeValue } from '../config/schema';

src/core/server/http/http_server.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Server } from 'hapi-latest';
+import { Server } from 'hapi';
 
 import { modifyUrl } from '../../utils';
 import { Env } from '../config';

src/core/server/http/http_tools.ts

@@ -18,7 +18,7 @@
  */
 
 import { readFileSync } from 'fs';
-import { Server, ServerOptions } from 'hapi-latest';
+import { Server, ServerOptions } from 'hapi';
 import { ServerOptions as TLSOptions } from 'https';
 import { HttpConfig } from './http_config';
 

src/core/server/http/https_redirect_server.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request, ResponseToolkit, Server } from 'hapi-latest';
+import { Request, ResponseToolkit, Server } from 'hapi';
 import { format as formatUrl } from 'url';
 
 import { Logger } from '../logging';

src/core/server/http/router/request.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request } from 'hapi-latest';
+import { Request } from 'hapi';
 import { ObjectType, TypeOf } from '../../config/schema';
 
 import { filterHeaders, Headers } from './headers';

src/core/server/http/router/router.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Request, ResponseObject, ResponseToolkit } from 'hapi-latest';
+import { Request, ResponseObject, ResponseToolkit } from 'hapi';
 import { ObjectType, schema, TypeOf } from '../../config/schema';
 
 import { KibanaRequest } from './request';