Spaces - NP updates for usage collection and capabilities (elastic#57693

)

* remove kibanaIndex from LegacyAPI

* moving capabilities, adding tests

* moving usage collection

* cleanup

* don't toggle capabilities on unauthenticated routes

* reintroduce exception handling

* pipe dat config

* start addressing PR feedback

* fix CoreSetup's generic type

* fix usage collector tests

* PR review updates

Co-authored-by: Elastic Machine <[email protected]>

src/core/server/http/http_server.mocks.ts

@@ -43,6 +43,7 @@ interface RequestFixtureOptions<P = any, Q = any, B = any> {
   method?: RouteMethod;
   socket?: Socket;
   routeTags?: string[];
+  routeAuthRequired?: false;
   validation?: {
     params?: RouteValidationSpec<P>;
     query?: RouteValidationSpec<Q>;
@@ -59,6 +60,7 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
   method = 'get',
   socket = new Socket(),
   routeTags,
+  routeAuthRequired,
   validation = {},
 }: RequestFixtureOptions<P, Q, B> = {}) {
   const queryString = stringify(query, { sort: false });
@@ -77,7 +79,9 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
         query: queryString,
         search: queryString ? `?${queryString}` : queryString,
       },
-      route: { settings: { tags: routeTags } },
+      route: {
+        settings: { tags: routeTags, auth: routeAuthRequired },
+      },
       raw: {
         req: { socket },
       },

src/plugins/usage_collection/server/mocks.ts

@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { loggingServiceMock } from '../../../core/server/mocks';
+import { UsageCollectionSetup } from './plugin';
+import { CollectorSet } from './collector';
+
+const createSetupContract = () => {
+  return {
+    ...new CollectorSet({
+      logger: loggingServiceMock.createLogger(),
+      maximumWaitTimeForAllCollectorsInS: 1,
+    }),
+    registerLegacySavedObjects: jest.fn() as jest.Mocked<
+      UsageCollectionSetup['registerLegacySavedObjects']
+    >,
+  } as UsageCollectionSetup;
+};
+
+export const usageCollectionPluginMock = {
+  createSetupContract,
+};

x-pack/legacy/plugins/spaces/index.ts

@@ -34,19 +34,6 @@ export const spaces = (kibana: Record<string, any>) =>
     publicDir: resolve(__dirname, 'public'),
     require: ['kibana', 'elasticsearch', 'xpack_main'],
 
-    uiCapabilities() {
-      return {
-        spaces: {
-          manage: true,
-        },
-        management: {
-          kibana: {
-            spaces: true,
-          },
-        },
-      };
-    },
-
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       managementSections: [],
@@ -110,14 +97,9 @@ export const spaces = (kibana: Record<string, any>) =>
         throw new Error('New Platform XPack Spaces plugin is not available.');
       }
 
-      const config = server.config();
-
       const { registerLegacyAPI, createDefaultSpace } = spacesPlugin.__legacyCompat;
 
       registerLegacyAPI({
-        legacyConfig: {
-          kibanaIndex: config.get('kibana.index'),
-        },
         savedObjects: server.savedObjects,
         auditLogger: {
           create: (pluginId: string) =>

x-pack/plugins/features/server/index.ts

@@ -14,7 +14,7 @@ import { Plugin } from './plugin';
 export { uiCapabilitiesRegex } from './feature_schema';
 
 export { Feature, FeatureWithAllOrReadPrivileges, FeatureKibanaPrivileges } from '../common';
-export { PluginSetupContract } from './plugin';
+export { PluginSetupContract, PluginStartContract } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
   new Plugin(initializerContext);

x-pack/plugins/features/server/mocks.ts

@@ -0,0 +1,27 @@
+/*
+ * 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 { PluginSetupContract, PluginStartContract } from './plugin';
+
+const createSetup = (): jest.Mocked<PluginSetupContract> => {
+  return {
+    getFeatures: jest.fn(),
+    getFeaturesUICapabilities: jest.fn(),
+    registerFeature: jest.fn(),
+    registerLegacyAPI: jest.fn(),
+  };
+};
+
+const createStart = (): jest.Mocked<PluginStartContract> => {
+  return {
+    getFeatures: jest.fn(),
+  };
+};
+
+export const featuresPluginMock = {
+  createSetup,
+  createStart,
+};

x-pack/plugins/features/server/plugin.ts

@@ -30,6 +30,10 @@ export interface PluginSetupContract {
   registerLegacyAPI: (legacyAPI: LegacyAPI) => void;
 }
 
+export interface PluginStartContract {
+  getFeatures(): Feature[];
+}
+
 /**
  * Describes a set of APIs that are available in the legacy platform only and required by this plugin
  * to function properly.
@@ -45,6 +49,8 @@ export interface LegacyAPI {
 export class Plugin {
   private readonly logger: Logger;
 
+  private readonly featureRegistry: FeatureRegistry = new FeatureRegistry();
+
   private legacyAPI?: LegacyAPI;
   private readonly getLegacyAPI = () => {
     if (!this.legacyAPI) {
@@ -61,18 +67,16 @@ export class Plugin {
     core: CoreSetup,
     { timelion }: { timelion?: TimelionSetupContract }
   ): Promise<RecursiveReadonly<PluginSetupContract>> {
-    const featureRegistry = new FeatureRegistry();
-
     defineRoutes({
       router: core.http.createRouter(),
-      featureRegistry,
+      featureRegistry: this.featureRegistry,
       getLegacyAPI: this.getLegacyAPI,
     });
 
     return deepFreeze({
-      registerFeature: featureRegistry.register.bind(featureRegistry),
-      getFeatures: featureRegistry.getAll.bind(featureRegistry),
-      getFeaturesUICapabilities: () => uiCapabilitiesForFeatures(featureRegistry.getAll()),
+      registerFeature: this.featureRegistry.register.bind(this.featureRegistry),
+      getFeatures: this.featureRegistry.getAll.bind(this.featureRegistry),
+      getFeaturesUICapabilities: () => uiCapabilitiesForFeatures(this.featureRegistry.getAll()),
 
       registerLegacyAPI: (legacyAPI: LegacyAPI) => {
         this.legacyAPI = legacyAPI;
@@ -82,14 +86,17 @@ export class Plugin {
           savedObjectTypes: this.legacyAPI.savedObjectTypes,
           includeTimelion: timelion !== undefined && timelion.uiEnabled,
         })) {
-          featureRegistry.register(feature);
+          this.featureRegistry.register(feature);
         }
       },
     });
   }
 
-  public start() {
+  public start(): RecursiveReadonly<PluginStartContract> {
     this.logger.debug('Starting plugin');
+    return deepFreeze({
+      getFeatures: this.featureRegistry.getAll.bind(this.featureRegistry),
+    });
   }
 
   public stop() {

x-pack/plugins/spaces/server/capabilities/capabilities_provider.test.ts

@@ -0,0 +1,24 @@
+/*
+ * 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 { capabilitiesProvider } from './capabilities_provider';
+
+describe('Capabilities provider', () => {
+  it('provides the expected capabilities', () => {
+    expect(capabilitiesProvider()).toMatchInlineSnapshot(`
+      Object {
+        "management": Object {
+          "kibana": Object {
+            "spaces": true,
+          },
+        },
+        "spaces": Object {
+          "manage": true,
+        },
+      }
+    `);
+  });
+});

x-pack/plugins/spaces/server/capabilities/capabilities_provider.ts

@@ -0,0 +1,16 @@
+/*
+ * 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 const capabilitiesProvider = () => ({
+  spaces: {
+    manage: true,
+  },
+  management: {
+    kibana: {
+      spaces: true,
+    },
+  },
+});