Skip to content

Commit 0601e61

Browse files
committed
cleanup xpack_main legacy plugin, remove capabilities mixin
1 parent 1e20cd4 commit 0601e61

13 files changed

Lines changed: 14 additions & 549 deletions

File tree

src/legacy/server/capabilities/capabilities_mixin.test.ts

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/legacy/server/capabilities/capabilities_mixin.ts

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/legacy/server/capabilities/index.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/legacy/server/kbn_server.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import configCompleteMixin from './config/complete';
3434
import { optimizeMixin } from '../../optimize';
3535
import * as Plugins from './plugins';
3636
import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
37-
import { capabilitiesMixin } from './capabilities';
3837
import { serverExtensionsMixin } from './server_extensions';
3938
import { uiMixin } from '../ui';
4039
import { i18nMixin } from './i18n';
@@ -115,9 +114,6 @@ export default class KbnServer {
115114
// setup saved object routes
116115
savedObjectsMixin,
117116

118-
// setup capabilities routes
119-
capabilitiesMixin,
120-
121117
// setup routes that serve the @kbn/optimizer output
122118
optimizeMixin,
123119

x-pack/legacy/plugins/xpack_main/index.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66

77
import { resolve } from 'path';
88
import { mirrorPluginStatus } from '../../server/lib/mirror_plugin_status';
9-
import { replaceInjectedVars } from './server/lib/replace_injected_vars';
109
import { setupXPackMain } from './server/lib/setup_xpack_main';
1110
import { xpackInfoRoute, settingsRoute } from './server/routes/api/v1';
1211

13-
export { callClusterFactory } from './server/lib/call_cluster_factory';
14-
1512
export const xpackMain = (kibana) => {
1613
return new kibana.Plugin({
1714
id: 'xpack_main',
@@ -25,32 +22,7 @@ export const xpackMain = (kibana) => {
2522
}).default();
2623
},
2724

28-
uiCapabilities(server) {
29-
const featuresPlugin = server.newPlatform.setup.plugins.features;
30-
if (!featuresPlugin) {
31-
throw new Error('New Platform XPack Features plugin is not available.');
32-
}
33-
return featuresPlugin.getFeaturesUICapabilities();
34-
},
35-
36-
uiExports: {
37-
replaceInjectedVars,
38-
injectDefaultVars(server) {
39-
const config = server.config();
40-
41-
return {
42-
activeSpace: null,
43-
spacesEnabled: config.get('xpack.spaces.enabled'),
44-
};
45-
},
46-
},
47-
4825
init(server) {
49-
const featuresPlugin = server.newPlatform.setup.plugins.features;
50-
if (!featuresPlugin) {
51-
throw new Error('New Platform XPack Features plugin is not available.');
52-
}
53-
5426
mirrorPluginStatus(server.plugins.elasticsearch, this, 'yellow', 'red');
5527

5628
setupXPackMain(server);

x-pack/legacy/plugins/xpack_main/server/lib/__tests__/call_cluster_factory.js

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)