remove legacy ES plug

elastic · Sep 17, 2020 · 7699afa · 7699afa
1 parent dd8db10
commit 7699afa
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 878 deletions.
diff --git a/kibana.d.ts b/kibana.d.ts
@@ -28,7 +28,6 @@ export { Public, Server };
 /**
  * All exports from TS ambient definitions (where types are added for JS source in a .d.ts file).
  */
-import * as LegacyElasticsearch from './src/legacy/core_plugins/elasticsearch';
 import * as LegacyKibanaPluginSpec from './src/legacy/plugin_discovery/plugin_spec/plugin_spec_options';
 import * as LegacyKibanaServer from './src/legacy/server/kbn_server';
 
@@ -44,13 +43,4 @@ export namespace Legacy {
   export type InitPluginFunction = LegacyKibanaPluginSpec.InitPluginFunction;
   export type UiExports = LegacyKibanaPluginSpec.UiExports;
   export type PluginSpecOptions = LegacyKibanaPluginSpec.PluginSpecOptions;
-
-  export namespace Plugins {
-    export namespace elasticsearch {
-      export type Plugin = LegacyElasticsearch.ElasticsearchPlugin;
-      export type Cluster = LegacyElasticsearch.Cluster;
-      export type ClusterConfig = LegacyElasticsearch.ClusterConfig;
-      export type CallClusterOptions = LegacyElasticsearch.CallClusterOptions;
-    }
-  }
 }
diff --git a/src/legacy/core_plugins/elasticsearch/index.d.ts b/src/legacy/core_plugins/elasticsearch/index.d.ts
diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
diff --git a/src/legacy/core_plugins/elasticsearch/package.json b/src/legacy/core_plugins/elasticsearch/package.json
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/abortable_request_handler.js b/src/legacy/core_plugins/elasticsearch/server/lib/abortable_request_handler.js
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/abortable_request_handler.test.js b/src/legacy/core_plugins/elasticsearch/server/lib/abortable_request_handler.test.js
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/cluster.ts b/src/legacy/core_plugins/elasticsearch/server/lib/cluster.ts
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/create_proxy.js b/src/legacy/core_plugins/elasticsearch/server/lib/create_proxy.js
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
@@ -33,18 +33,14 @@ import {
 import { LegacyConfig, ILegacyInternals } from '../../core/server/legacy';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { UiPlugins } from '../../core/server/plugins';
-import { ElasticsearchPlugin } from '../core_plugins/elasticsearch';
 
 // lot of legacy code was assuming this type only had these two methods
 export type KibanaConfig = Pick<LegacyConfig, 'get' | 'has'>;
 
 // Extend the defaults with the plugins and server methods we need.
 declare module 'hapi' {
   interface PluginProperties {
-    elasticsearch: ElasticsearchPlugin;
-    kibana: any;
     spaces: any;
-    // add new plugin types here
   }
 
   interface Server {

diff --git a/test/api_integration/apis/elasticsearch/index.js b/test/api_integration/apis/elasticsearch/index.js
diff --git a/test/api_integration/apis/index.js b/test/api_integration/apis/index.js
@@ -20,7 +20,6 @@
 export default function ({ loadTestFile }) {
   describe('apis', () => {
     loadTestFile(require.resolve('./core'));
-    loadTestFile(require.resolve('./elasticsearch'));
     loadTestFile(require.resolve('./general'));
     loadTestFile(require.resolve('./home'));
     loadTestFile(require.resolve('./index_patterns'));

diff --git a/x-pack/legacy/plugins/security/index.ts b/x-pack/legacy/plugins/security/index.ts
@@ -11,7 +11,7 @@ export const security = (kibana: Record<string, any>) =>
   new kibana.Plugin({
     id: 'security',
     publicDir: resolve(__dirname, 'public'),
-    require: ['elasticsearch'],
+    require: [],
     configPrefix: 'xpack.security',
     config: (Joi: Root) =>
       Joi.object({ enabled: Joi.boolean().default(true) })

diff --git a/x-pack/legacy/plugins/spaces/index.ts b/x-pack/legacy/plugins/spaces/index.ts
@@ -16,7 +16,7 @@ export const spaces = (kibana: Record<string, any>) =>
     id: 'spaces',
     configPrefix: 'xpack.spaces',
     publicDir: resolve(__dirname, 'public'),
-    require: ['elasticsearch', 'xpack_main'],
+    require: ['xpack_main'],
     config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),