Remove legacy plugins support

.eslintrc.js

@@ -17,9 +17,6 @@
  * under the License.
  */
 
-const { readdirSync } = require('fs');
-const { resolve } = require('path');
-
 const APACHE_2_0_LICENSE_HEADER = `
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -341,14 +338,6 @@ module.exports = {
                   '(src|x-pack)/plugins/**/*',
                   '!(src|x-pack)/plugins/**/server/**/*',
 
-                  'src/legacy/core_plugins/**/*',
-                  '!src/legacy/core_plugins/**/server/**/*',
-                  '!src/legacy/core_plugins/**/index.{js,mjs,ts,tsx}',
-
-                  'x-pack/legacy/plugins/**/*',
-                  '!x-pack/legacy/plugins/**/server/**/*',
-                  '!x-pack/legacy/plugins/**/index.{js,mjs,ts,tsx}',
-
                   'examples/**/*',
                   '!examples/**/server/**/*',
                 ],
@@ -370,12 +359,7 @@ module.exports = {
               },
               {
                 target: ['src/core/**/*'],
-                from: [
-                  'plugins/**/*',
-                  'src/plugins/**/*',
-                  'src/legacy/core_plugins/**/*',
-                  'src/legacy/ui/**/*',
-                ],
+                from: ['plugins/**/*', 'src/plugins/**/*', 'src/legacy/ui/**/*'],
                 errorMessage: 'The core cannot depend on any plugins.',
               },
               {
@@ -388,12 +372,6 @@ module.exports = {
                 target: [
                   'test/plugin_functional/plugins/**/public/np_ready/**/*',
                   'test/plugin_functional/plugins/**/server/np_ready/**/*',
-                  'src/legacy/core_plugins/**/public/np_ready/**/*',
-                  'src/legacy/core_plugins/vis_type_*/public/**/*',
-                  '!src/legacy/core_plugins/vis_type_*/public/legacy*',
-                  'src/legacy/core_plugins/**/server/np_ready/**/*',
-                  'x-pack/legacy/plugins/**/public/np_ready/**/*',
-                  'x-pack/legacy/plugins/**/server/np_ready/**/*',
                 ],
                 allowSameFolder: true,
                 errorMessage:
@@ -450,15 +428,7 @@ module.exports = {
             forceNode: false,
             rootPackageName: 'kibana',
             kibanaPath: '.',
-            pluginMap: readdirSync(resolve(__dirname, 'x-pack/legacy/plugins')).reduce(
-              (acc, name) => {
-                if (!name.startsWith('_')) {
-                  acc[name] = `x-pack/legacy/plugins/${name}`;
-                }
-                return acc;
-              },
-              {}
-            ),
+            pluginMap: {},
           },
         },
       },
@@ -764,16 +734,6 @@ module.exports = {
       },
     },
 
-    /**
-     * GIS overrides
-     */
-    {
-      files: ['x-pack/legacy/plugins/maps/**/*.js'],
-      rules: {
-        'react/prefer-stateless-function': [0, { ignorePureComponents: false }],
-      },
-    },
-
     /**
      * ML overrides
      */
@@ -1238,10 +1198,7 @@ module.exports = {
      * TSVB overrides
      */
     {
-      files: [
-        'src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
-        'src/legacy/core_plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}',
-      ],
+      files: ['src/plugins/vis_type_timeseries/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'import/no-default-export': 'error',
       },

.github/CODEOWNERS

@@ -71,7 +71,7 @@
 /x-pack/plugins/apm/server/projections/rum_overview.ts @elastic/uptime
 
 # Beats
-/x-pack/legacy/plugins/beats_management/  @elastic/beats
+/x-pack/plugins/beats_management/  @elastic/beats
 
 # Canvas
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
@@ -85,16 +85,13 @@
 /x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
 
 # Observability UIs
-/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
-/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
 # Machine Learning
-/x-pack/legacy/plugins/ml/  @elastic/ml-ui
 /x-pack/plugins/ml/  @elastic/ml-ui
 /x-pack/test/functional/apps/machine_learning/  @elastic/ml-ui
 /x-pack/test/functional/services/machine_learning/  @elastic/ml-ui
@@ -106,7 +103,6 @@
 /x-pack/test/functional/services/transform.ts @elastic/ml-ui
 
 # Maps
-/x-pack/legacy/plugins/maps/ @elastic/kibana-gis
 /x-pack/plugins/maps/ @elastic/kibana-gis
 /x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
 /x-pack/test/functional/apps/maps/ @elastic/kibana-gis
@@ -233,13 +229,8 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /src/plugins/dev_tools/ @elastic/es-ui
 /src/plugins/console/  @elastic/es-ui
 /src/plugins/es_ui_shared/  @elastic/es-ui
-/x-pack/legacy/plugins/cross_cluster_replication/  @elastic/es-ui
+/x-pack/plugins/cross_cluster_replication/  @elastic/es-ui
 /x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
-/x-pack/legacy/plugins/index_management/  @elastic/es-ui
-/x-pack/legacy/plugins/license_management/  @elastic/es-ui
-/x-pack/legacy/plugins/rollup/  @elastic/es-ui
-/x-pack/legacy/plugins/snapshot_restore/  @elastic/es-ui
-/x-pack/legacy/plugins/upgrade_assistant/  @elastic/es-ui
 /x-pack/plugins/console_extensions/  @elastic/es-ui
 /x-pack/plugins/es_ui_shared/  @elastic/es-ui
 /x-pack/plugins/grokdebugger/  @elastic/es-ui

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 LegacyKibanaPluginSpec from './src/legacy/plugin_discovery/plugin_spec/plugin_spec_options';
 import * as LegacyKibanaServer from './src/legacy/server/kbn_server';
 
 /**
@@ -39,8 +38,4 @@ export namespace Legacy {
   export type Request = LegacyKibanaServer.Request;
   export type ResponseToolkit = LegacyKibanaServer.ResponseToolkit;
   export type Server = LegacyKibanaServer.Server;
-
-  export type InitPluginFunction = LegacyKibanaPluginSpec.InitPluginFunction;
-  export type UiExports = LegacyKibanaPluginSpec.UiExports;
-  export type PluginSpecOptions = LegacyKibanaPluginSpec.PluginSpecOptions;
 }

src/cli/serve/serve.js

@@ -48,11 +48,6 @@ const CAN_CLUSTER = canRequire(CLUSTER_MANAGER_PATH);
 const REPL_PATH = resolve(__dirname, '../repl');
 const CAN_REPL = canRequire(REPL_PATH);
 
-// xpack is installed in both dev and the distributable, it's optional if
-// install is a link to the source, not an actual install
-const XPACK_DIR = resolve(__dirname, '../../../x-pack');
-const XPACK_INSTALLED = canRequire(XPACK_DIR);
-
 const pathCollector = function () {
   const paths = [];
   return function (path) {
@@ -137,16 +132,7 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
   if (opts.logFile) set('logging.dest', opts.logFile);
 
   set('plugins.scanDirs', _.compact([].concat(get('plugins.scanDirs'), opts.pluginDir)));
-  set(
-    'plugins.paths',
-    _.compact(
-      [].concat(
-        get('plugins.paths'),
-        opts.pluginPath,
-        XPACK_INSTALLED && !opts.oss ? [XPACK_DIR] : []
-      )
-    )
-  );
+  set('plugins.paths', _.compact([].concat(get('plugins.paths'), opts.pluginPath)));
 
   merge(extraCliOptions);
   merge(readKeystore());

src/core/server/index.ts

@@ -341,9 +341,7 @@ export {
 export {
   LegacyServiceSetupDeps,
   LegacyServiceStartDeps,
-  LegacyServiceDiscoverPlugins,
   LegacyConfig,
-  LegacyUiExports,
   LegacyInternals,
 } from './legacy';
 

src/core/server/legacy/config/ensure_valid_configuration.test.ts

@@ -39,17 +39,12 @@ describe('ensureValidConfiguration', () => {
       configService as any,
       {
         settings: 'settings',
-        pluginSpecs: 'pluginSpecs',
-        disabledPluginSpecs: 'disabledPluginSpecs',
-        pluginExtendedConfig: 'pluginExtendedConfig',
-        uiExports: 'uiExports',
+        legacyConfig: 'pluginExtendedConfig',
       } as any
     );
     expect(getUnusedConfigKeys).toHaveBeenCalledTimes(1);
     expect(getUnusedConfigKeys).toHaveBeenCalledWith({
       coreHandledConfigPaths: ['core', 'elastic'],
-      pluginSpecs: 'pluginSpecs',
-      disabledPluginSpecs: 'disabledPluginSpecs',
       settings: 'settings',
       legacyConfig: 'pluginExtendedConfig',
     });

src/core/server/legacy/config/ensure_valid_configuration.ts

@@ -19,19 +19,17 @@
 
 import { getUnusedConfigKeys } from './get_unused_config_keys';
 import { ConfigService } from '../../config';
-import { LegacyServiceDiscoverPlugins } from '../types';
 import { CriticalError } from '../../errors';
+import { LegacyServiceSetupConfig } from '../types';
 
 export async function ensureValidConfiguration(
   configService: ConfigService,
-  { pluginSpecs, disabledPluginSpecs, pluginExtendedConfig, settings }: LegacyServiceDiscoverPlugins
+  { legacyConfig, settings }: LegacyServiceSetupConfig
 ) {
   const unusedConfigKeys = await getUnusedConfigKeys({
     coreHandledConfigPaths: await configService.getUsedPaths(),
-    pluginSpecs,
-    disabledPluginSpecs,
     settings,
-    legacyConfig: pluginExtendedConfig,
+    legacyConfig,
   });
 
   if (unusedConfigKeys.length > 0) {

src/core/server/legacy/config/get_unused_config_keys.test.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { LegacyPluginSpec, LegacyConfig, LegacyVars } from '../types';
+import { LegacyConfig, LegacyVars } from '../types';
 import { getUnusedConfigKeys } from './get_unused_config_keys';
 
 describe('getUnusedConfigKeys', () => {
@@ -35,8 +35,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {},
           legacyConfig: getConfig(),
         })
@@ -47,8 +45,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {
             presentInBoth: true,
             alsoInBoth: 'someValue',
@@ -65,8 +61,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {
             presentInBoth: true,
           },
@@ -82,8 +76,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {
             presentInBoth: true,
             onlyInSetting: 'value',
@@ -99,8 +91,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {
             elasticsearch: {
               username: 'foo',
@@ -121,8 +111,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {
             env: 'development',
           },
@@ -139,8 +127,6 @@ describe('getUnusedConfigKeys', () => {
       expect(
         await getUnusedConfigKeys({
           coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
           settings: {
             prop: ['a', 'b', 'c'],
           },
@@ -152,40 +138,10 @@ describe('getUnusedConfigKeys', () => {
     });
   });
 
-  it('ignores config for plugins that are disabled', async () => {
-    expect(
-      await getUnusedConfigKeys({
-        coreHandledConfigPaths: [],
-        pluginSpecs: [],
-        disabledPluginSpecs: [
-          ({
-            id: 'foo',
-            getConfigPrefix: () => 'foo.bar',
-          } as unknown) as LegacyPluginSpec,
-        ],
-        settings: {
-          foo: {
-            bar: {
-              unused: true,
-            },
-          },
-          plugin: {
-            missingProp: false,
-          },
-        },
-        legacyConfig: getConfig({
-          prop: 'a',
-        }),
-      })
-    ).toEqual(['plugin.missingProp']);
-  });
-
   it('ignores properties managed by the new platform', async () => {
     expect(
       await getUnusedConfigKeys({
         coreHandledConfigPaths: ['core', 'foo.bar'],
-        pluginSpecs: [],
-        disabledPluginSpecs: [],
         settings: {
           core: {
             prop: 'value',
@@ -204,8 +160,6 @@ describe('getUnusedConfigKeys', () => {
     expect(
       await getUnusedConfigKeys({
         coreHandledConfigPaths: ['core', 'array'],
-        pluginSpecs: [],
-        disabledPluginSpecs: [],
         settings: {
           core: {
             prop: 'value',

src/core/server/legacy/config/get_unused_config_keys.ts

@@ -19,30 +19,20 @@
 
 import { difference } from 'lodash';
 import { getFlattenedObject } from '@kbn/std';
-import { unset } from '../../../../legacy/utils';
 import { hasConfigPathIntersection } from '../../config';
-import { LegacyPluginSpec, LegacyConfig, LegacyVars } from '../types';
+import { LegacyConfig, LegacyVars } from '../types';
 
 const getFlattenedKeys = (object: object) => Object.keys(getFlattenedObject(object));
 
 export async function getUnusedConfigKeys({
   coreHandledConfigPaths,
-  pluginSpecs,
-  disabledPluginSpecs,
   settings,
   legacyConfig,
 }: {
   coreHandledConfigPaths: string[];
-  pluginSpecs: LegacyPluginSpec[];
-  disabledPluginSpecs: LegacyPluginSpec[];
   settings: LegacyVars;
   legacyConfig: LegacyConfig;
 }) {
-  // remove config values from disabled plugins
-  for (const spec of disabledPluginSpecs) {
-    unset(settings, spec.getConfigPrefix());
-  }
-
   const inputKeys = getFlattenedKeys(settings);
   const appliedKeys = getFlattenedKeys(legacyConfig.get());