Merge branch 'master' into kertal-pr-2020-05-26-improve-discover-cont…

…ext-a11y-test

.github/CODEOWNERS

@@ -158,7 +158,6 @@
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
 /x-pack/plugins/spaces/  @elastic/kibana-security
-/x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security

src/core/server/legacy/legacy_service.ts

@@ -352,7 +352,6 @@ export class LegacyService implements CoreService {
           uiPlugins: setupDeps.uiPlugins,
           elasticsearch: setupDeps.core.elasticsearch,
           rendering: setupDeps.core.rendering,
-          uiSettings: setupDeps.core.uiSettings,
           savedObjectsClientProvider: startDeps.core.savedObjects.clientProvider,
           legacy: this.legacyInternals,
         },

src/core/server/server.ts

@@ -247,21 +247,21 @@ export class Server {
       coreId,
       'core',
       async (context, req, res): Promise<RequestHandlerContext['core']> => {
-        const savedObjectsClient = this.coreStart!.savedObjects.getScopedClient(req);
-        const uiSettingsClient = coreSetup.uiSettings.asScopedToClient(savedObjectsClient);
+        const coreStart = this.coreStart!;
+        const savedObjectsClient = coreStart.savedObjects.getScopedClient(req);
 
         return {
           savedObjects: {
             client: savedObjectsClient,
-            typeRegistry: this.coreStart!.savedObjects.getTypeRegistry(),
+            typeRegistry: coreStart.savedObjects.getTypeRegistry(),
           },
           elasticsearch: {
             legacy: {
-              client: coreSetup.elasticsearch.dataClient.asScoped(req),
+              client: coreStart.elasticsearch.legacy.client.asScoped(req),
             },
           },
           uiSettings: {
-            client: uiSettingsClient,
+            client: coreStart.uiSettings.asScopedToClient(savedObjectsClient),
           },
         };
       }

src/core/server/ui_settings/types.ts

@@ -84,11 +84,6 @@ export interface InternalUiSettingsServiceSetup {
    * @param settings
    */
   register(settings: Record<string, UiSettingsParams>): void;
-  /**
-   * Creates uiSettings client with provided *scoped* saved objects client {@link IUiSettingsClient}
-   * @param savedObjectsClient
-   */
-  asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
 }
 
 /** @public */

src/core/server/ui_settings/ui_settings_service.mock.ts

@@ -46,11 +46,8 @@ const createClientMock = () => {
 const createSetupMock = () => {
   const mocked: jest.Mocked<InternalUiSettingsServiceSetup> = {
     register: jest.fn(),
-    asScopedToClient: jest.fn(),
   };
 
-  mocked.asScopedToClient.mockReturnValue(createClientMock());
-
   return mocked;
 };
 

src/core/server/ui_settings/ui_settings_service.test.ts

@@ -67,34 +67,6 @@ describe('uiSettings', () => {
       expect(setupDeps.savedObjects.registerType).toHaveBeenCalledWith(uiSettingsType);
     });
 
-    describe('#asScopedToClient', () => {
-      it('passes saved object type "config" to UiSettingsClient', async () => {
-        const setup = await service.setup(setupDeps);
-        setup.asScopedToClient(savedObjectsClient);
-        expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
-        expect(MockUiSettingsClientConstructor.mock.calls[0][0].type).toBe('config');
-      });
-
-      it('passes overrides to UiSettingsClient', async () => {
-        const setup = await service.setup(setupDeps);
-        setup.asScopedToClient(savedObjectsClient);
-        expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
-        expect(MockUiSettingsClientConstructor.mock.calls[0][0].overrides).toBe(overrides);
-        expect(MockUiSettingsClientConstructor.mock.calls[0][0].overrides).toEqual(overrides);
-      });
-
-      it('passes a copy of set defaults to UiSettingsClient', async () => {
-        const setup = await service.setup(setupDeps);
-
-        setup.register(defaults);
-        setup.asScopedToClient(savedObjectsClient);
-        expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
-
-        expect(MockUiSettingsClientConstructor.mock.calls[0][0].defaults).toEqual(defaults);
-        expect(MockUiSettingsClientConstructor.mock.calls[0][0].defaults).not.toBe(defaults);
-      });
-    });
-
     describe('#register', () => {
       it('throws if registers the same key twice', async () => {
         const setup = await service.setup(setupDeps);

src/core/server/ui_settings/ui_settings_service.ts

@@ -65,7 +65,6 @@ export class UiSettingsService
 
     return {
       register: this.register.bind(this),
-      asScopedToClient: this.getScopedClientFactory(),
     };
   }
 

src/legacy/server/kbn_server.d.ts

@@ -113,7 +113,6 @@ export interface KibanaCore {
     legacy: ILegacyInternals;
     rendering: LegacyServiceSetupDeps['core']['rendering'];
     uiPlugins: UiPlugins;
-    uiSettings: LegacyServiceSetupDeps['core']['uiSettings'];
     savedObjectsClientProvider: LegacyServiceStartDeps['core']['savedObjects']['clientProvider'];
   };
   env: {

src/legacy/ui/ui_render/ui_render_mixin.js

@@ -247,9 +247,10 @@ export function uiRenderMixin(kbnServer, server, config) {
       rendering,
       legacy,
       savedObjectsClientProvider: savedObjects,
-      uiSettings: { asScopedToClient },
     } = kbnServer.newPlatform.__internals;
-    const uiSettings = asScopedToClient(savedObjects.getClient(h.request));
+    const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(
+      savedObjects.getClient(h.request)
+    );
     const vars = await legacy.getVars(app.getId(), h.request, {
       apmConfig: getApmConfig(app),
       ...overrides,

src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts

@@ -59,6 +59,15 @@ describe('uiSettingsMixin()', () => {
       decorate: sinon.spy((type: keyof Decorators, name: string, value: any) => {
         decorations[type][name] = value;
       }),
+      newPlatform: {
+        setup: {
+          core: {
+            uiSettings: {
+              register: sinon.stub(),
+            },
+          },
+        },
+      },
     };
 
     // "promise" returned from kbnServer.ready()
@@ -70,13 +79,6 @@ describe('uiSettingsMixin()', () => {
       server,
       uiExports: { uiSettingDefaults },
       ready: sinon.stub().returns(readyPromise),
-      newPlatform: {
-        __internals: {
-          uiSettings: {
-            register: sinon.stub(),
-          },
-        },
-      },
     };
 
     uiSettingsMixin(kbnServer, server);
@@ -92,10 +94,10 @@ describe('uiSettingsMixin()', () => {
   afterEach(() => sandbox.restore());
 
   it('passes uiSettingsDefaults to the new platform', () => {
-    const { kbnServer } = setup();
-    sinon.assert.calledOnce(kbnServer.newPlatform.__internals.uiSettings.register);
+    const { server } = setup();
+    sinon.assert.calledOnce(server.newPlatform.setup.core.uiSettings.register);
     sinon.assert.calledWithExactly(
-      kbnServer.newPlatform.__internals.uiSettings.register,
+      server.newPlatform.setup.core.uiSettings.register,
       uiSettingDefaults
     );
   });

src/legacy/ui/ui_settings/ui_settings_mixin.js

@@ -37,7 +37,7 @@ export function uiSettingsMixin(kbnServer, server) {
     return acc;
   }, {});
 
-  kbnServer.newPlatform.__internals.uiSettings.register(mergedUiSettingDefaults);
+  server.newPlatform.setup.core.uiSettings.register(mergedUiSettingDefaults);
 
   server.decorate('server', 'uiSettingsServiceFactory', (options = {}) => {
     return uiSettingsServiceFactory(server, options);

src/legacy/ui/ui_settings/ui_settings_service_factory.ts

@@ -32,5 +32,5 @@ export function uiSettingsServiceFactory(
   server: Legacy.Server,
   options: UiSettingsServiceFactoryOptions
 ): IUiSettingsClient {
-  return server.newPlatform.__internals.uiSettings.asScopedToClient(options.savedObjectsClient);
+  return server.newPlatform.start.core.uiSettings.asScopedToClient(options.savedObjectsClient);
 }

x-pack/index.js

@@ -12,7 +12,6 @@ import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { maps } from './legacy/plugins/maps';
 import { spaces } from './legacy/plugins/spaces';
-import { encryptedSavedObjects } from './legacy/plugins/encrypted_saved_objects';
 import { ingestManager } from './legacy/plugins/ingest_manager';
 
 module.exports = function (kibana) {
@@ -25,7 +24,6 @@ module.exports = function (kibana) {
     dashboardMode(kibana),
     beats(kibana),
     maps(kibana),
-    encryptedSavedObjects(kibana),
     ingestManager(kibana),
   ];
 };

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

@@ -9,8 +9,6 @@ import { resolve } from 'path';
 import { Server } from 'src/legacy/server/kbn_server';
 import { KibanaRequest, LegacyRequest } from '../../../../src/core/server';
 // @ts-ignore
-import { AuditLogger } from '../../server/lib/audit_logger';
-// @ts-ignore
 import { watchStatusAndLicenseToInitialize } from '../../server/lib/watch_status_and_license_to_initialize';
 import { AuthenticatedUser, SecurityPluginSetup } from '../../../plugins/security/server';
 
@@ -33,28 +31,24 @@ function getSecurityPluginSetup(server: Server) {
 export const security = (kibana: Record<string, any>) =>
   new kibana.Plugin({
     id: 'security',
-    configPrefix: 'xpack.security',
     publicDir: resolve(__dirname, 'public'),
-    require: ['kibana', 'elasticsearch', 'xpack_main'],
+    require: ['kibana', 'xpack_main'],
+    configPrefix: 'xpack.security',
+    uiExports: {
+      hacks: ['plugins/security/hacks/legacy'],
+      injectDefaultVars: (server: Server) => {
+        return { enableSpaceAwarePrivileges: server.config().get('xpack.spaces.enabled') };
+      },
+    },
 
-    // This config is only used by `AuditLogger` and should be removed as soon as `AuditLogger`
-    // is migrated to Kibana Platform.
     config(Joi: Root) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
-        audit: Joi.object({ enabled: Joi.boolean().default(false) }).default(),
       })
         .unknown()
         .default();
     },
 
-    uiExports: {
-      hacks: ['plugins/security/hacks/legacy'],
-      injectDefaultVars: (server: Server) => {
-        return { enableSpaceAwarePrivileges: server.config().get('xpack.spaces.enabled') };
-      },
-    },
-
     async postInit(server: Server) {
       watchStatusAndLicenseToInitialize(server.plugins.xpack_main, this, async () => {
         const xpackInfo = server.plugins.xpack_main.info;
@@ -67,11 +61,6 @@ export const security = (kibana: Record<string, any>) =>
     async init(server: Server) {
       const securityPlugin = getSecurityPluginSetup(server);
 
-      const xpackInfo = server.plugins.xpack_main.info;
-      securityPlugin.__legacyCompat.registerLegacyAPI({
-        auditLogger: new AuditLogger(server, 'security', server.config(), xpackInfo),
-      });
-
       server.expose({
         getUser: async (request: LegacyRequest) =>
           securityPlugin.authc.getCurrentUser(KibanaRequest.from(request)),

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

@@ -8,20 +8,9 @@ import { resolve } from 'path';
 import KbnServer, { Server } from 'src/legacy/server/kbn_server';
 import { Legacy } from 'kibana';
 import { KibanaRequest } from '../../../../src/core/server';
-import { SpacesServiceSetup } from '../../../plugins/spaces/server';
 import { SpacesPluginSetup } from '../../../plugins/spaces/server';
-// @ts-ignore
-import { AuditLogger } from '../../server/lib/audit_logger';
 import { wrapError } from './server/lib/errors';
 
-export interface LegacySpacesPlugin {
-  getSpaceId: (request: Legacy.Request) => ReturnType<SpacesServiceSetup['getSpaceId']>;
-  getActiveSpace: (request: Legacy.Request) => ReturnType<SpacesServiceSetup['getActiveSpace']>;
-  spaceIdToNamespace: SpacesServiceSetup['spaceIdToNamespace'];
-  namespaceToSpaceId: SpacesServiceSetup['namespaceToSpaceId'];
-  getBasePath: SpacesServiceSetup['getBasePath'];
-}
-
 export const spaces = (kibana: Record<string, any>) =>
   new kibana.Plugin({
     id: 'spaces',
@@ -79,15 +68,6 @@ export const spaces = (kibana: Record<string, any>) =>
         throw new Error('New Platform XPack Spaces plugin is not available.');
       }
 
-      const { registerLegacyAPI } = spacesPlugin.__legacyCompat;
-
-      registerLegacyAPI({
-        auditLogger: {
-          create: (pluginId: string) =>
-            new AuditLogger(server, pluginId, server.config(), server.plugins.xpack_main.info),
-        },
-      });
-
       server.expose('getSpaceId', (request: Legacy.Request) =>
         spacesPlugin.spacesService.getSpaceId(request)
       );