don't register any features in LP. (#65611)

* don't register any features in LP. breaks features value reading in KP * move test plugin to NP * fix mappings * update docs * migrate another test * use contstants file for BWC with original code Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
2025-04-24 09:48:58 -04:00 · 2020-05-11 18:43:45 +02:00 · 2020-05-11 18:43:45 +02:00 · 4912153ce6
commit 4912153ce6
parent a1a157dc87
20 changed files with 215 additions and 175 deletions
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md
@ -10,6 +10,7 @@
 fields?: {
        [subfield: string]: {
            type: string;
+            ignore_above?: number;
        };
    };
 ```
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
@ -17,7 +17,7 @@ export interface SavedObjectsCoreFieldMapping
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | <code>boolean</code> |  |
-|  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>            ignore_above?: number;</code><br/><code>        };</code><br/><code>    }</code> |  |
 |  [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> |  |
 |  [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> |  |
--- a/src/core/server/saved_objects/mappings/types.ts
+++ b/src/core/server/saved_objects/mappings/types.ts
@ -137,6 +137,7 @@ export interface SavedObjectsCoreFieldMapping {
  fields?: {
    [subfield: string]: {
      type: string;
+      ignore_above?: number;
    };
  };
 }
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@ -1884,6 +1884,7 @@ export interface SavedObjectsCoreFieldMapping {
    fields?: {
        [subfield: string]: {
            type: string;
+            ignore_above?: number;
        };
    };
    // (undocumented)
--- a/x-pack/legacy/plugins/maps/server/plugin.js
+++ b/x-pack/legacy/plugins/maps/server/plugin.js
@ -19,42 +19,10 @@ import { emsBoundariesSpecProvider } from './tutorials/ems';

 export class MapPlugin {
  setup(core, plugins, __LEGACY) {
-    const { featuresPlugin, home, licensing, usageCollection, mapsLegacy } = plugins;
+    const { home, licensing, usageCollection, mapsLegacy } = plugins;
    let routesInitialized = false;
    const mapConfig = mapsLegacy.config;

-    featuresPlugin.registerFeature({
-      id: APP_ID,
-      name: i18n.translate('xpack.maps.featureRegistry.mapsFeatureName', {
-        defaultMessage: 'Maps',
-      }),
-      order: 600,
-      icon: APP_ICON,
-      navLinkId: APP_ID,
-      app: [APP_ID, 'kibana'],
-      catalogue: [APP_ID],
-      privileges: {
-        all: {
-          app: [APP_ID, 'kibana'],
-          catalogue: [APP_ID],
-          savedObject: {
-            all: [MAP_SAVED_OBJECT_TYPE, 'query'],
-            read: ['index-pattern'],
-          },
-          ui: ['save', 'show', 'saveQuery'],
-        },
-        read: {
-          app: [APP_ID, 'kibana'],
-          catalogue: [APP_ID],
-          savedObject: {
-            all: [],
-            read: [MAP_SAVED_OBJECT_TYPE, 'index-pattern', 'query'],
-          },
-          ui: ['show'],
-        },
-      },
-    });
-
    licensing.license$.subscribe(license => {
      const { state } = license.check('maps', 'basic');
      if (state === 'valid' && !routesInitialized) {
--- a/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js
@ -22,8 +22,7 @@ export function setupXPackMain(server) {

  server.ext('onPreResponse', (request, h) => injectXPackInfoSignature(info, request, h));

-  const { registerFeature, getFeatures } = server.newPlatform.setup.plugins.features;
-  server.expose('registerFeature', registerFeature);
+  const { getFeatures } = server.newPlatform.setup.plugins.features;
  server.expose('getFeatures', getFeatures);

  const setPluginStatus = () => {
--- a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
+++ b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
@ -12,5 +12,4 @@ export { XPackFeature } from './lib/xpack_info';
 export interface XPackMainPlugin {
  info: XPackInfo;
  getFeatures(): Feature[];
-  registerFeature(feature: FeatureConfig): void;
 }
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@ -4,8 +4,9 @@
  "kibanaVersion": "kibana",
  "configPath": ["xpack", "maps"],
  "requiredPlugins": [
-    "inspector",
    "licensing",
+    "features",
+    "inspector",
    "home",
    "data",
    "fileUpload",
@ -15,5 +16,6 @@
    "embeddable",
    "mapsLegacy"
  ],
-  "ui": true
+  "ui": true,
+  "server": true
 }
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/app.js
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/app.js
@ -3,3 +3,8 @@
 * or more contributor license agreements. Licensed under the Elastic License;
 * you may not use this file except in compliance with the Elastic License.
 */
+import { PluginInitializerContext } from 'src/core/server';
+import { MapsPlugin } from './plugin';
+
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new MapsPlugin(initializerContext);
--- a/x-pack/plugins/maps/server/plugin.ts
+++ b/x-pack/plugins/maps/server/plugin.ts
@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
+
+import { APP_ID, APP_ICON, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+
+interface SetupDeps {
+  features: FeaturesPluginSetupContract;
+}
+
+export class MapsPlugin implements Plugin {
+  constructor(initializerContext: PluginInitializerContext) {}
+  setup(core: CoreSetup, plugins: SetupDeps) {
+    plugins.features.registerFeature({
+      id: APP_ID,
+      name: i18n.translate('xpack.maps.featureRegistry.mapsFeatureName', {
+        defaultMessage: 'Maps',
+      }),
+      order: 600,
+      icon: APP_ICON,
+      navLinkId: APP_ID,
+      app: [APP_ID, 'kibana'],
+      catalogue: [APP_ID],
+      privileges: {
+        all: {
+          app: [APP_ID, 'kibana'],
+          catalogue: [APP_ID],
+          savedObject: {
+            all: [MAP_SAVED_OBJECT_TYPE, 'query'],
+            read: ['index-pattern'],
+          },
+          ui: ['save', 'show', 'saveQuery'],
+        },
+        read: {
+          app: [APP_ID, 'kibana'],
+          catalogue: [APP_ID],
+          savedObject: {
+            all: [],
+            read: [MAP_SAVED_OBJECT_TYPE, 'index-pattern', 'query'],
+          },
+          ui: ['show'],
+        },
+      },
+    });
+  }
+  start(core: CoreStart) {}
+}
--- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js
@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import mappings from './mappings.json';
-
-export default function(kibana) {
-  return new kibana.Plugin({
-    require: ['kibana', 'elasticsearch', 'xpack_main'],
-    name: 'namespace_agnostic_type_plugin',
-    uiExports: {
-      savedObjectsManagement: {
-        globaltype: {
-          isImportableAndExportable: true,
-        },
-      },
-      savedObjectSchemas: {
-        globaltype: {
-          isNamespaceAgnostic: true,
-        },
-      },
-      mappings,
-    },
-
-    config() {},
-
-    init(server) {
-      server.plugins.xpack_main.registerFeature({
-        id: 'namespace_agnostic_type_plugin',
-        name: 'namespace_agnostic_type_plugin',
-        icon: 'upArrow',
-        navLinkId: 'namespace_agnostic_type_plugin',
-        app: [],
-        privileges: {
-          all: {
-            savedObject: {
-              all: ['globaltype'],
-              read: [],
-            },
-            ui: [],
-          },
-          read: {
-            savedObject: {
-              all: [],
-              read: ['globaltype'],
-            },
-            ui: [],
-          },
-        },
-      });
-    },
-  });
-}
--- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/kibana.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/kibana.json
@ -0,0 +1,8 @@
+{
+  "id": "namespace_agnostic_type_plugin",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "requiredPlugins": ["features"],
+  "server": true,
+  "ui": false
+}
--- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json
@ -1,15 +0,0 @@
-{
-  "globaltype": {
-    "properties": {
-      "title": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword",
-            "ignore_above": 2048
-          }
-        }
-      }
-    }
-  }
-}
--- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/package.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/package.json
@ -1,7 +0,0 @@
-{
-  "name": "namespace_agnostic_type_plugin",
-  "version": "0.0.0",
-  "kibana": {
-    "version": "kibana"
-  }
-}
--- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/server/index.ts
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/server/index.ts
@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { CoreSetup, Plugin } from 'src/core/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '../../../../../../plugins/features/server';
+
+export const plugin = () => new NamespaceAgnosticTypePlugin();
+
+interface SetupDeps {
+  features: FeaturesPluginSetupContract;
+}
+
+class NamespaceAgnosticTypePlugin implements Plugin {
+  setup(core: CoreSetup, plugins: SetupDeps) {
+    core.savedObjects.registerType({
+      name: 'globaltype',
+      hidden: false,
+      namespaceType: 'agnostic',
+      management: {
+        importableAndExportable: true,
+      },
+      mappings: {
+        properties: {
+          title: {
+            type: 'text',
+            fields: {
+              keyword: {
+                type: 'keyword',
+                ignore_above: 2048,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    plugins.features.registerFeature({
+      id: 'namespace_agnostic_type_plugin',
+      name: 'namespace_agnostic_type_plugin',
+      icon: 'upArrow',
+      navLinkId: 'namespace_agnostic_type_plugin',
+      app: [],
+      privileges: {
+        all: {
+          savedObject: {
+            all: ['globaltype'],
+            read: [],
+          },
+          ui: [],
+        },
+        read: {
+          savedObject: {
+            all: [],
+            read: ['globaltype'],
+          },
+          ui: [],
+        },
+      },
+    });
+  }
+  start() {}
+}
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js
@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export default function(kibana) {
-  return new kibana.Plugin({
-    require: ['kibana', 'elasticsearch', 'xpack_main'],
-    name: 'foo',
-    uiExports: {
-      app: {
-        title: 'Foo',
-        order: 1000,
-        euiIconType: 'uiArray',
-        description: 'Foo app',
-        main: 'plugins/foo_plugin/app',
-      },
-    },
-
-    init(server) {
-      server.plugins.xpack_main.registerFeature({
-        id: 'foo',
-        name: 'Foo',
-        icon: 'upArrow',
-        navLinkId: 'foo_plugin',
-        app: ['kibana'],
-        catalogue: ['foo'],
-        privileges: {
-          all: {
-            app: ['kibana'],
-            catalogue: ['foo'],
-            savedObject: {
-              all: ['foo'],
-              read: ['index-pattern'],
-            },
-            ui: ['create', 'edit', 'delete', 'show'],
-          },
-          read: {
-            app: ['kibana'],
-            catalogue: ['foo'],
-            savedObject: {
-              all: [],
-              read: ['foo', 'index-pattern'],
-            },
-            ui: ['show'],
-          },
-        },
-      });
-    },
-  });
-}
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json
@ -0,0 +1,8 @@
+{
+  "id": "foo_plugin",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "requiredPlugins": ["features"],
+  "server": true,
+  "ui": true
+}
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/package.json
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/package.json
@ -1,7 +0,0 @@
-{
-  "name": "foo_plugin",
-  "version": "0.0.0",
-  "kibana": {
-    "version": "kibana"
-  }
-}
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts
@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { CoreSetup, Plugin } from 'src/core/public';
+export const plugin = () => new FooPlugin();
+
+class FooPlugin implements Plugin {
+  setup(core: CoreSetup) {
+    core.application.register({
+      id: 'foo',
+      title: 'Foo app',
+      euiIconType: 'uiArray',
+      mount() {
+        return () => null;
+      },
+    });
+  }
+  start() {}
+}
--- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
+++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts
@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { CoreSetup, Plugin } from 'src/core/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '../../../../../../../plugins/features/server';
+
+export const plugin = () => new FooPlugin();
+
+interface SetupDeps {
+  features: FeaturesPluginSetupContract;
+}
+
+class FooPlugin implements Plugin {
+  setup(core: CoreSetup, plugins: SetupDeps) {
+    plugins.features.registerFeature({
+      id: 'foo',
+      name: 'Foo',
+      icon: 'upArrow',
+      navLinkId: 'foo_plugin',
+      app: ['kibana'],
+      catalogue: ['foo'],
+      privileges: {
+        all: {
+          app: ['kibana'],
+          catalogue: ['foo'],
+          savedObject: {
+            all: ['foo'],
+            read: ['index-pattern'],
+          },
+          ui: ['create', 'edit', 'delete', 'show'],
+        },
+        read: {
+          app: ['kibana'],
+          catalogue: ['foo'],
+          savedObject: {
+            all: [],
+            read: ['foo', 'index-pattern'],
+          },
+          ui: ['show'],
+        },
+      },
+    });
+  }
+  start() {}
+}