remove HAPI plugins registration from legacy (#94262)

* remove HAPI plugins registration from legacy * remove duplicate legacy integration tests
elastic · Mar 10, 2021 · 00fcc2d · 00fcc2d
1 parent 066e47e
commit 00fcc2d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 106 deletions.
diff --git a/package.json b/package.json
@@ -115,7 +115,6 @@
     "@hapi/hoek": "^9.1.1",
     "@hapi/inert": "^6.0.3",
     "@hapi/podium": "^4.1.1",
-    "@hapi/vision": "^6.0.1",
     "@hapi/wreck": "^17.1.0",
     "@kbn/ace": "link:packages/kbn-ace",
     "@kbn/analytics": "link:packages/kbn-analytics",

diff --git a/src/legacy/server/http/index.js b/src/legacy/server/http/index.js
@@ -9,15 +9,10 @@
 import { format } from 'url';
 import Boom from '@hapi/boom';
 
-import { registerHapiPlugins } from './register_hapi_plugins';
-import { setupBasePathProvider } from './setup_base_path_provider';
-
 export default async function (kbnServer, server) {
   server = kbnServer.server;
 
-  setupBasePathProvider(kbnServer);
-
-  await registerHapiPlugins(server);
+  const getBasePath = (request) => kbnServer.newPlatform.setup.core.http.basePath.get(request);
 
   server.route({
     method: 'GET',
@@ -27,8 +22,8 @@ export default async function (kbnServer, server) {
       if (path === '/' || path.charAt(path.length - 1) !== '/') {
         throw Boom.notFound();
       }
-
-      const pathPrefix = req.getBasePath() ? `${req.getBasePath()}/` : '';
+      const basePath = getBasePath(req);
+      const pathPrefix = basePath ? `${basePath}/` : '';
       return h
         .redirect(
           format({

diff --git a/src/legacy/server/http/integration_tests/max_payload_size.test.js b/src/legacy/server/http/integration_tests/max_payload_size.test.js
diff --git a/src/legacy/server/http/register_hapi_plugins.js b/src/legacy/server/http/register_hapi_plugins.js
diff --git a/src/legacy/server/http/setup_base_path_provider.js b/src/legacy/server/http/setup_base_path_provider.js
diff --git a/yarn.lock b/yarn.lock
@@ -2016,16 +2016,6 @@
   dependencies:
     "@hapi/hoek" "9.x.x"
 
-"@hapi/vision@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@hapi/vision/-/vision-6.0.1.tgz#976c3575be56d3cb5b472ddcfe0b7403778706fd"
-  integrity sha512-xv4PwmhbXCLzDfojZ7l4+P/YynBhMInV8GtLPH4gB74prhwOl8lGcJxxK8V9rf1aMH/vonM5yVGd9FuoA9sT0A==
-  dependencies:
-    "@hapi/boom" "9.x.x"
-    "@hapi/bounce" "2.x.x"
-    "@hapi/hoek" "9.x.x"
-    "@hapi/validate" "1.x.x"
-
 "@hapi/[email protected]", "@hapi/wreck@^17.0.0", "@hapi/wreck@^17.1.0":
   version "17.1.0"
   resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-17.1.0.tgz#fbdc380c6f3fa1f8052dc612b2d3b6ce3e88dbec"