[6.8] Upgrade some hapi related packages to their hapi-namespace counterparts (#98753)

package.json

@@ -133,7 +133,13 @@
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.2",
     "@elastic/ui-ace": "0.2.3",
+    "@hapi/boom": "^7.4.11",
     "@hapi/good-squeeze": "^6.0.0",
+    "@hapi/hoek": "^6.2.4",
+    "@hapi/inert": "^5.2.2",
+    "@hapi/oppsy": "^2.1.2",
+    "@hapi/podium": "^3.4.3",
+    "@hapi/vision": "^5.5.4",
     "@kbn/babel-code-parser": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/config-schema": "1.0.0",
@@ -159,7 +165,6 @@
     "babel-polyfill": "6.26.0",
     "babel-register": "6.26.0",
     "bluebird": "3.5.3",
-    "boom": "^7.3.0",
     "brace": "0.11.1",
     "cache-loader": "1.2.2",
     "chalk": "^2.4.1",
@@ -187,10 +192,8 @@
     "handlebars": "4.7.7",
     "hapi": "^17.8.5",
     "hjson": "3.1.0",
-    "hoek": "^6.1.3",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^5.0.0",
-    "inert": "^5.1.3",
     "joi": "^13.5.2",
     "jquery": "^3.5.0",
     "js-yaml": "3.13.1",
@@ -217,9 +220,7 @@
     "no-ui-slider": "1.2.0",
     "node-fetch": "1.3.2",
     "opn": "^5.4.0",
-    "oppsy": "^2.0.1",
     "pegjs": "0.9.0",
-    "podium": "^3.2.0",
     "postcss-loader": "3.0.0",
     "prop-types": "^15.7.2",
     "proxy-from-env": "1.0.0",
@@ -275,7 +276,6 @@
     "vega-lite": "^2.4.0",
     "vega-schema-url-parser": "1.0.0",
     "vega-tooltip": "^0.9.14",
-    "vision": "^5.4.4",
     "webpack": "4.26.1",
     "webpack-merge": "4.1.4",
     "whatwg-fetch": "^3.0.0",
@@ -298,7 +298,6 @@
     "@types/angular-mocks": "^1.7.0",
     "@types/babel-core": "^6.25.5",
     "@types/bluebird": "^3.1.1",
-    "@types/boom": "^7.2.0",
     "@types/chance": "^1.0.0",
     "@types/classnames": "^2.2.3",
     "@types/d3": "^3.5.41",
@@ -315,8 +314,10 @@
     "@types/globby": "^8.0.0",
     "@types/graphql": "^0.13.1",
     "@types/hapi": "^17.0.18",
+    "@types/hapi__boom": "^7.4.1",
+    "@types/hapi__hoek": "^6.2.0",
+    "@types/hapi__podium": "^3.4.1",
     "@types/has-ansi": "^3.0.0",
-    "@types/hoek": "^4.1.3",
     "@types/humps": "^1.1.2",
     "@types/jest": "^23.3.1",
     "@types/joi": "^13.4.2",
@@ -330,7 +331,6 @@
     "@types/mustache": "^0.8.31",
     "@types/node": "^10.12.27",
     "@types/opn": "^5.1.0",
-    "@types/podium": "^1.0.0",
     "@types/prop-types": "^15.7.3",
     "@types/puppeteer-core": "^1.9.0",
     "@types/react": "16.3.14",

src/core/server/http/http_tools.ts

@@ -17,9 +17,9 @@
  * under the License.
  */
 
+import Hoek from '@hapi/hoek';
 import { readFileSync } from 'fs';
 import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, Util } from 'hapi';
-import Hoek from 'hoek';
 import { ServerOptions as TLSOptions } from 'https';
 import { ValidationError } from 'joi';
 import { HttpConfig } from './http_config';

src/core/server/legacy_compat/logging/legacy_logging_server.ts

@@ -17,8 +17,8 @@
  * under the License.
  */
 
+import Podium from '@hapi/podium';
 import { ServerExtType } from 'hapi';
-import Podium from 'podium';
 // @ts-ignore: implicit any for JS file
 import { Config, transformDeprecations } from '../../../../server/config';
 // @ts-ignore: implicit any for JS file

src/legacy/core_plugins/console/index.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { resolve, join, sep } from 'path';
 import url from 'url';
 import { has, isEmpty, head } from 'lodash';

src/legacy/core_plugins/console/server/proxy_route.js

@@ -18,7 +18,7 @@
  */
 
 import Joi from 'joi';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Wreck from 'wreck';
 import { trimLeft, trimRight } from 'lodash';
 

src/legacy/core_plugins/elasticsearch/lib/cluster.js

@@ -20,7 +20,7 @@
 import elasticsearch from 'elasticsearch';
 import { get, set, isEmpty, cloneDeep, pick } from 'lodash';
 import toPath from 'lodash/internal/toPath';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import filterHeaders from './filter_headers';
 import { parseConfig } from './parse_config';

src/legacy/core_plugins/interpreter/server/routes/server_functions.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { serializeProvider } from '@kbn/interpreter/common';
 import { API_ROUTE } from '../../common/constants';
 import { createHandlers } from '../lib/create_handlers';

src/legacy/core_plugins/kibana/server/lib/handle_es_error.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import _ from 'lodash';
 import { errors as esErrors } from 'elasticsearch';
 

src/legacy/core_plugins/kibana/server/routes/api/export/index.js

@@ -18,7 +18,7 @@
  */
 
 import { exportDashboards } from '../../../lib/export/export_dashboards';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Joi from 'joi';
 import moment from 'moment';
 export function exportApi(server) {

src/legacy/core_plugins/kibana/server/routes/api/import/index.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Joi from 'joi';
 import { importDashboards } from '../../../lib/import/import_dashboards';
 

src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/index.js

@@ -18,7 +18,7 @@
  */
 
 import Joi from 'joi';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export function registerKqlTelemetryApi(server) {
   server.route({

src/legacy/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Joi from 'joi';
 import { findRelationships } from '../../../../lib/management/saved_objects/relationships';
 import { isNotFoundError } from '../../../../../../../../server/saved_objects/service/lib/errors';

src/legacy/core_plugins/metrics/server/routes/vis.js

@@ -18,7 +18,7 @@
  */
 
 import getVisData from '../lib/get_vis_data';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 export default (server) => {
 
   server.route({

src/optimize/base_optimizer.js

@@ -19,7 +19,7 @@
 
 import { writeFile } from 'fs';
 import os from 'os';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
 import webpack from 'webpack';

src/optimize/bundles_route/__tests__/bundles_route.js

@@ -24,7 +24,7 @@ import crypto from 'crypto';
 import Chance from 'chance';
 import expect from 'expect.js';
 import Hapi from 'hapi';
-import Inert from 'inert';
+import Inert from '@hapi/inert';
 import sinon from 'sinon';
 
 import { createBundlesRoute } from '../bundles_route';

src/optimize/bundles_route/dynamic_asset_response.js

@@ -20,7 +20,7 @@
 import { resolve } from 'path';
 import { open, fstat, createReadStream, close } from 'fs';
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { fromNode as fcb } from 'bluebird';
 
 import { getFileHash } from './file_hash';

src/server/http/index.js

@@ -20,7 +20,7 @@
 import { format } from 'url';
 import { resolve } from 'path';
 import _ from 'lodash';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Hapi from 'hapi';
 import { setupVersionCheck } from './version_check';
 import { registerHapiPlugins } from './register_hapi_plugins';

src/server/http/register_hapi_plugins.js

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import HapiTemplates from 'vision';
-import HapiStaticFiles from 'inert';
+import HapiTemplates from '@hapi/vision';
+import HapiStaticFiles from '@hapi/inert';
 import HapiProxy from 'h2o2';
 
 const plugins = [HapiTemplates, HapiStaticFiles, HapiProxy];

src/server/http/version_check.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { badRequest } from 'boom';
+import { badRequest } from '@hapi/boom';
 
 export function setupVersionCheck(server, config) {
   const versionHeader = 'kbn-version';

src/server/http/xsrf.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { badRequest } from 'boom';
+import { badRequest } from '@hapi/boom';
 
 export function setupXsrf(server, config) {
   const disabled = config.get('server.xsrf.disableProtection');

src/server/index_patterns/service/lib/errors.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { get } from 'lodash';
 
 const ERR_ES_INDEX_NOT_FOUND = 'index_not_found_exception';

src/server/pid/index.js

@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Promise from 'bluebird';
 import { unlinkSync as unlink } from 'fs';
 const writeFile = Promise.promisify(require('fs').writeFile);

src/server/sample_data/routes/install.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Joi from 'joi';
 
 import { loadData } from './lib/load_data';

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

@@ -60,7 +60,7 @@
  * given an empty migrationVersion property {} if no such property exists.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import _ from 'lodash';
 import Semver from 'semver';
 import { MigrationVersion, SavedObjectDoc } from '../../serialization';

src/server/saved_objects/service/lib/errors.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 const code = Symbol('SavedObjectsClientErrorCode');
 

src/server/saved_objects/service/lib/errors.test.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import {
   decorateBadRequestError,

src/server/saved_objects/service/lib/search_dsl/search_dsl.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { getQueryParams } from './query_params';
 import { getSortingParams } from './sorting_params';

src/server/saved_objects/service/lib/search_dsl/sorting_params.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { getProperty } from '../../../../mappings';
 

src/server/saved_objects/version/decode_version.test.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { decodeVersion } from './decode_version';
 

src/server/status/index.js

@@ -21,7 +21,7 @@ import ServerStatus from './server_status';
 import { Metrics } from './lib/metrics';
 import { registerStatusPage, registerStatusApi, registerStatsApi } from './routes';
 import { getOpsStatsCollector } from './collectors';
-import Oppsy from 'oppsy';
+import Oppsy from '@hapi/oppsy';
 import { cloneDeep } from 'lodash';
 import { getOSInfo } from './lib/get_os_info';
 

src/server/status/routes/api/register_stats.js

@@ -18,7 +18,7 @@
  */
 
 import Joi from 'joi';
-import boom from 'boom';
+import boom from '@hapi/boom';
 import { i18n }  from '@kbn/i18n';
 import { wrapAuthConfig } from '../../wrap_auth_config';
 import { KIBANA_STATS_TYPE } from '../../constants';

src/server/url_shortening/routes/lib/short_url_assert_valid.js

@@ -19,7 +19,7 @@
 
 import { parse } from 'url';
 import { trim } from 'lodash';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export function shortUrlAssertValid(url) {
   const { protocol, hostname, pathname } = parse(url);

src/server/url_shortening/routes/lib/short_url_error.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export function handleShortUrlError(error) {
   return Boom.boomify(error, {

src/ui/ui_render/ui_render_mixin.js

@@ -19,7 +19,7 @@
 
 import { createHash } from 'crypto';
 import { props, reduce as reduceAsync } from 'bluebird';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { resolve } from 'path';
 import { i18n } from '@kbn/i18n';
 import { AppBootstrap } from './bootstrap';

src/ui/ui_settings/ui_settings_service.js

@@ -18,7 +18,7 @@
  */
 
 import { defaultsDeep } from 'lodash';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { createOrUpgradeSavedConfig } from './create_or_upgrade_saved_config';
 

test/api_integration/apis/index_patterns/es_errors/errors.js

@@ -19,7 +19,7 @@
 
 import expect from 'expect.js';
 import { errors as esErrors } from 'elasticsearch';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import {
   isEsIndexNotFoundError,

tsconfig.json

@@ -15,6 +15,8 @@
     "jsx": "react",
     // Enables all strict type checking options.
     "strict": true,
+    // Do not check d.ts files by default
+    "skipLibCheck": true,
     // enables "core language features"
     "lib": [
       // ESNext auto includes previous versions all the way back to es5

x-pack/package.json

@@ -120,6 +120,8 @@
     "@elastic/node-crypto": "0.1.2",
     "@elastic/node-phantom-simple": "2.2.4",
     "@elastic/numeral": "2.3.2",
+    "@hapi/boom": "^7.4.11",
+    "@hapi/oppsy": "^2.1.2",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/es-query": "1.0.0",
     "@kbn/i18n": "1.0.0",
@@ -149,7 +151,6 @@
     "babel-runtime": "^6.26.0",
     "base64-js": "^1.2.1",
     "bluebird": "3.5.3",
-    "boom": "^7.3.0",
     "brace": "0.11.1",
     "chroma-js": "^1.3.6",
     "classnames": "2.2.5",
@@ -211,7 +212,6 @@
     "node-fetch": "^2.6.1",
     "nodemailer": "^6.4.16",
     "object-path-immutable": "^0.5.3",
-    "oppsy": "^2.0.1",
     "papaparse": "^5.2.0",
     "pdfmake": "^0.1.65",
     "pluralize": "3.1.0",

x-pack/plugins/apm/server/routes/errors.js

@@ -5,7 +5,7 @@
  */
 
 import Joi from 'joi';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { getDistribution } from '../lib/errors/distribution/get_distribution';
 import { getErrorGroups } from '../lib/errors/get_error_groups';

x-pack/plugins/apm/server/routes/metrics.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { Server } from 'hapi';
 import { withDefaultValidators } from '../lib/helpers/input_validation';
 import { setupRequest } from '../lib/helpers/setup_request';

x-pack/plugins/apm/server/routes/services.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { Server } from 'hapi';
 import {
   AgentName,

x-pack/plugins/apm/server/routes/status_check.js

@@ -5,7 +5,7 @@
  */
 
 import Joi from 'joi';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { getServerStatus } from '../lib/status_check/server_check';
 import { getAgentStatus } from '../lib/status_check/agent_check';
 import { setupRequest } from '../lib/helpers/setup_request';

x-pack/plugins/apm/server/routes/traces.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { Server } from 'hapi';
 import { withDefaultValidators } from '../lib/helpers/input_validation';
 import { setupRequest } from '../lib/helpers/setup_request';

x-pack/plugins/apm/server/routes/transaction_groups.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { Server } from 'hapi';
 import Joi from 'joi';
 import { withDefaultValidators } from '../lib/helpers/input_validation';

x-pack/plugins/apm/server/routes/transactions.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { Server } from 'hapi';
 import Joi from 'joi';
 import { withDefaultValidators } from '../lib/helpers/input_validation';

x-pack/plugins/beats_management/server/lib/framework.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { difference } from 'lodash';
 import {
   BackendFrameworkAdapter,

x-pack/plugins/beats_management/server/rest_api/__tests__/test_harnes.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { badRequest } from 'boom';
+import { badRequest } from '@hapi/boom';
 import { readFile } from 'fs';
 // @ts-ignore
 import Hapi from 'hapi';

x-pack/plugins/beats_management/server/rest_api/tokens/create.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import Joi from 'joi';
 import { get } from 'lodash';
 import { REQUIRED_LICENSES } from '../../../common/constants/security';

x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.ts

@@ -5,7 +5,7 @@
  */
 
 // @ts-ignore
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps ES errors into a Boom error response and returns it

x-pack/plugins/canvas/server/routes/workpad.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import boom from 'boom';
+import boom from '@hapi/boom';
 import {
   CANVAS_TYPE,
   API_ROUTE_WORKPAD,

x-pack/plugins/cross_cluster_replication/server/lib/error_wrappers/wrap_custom_error.js

@@ -4,7 +4,7 @@
 * you may not use this file except in compliance with the Elastic License.
 */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps a custom error into a Boom error response and returns it

x-pack/plugins/cross_cluster_replication/server/lib/error_wrappers/wrap_es_error.js

@@ -4,7 +4,7 @@
 * you may not use this file except in compliance with the Elastic License.
 */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 function extractCausedByChain(causedBy = {}, accumulator = []) {
   const { reason, caused_by } = causedBy; // eslint-disable-line camelcase

x-pack/plugins/cross_cluster_replication/server/lib/error_wrappers/wrap_unknown_error.js

@@ -4,7 +4,7 @@
 * you may not use this file except in compliance with the Elastic License.
 */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps an unknown error into a Boom error response and returns it

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern.js

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { callWithRequestFactory } from '../../lib/call_with_request_factory';
 import { isEsErrorFactory } from '../../lib/is_es_error_factory';
 import { wrapEsError, wrapUnknownError } from '../../lib/error_wrappers';

x-pack/plugins/cross_cluster_replication/server/routes/api/ccr.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { callWithRequestFactory } from '../../lib/call_with_request_factory';
 import { isEsErrorFactory } from '../../lib/is_es_error_factory';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { callWithRequestFactory } from '../../lib/call_with_request_factory';
 import { isEsErrorFactory } from '../../lib/is_es_error_factory';
 import { wrapEsError, wrapUnknownError } from '../../lib/error_wrappers';

x-pack/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import {
   AUTH_SCOPE_DASHBORD_ONLY_MODE

x-pack/plugins/graph/index.js

@@ -5,7 +5,7 @@
  */
 
 import { resolve } from 'path';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { initServer } from './server';
 import mappings from './mappings.json';

x-pack/plugins/graph/server/init_server.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { mirrorPluginStatus } from '../../../server/lib/mirror_plugin_status';
 import { checkLicense } from './lib';

x-pack/plugins/graph/server/lib/es/call_es_graph_explore_api.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { get } from 'lodash';
 
 export async function callEsGraphExploreApi({ callCluster, index, query }) {

x-pack/plugins/graph/server/lib/es/call_es_search_api.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export async function callEsSearchApi({ callCluster, index, body, queryParams }) {
   try {

x-pack/plugins/graph/server/lib/pre/verify_api_access_pre.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export function verifyApiAccessPre(request, h) {
   const xpackInfo = request.server.plugins.xpack_main.info;

x-pack/plugins/graph/server/routes/search_proxy.js

@@ -5,7 +5,7 @@
  */
 
 import Joi from 'joi';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import {
   verifyApiAccessPre,

x-pack/plugins/grokdebugger/server/lib/error_wrappers/wrap_es_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps ES errors into a Boom error response and returns it

x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js

@@ -5,7 +5,7 @@
  */
 
 import expect from 'expect.js';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { licensePreRoutingFactory } from '../license_pre_routing_factory';
 
 describe('license_pre_routing_factory', () => {

x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/license_pre_routing_factory.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { PLUGIN } from '../../../common/constants';
 
 export const licensePreRoutingFactory = (server) => {

x-pack/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_custom_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps a custom error into a Boom error response and returns it

x-pack/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_es_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps an error thrown by the ES JS client into a Boom error response and returns it

x-pack/plugins/index_lifecycle_management/server/lib/error_wrappers/wrap_unknown_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps an unknown error into a Boom error response and returns it

x-pack/plugins/index_management/server/lib/error_wrappers/wrap_custom_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps a custom error into a Boom error response and returns it

x-pack/plugins/index_management/server/lib/error_wrappers/wrap_es_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps an error thrown by the ES JS client into a Boom error response and returns it

x-pack/plugins/index_management/server/lib/error_wrappers/wrap_unknown_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps an unknown error into a Boom error response and returns it

x-pack/plugins/infra/package.json

@@ -8,12 +8,12 @@
     "build-graphql-types": "node scripts/generate_types_from_graphql.js"
   },
   "devDependencies": {
-    "@types/boom": "7.2.0",
+    "@types/hapi__boom": "^7.4.1",
     "@types/lodash": "^4.14.110"
   },
   "dependencies": {
+    "@hapi/boom": "^7.4.11",
     "@types/color": "^3.0.0",
-    "boom": "^7.3.0",
     "lodash": "^4.17.21"
   }
 }

x-pack/plugins/infra/server/lib/adapters/framework/apollo_server_hapi.ts

@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import Boom from '@hapi/boom';
 import * as GraphiQL from 'apollo-server-module-graphiql';
-import Boom from 'boom';
 import { Plugin, Request, ResponseToolkit, RouteOptions, Server } from 'hapi';
 
 import { GraphQLOptions, runHttpQuery } from 'apollo-server-core';

x-pack/plugins/infra/server/logging_legacy/adjacent_search_results.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as Boom from 'boom';
+import * as Boom from '@hapi/boom';
 import { SearchParams } from 'elasticsearch';
 import * as Joi from 'joi';
 

x-pack/plugins/infra/server/logging_legacy/contained_search_results.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as Boom from 'boom';
+import * as Boom from '@hapi/boom';
 import { SearchParams } from 'elasticsearch';
 import * as Joi from 'joi';
 

x-pack/plugins/infra/server/logging_legacy/search_summary.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as Boom from 'boom';
+import * as Boom from '@hapi/boom';
 import { SearchParams } from 'elasticsearch';
 import * as Joi from 'joi';
 

x-pack/plugins/license_management/server/lib/wrap_es_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps ES errors into a Boom error response and returns it

x-pack/plugins/logstash/server/lib/error_wrappers/wrap_custom_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps a custom error into a Boom error response and returns it

x-pack/plugins/logstash/server/lib/error_wrappers/wrap_es_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
 
 /**

x-pack/plugins/logstash/server/lib/error_wrappers/wrap_unknown_error.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 /**
  * Wraps an unknown error into a Boom error response and returns it

x-pack/plugins/logstash/server/models/pipeline/pipeline.js

@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment';
-import { badRequest } from 'boom';
+import { badRequest } from '@hapi/boom';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 

x-pack/plugins/logstash/server/routes/api/cluster/register_load_route.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { callWithRequestFactory } from '../../../lib/call_with_request_factory';
 import { Cluster } from '../../../models/cluster';
 import { licensePreRoutingFactory } from'../../../lib/license_pre_routing_factory';

x-pack/plugins/logstash/server/routes/api/pipeline/register_load_route.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { INDEX_NAMES, TYPE_NAMES } from '../../../../common/constants';
 import { callWithRequestFactory } from '../../../lib/call_with_request_factory';
 import { Pipeline } from '../../../models/pipeline';

x-pack/plugins/ml/index.js

@@ -7,7 +7,7 @@
 
 
 import { resolve } from 'path';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { checkLicense } from './server/lib/check_license';
 import { FEATURE_ANNOTATIONS_ENABLED } from './common/constants/feature_flags';
 

x-pack/plugins/ml/server/client/errors.js

@@ -6,7 +6,7 @@
 
 
 
-import { boomify } from 'boom';
+import { boomify } from '@hapi/boom';
 
 export function wrapError(error) {
   return boomify(error, { statusCode: error.status });

x-pack/plugins/ml/server/models/annotation_service/annotation.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import _ from 'lodash';
 
 import { ANNOTATION_DOC_TYPE, ANNOTATION_TYPE } from '../../../common/constants/annotations';

x-pack/plugins/ml/server/models/calendar/calendar_manager.js

@@ -7,7 +7,7 @@
 
 
 import _ from 'lodash';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { EventManager } from './event_manager';
 
 export class CalendarManager {

x-pack/plugins/ml/server/models/calendar/event_manager.js

@@ -6,7 +6,7 @@
 
 
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export class EventManager {
 

x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.js

@@ -7,7 +7,7 @@
 
 
 import fs from 'fs';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import { prefixDatafeedId } from '../../../common/util/job_utils';
 import { mlLog } from '../../client/log';
 

x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.js

@@ -5,7 +5,7 @@
  */
 
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import fs from 'fs';
 import os from 'os';
 const util = require('util');

x-pack/plugins/ml/server/models/filter/filter_manager.js

@@ -5,7 +5,7 @@
  */
 
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 export class FilterManager {
 

x-pack/plugins/ml/server/models/job_validation/job_validation.js

@@ -7,7 +7,7 @@
 
 
 import { i18n } from '@kbn/i18n';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { fieldsServiceProvider } from '../fields_service';
 import { renderTemplate } from '../../../common/util/string_utils';

x-pack/plugins/ml/server/routes/annotations.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 

x-pack/plugins/ml/server/routes/job_validation.js

@@ -6,7 +6,7 @@
 
 
 
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { callWithRequestFactory } from '../client/call_with_request_factory';
 import { wrapError } from '../client/errors';

x-pack/plugins/ml/server/routes/system.js

@@ -11,7 +11,7 @@ import { callWithInternalUserFactory } from '../client/call_with_internal_user_f
 import { mlLog } from '../client/log';
 
 import { wrapError } from '../client/errors';
-import Boom from 'boom';
+import Boom from '@hapi/boom';
 
 import { isSecurityDisabled } from '../lib/security_utils';
 

x-pack/plugins/monitoring/public/components/no_data/__tests__/checker_errors.test.js

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { boomify, forbidden } from 'boom';
+import { boomify, forbidden } from '@hapi/boom';
 import { renderWithIntl } from '../../../../../../test_utils/enzyme_helpers';
 import { CheckerErrors } from '../checker_errors';
 

x-pack/plugins/monitoring/public/lib/elasticsearch_settings/__tests__/enabler.test.js

@@ -6,7 +6,7 @@
 
 import { Enabler } from '../';
 import sinon from 'sinon';
-import { forbidden } from 'boom';
+import { forbidden } from '@hapi/boom';
 
 const updateModel = properties => properties;
 const updateModelSpy = sinon.spy(updateModel);

x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.js

@@ -10,7 +10,7 @@ import {
   KIBANA_STATS_TYPE_MONITORING,
 } from '../../../common/constants';
 import { opsBuffer } from './ops_buffer';
-import Oppsy from 'oppsy';
+import Oppsy from '@hapi/oppsy';
 import { cloneDeep } from 'lodash';
 
 let bufferHadEvents = false;

x-pack/plugins/monitoring/server/lib/cluster/get_cluster_stats.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { badRequest, notFound } from 'boom';
+import { badRequest, notFound } from '@hapi/boom';
 import { getClustersStats } from './get_clusters_stats';
 import { i18n } from '@kbn/i18n';