Provide uiSettings service in NP

src/core/server/http/router/response_adapter.ts

@@ -120,7 +120,11 @@ export class HapiResponseAdapter {
     });
 
     error.output.payload.message = getErrorMessage(payload);
-    error.output.payload.attributes = getErrorAttributes(payload);
+
+    const attributes = getErrorAttributes(payload);
+    if (attributes) {
+      error.output.payload.attributes = attributes;
+    }
 
     const headers = kibanaResponse.options.headers;
     if (headers) {

src/core/server/index.ts

@@ -49,7 +49,11 @@ import { PluginsServiceSetup, PluginsServiceStart, PluginOpaqueId } from './plug
 import { ContextSetup } from './context';
 import { SavedObjectsServiceStart } from './saved_objects';
 
-import { InternalUiSettingsServiceSetup } from './ui_settings';
+import {
+  InternalUiSettingsServiceSetup,
+  IUiSettingsClient,
+  UiSettingsServiceSetup,
+} from './ui_settings';
 import { SavedObjectsClientContract } from './saved_objects/types';
 
 export { bootstrap } from './bootstrap';
@@ -211,6 +215,9 @@ export interface RequestHandlerContext {
       dataClient: IScopedClusterClient;
       adminClient: IScopedClusterClient;
     };
+    uiSettings: {
+      client: IUiSettingsClient;
+    };
   };
 }
 
@@ -226,6 +233,8 @@ export interface CoreSetup {
   elasticsearch: ElasticsearchServiceSetup;
   /** {@link HttpServiceSetup} */
   http: HttpServiceSetup;
+  /** {@link UiSettingsServiceSetup} */
+  uiSettings: UiSettingsServiceSetup;
 }
 
 /**

src/core/server/legacy/legacy_service.test.ts

@@ -72,7 +72,7 @@ beforeEach(() => {
     core: {
       context: contextServiceMock.createSetupContract(),
       elasticsearch: { legacy: {} } as any,
-      uiSettings: uiSettingsServiceMock.createSetup(),
+      uiSettings: uiSettingsServiceMock.createSetupContract(),
       http: {
         ...httpServiceMock.createSetupContract(),
         auth: {

src/core/server/legacy/legacy_service.ts

@@ -248,6 +248,9 @@ export class LegacyService implements CoreService<LegacyServiceSetup> {
         basePath: setupDeps.core.http.basePath,
         isTlsEnabled: setupDeps.core.http.isTlsEnabled,
       },
+      uiSettings: {
+        setDefaults: setupDeps.core.uiSettings.setDefaults,
+      },
     };
     const coreStart: CoreStart = {};
 

src/core/server/mocks.ts

@@ -22,6 +22,7 @@ import { loggingServiceMock } from './logging/logging_service.mock';
 import { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';
 import { httpServiceMock } from './http/http_service.mock';
 import { contextServiceMock } from './context/context_service.mock';
+import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 
 export { httpServerMock } from './http/http_server.mocks';
 export { sessionStorageMock } from './http/cookie_session_storage.mocks';
@@ -79,10 +80,14 @@ function createCoreSetupMock() {
   };
   httpMock.createRouter.mockImplementation(() => httpService.createRouter(''));
 
+  const uiSettingsMock = {
+    setDefaults: uiSettingsServiceMock.createSetupContract().setDefaults,
+  };
   const mock: MockedKeys<CoreSetup> = {
     context: contextServiceMock.createSetupContract(),
     elasticsearch: elasticsearchServiceMock.createSetupContract(),
     http: httpMock,
+    uiSettings: uiSettingsMock,
   };
 
   return mock;
@@ -94,8 +99,19 @@ function createCoreStartMock() {
   return mock;
 }
 
+function createInternalCoreSetupMock() {
+  const setupDeps = {
+    context: contextServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    http: httpServiceMock.createSetupContract(),
+    uiSettings: uiSettingsServiceMock.createSetupContract(),
+  };
+  return setupDeps;
+}
+
 export const coreMock = {
   createSetup: createCoreSetupMock,
   createStart: createCoreStartMock,
+  createInternalSetup: createInternalCoreSetupMock,
   createPluginInitializerContext: pluginInitializerContextMock,
 };

src/core/server/plugins/plugin.test.ts

@@ -24,15 +24,13 @@ import { schema } from '@kbn/config-schema';
 import { Env } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { CoreContext } from '../core_context';
+import { coreMock } from '../mocks';
 import { configServiceMock } from '../config/config_service.mock';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 
 import { PluginWrapper } from './plugin';
 import { PluginManifest } from './types';
 import { createPluginInitializerContext, createPluginSetupContext } from './plugin_context';
-import { contextServiceMock } from '../context/context_service.mock';
 
 const mockPluginInitializer = jest.fn();
 const logger = loggingServiceMock.create();
@@ -68,11 +66,7 @@ configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let coreId: symbol;
 let env: Env;
 let coreContext: CoreContext;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
 beforeEach(() => {
   coreId = Symbol('core');
   env = Env.createDefault(getEnvOptions());

src/core/server/plugins/plugin_context.ts

@@ -123,6 +123,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       basePath: deps.http.basePath,
       isTlsEnabled: deps.http.isTlsEnabled,
     },
+    uiSettings: {
+      setDefaults: deps.uiSettings.setDefaults,
+    },
   };
 }
 

src/core/server/plugins/plugins_service.test.ts

@@ -25,15 +25,13 @@ import { schema } from '@kbn/config-schema';
 
 import { Config, ConfigService, Env, ObjectToConfigAdapter } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
+import { coreMock } from '../mocks';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 import { PluginDiscoveryError } from './discovery';
 import { PluginWrapper } from './plugin';
 import { PluginsService } from './plugins_service';
 import { PluginsSystem } from './plugins_system';
 import { config } from './plugins_config';
-import { contextServiceMock } from '../context/context_service.mock';
 
 const MockPluginsSystem: jest.Mock<PluginsSystem> = PluginsSystem as any;
 
@@ -42,11 +40,7 @@ let configService: ConfigService;
 let coreId: symbol;
 let env: Env;
 let mockPluginSystem: jest.Mocked<PluginsSystem>;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
 const logger = loggingServiceMock.create();
 
 ['path-1', 'path-2', 'path-3', 'path-4', 'path-5'].forEach(path => {

src/core/server/plugins/plugins_service.ts

@@ -21,15 +21,14 @@ import { Observable } from 'rxjs';
 import { filter, first, map, mergeMap, tap, toArray } from 'rxjs/operators';
 import { CoreService } from '../../types';
 import { CoreContext } from '../core_context';
-import { InternalElasticsearchServiceSetup } from '../elasticsearch';
-import { InternalHttpServiceSetup } from '../http';
+
 import { Logger } from '../logging';
 import { discover, PluginDiscoveryError, PluginDiscoveryErrorType } from './discovery';
 import { PluginWrapper } from './plugin';
 import { DiscoveredPlugin, DiscoveredPluginInternal, PluginName } from './types';
 import { PluginsConfig, PluginsConfigType } from './plugins_config';
 import { PluginsSystem } from './plugins_system';
-import { ContextSetup } from '../context';
+import { InternalCoreSetup } from '..';
 
 /** @public */
 export interface PluginsServiceSetup {
@@ -46,11 +45,7 @@ export interface PluginsServiceStart {
 }
 
 /** @internal */
-export interface PluginsServiceSetupDeps {
-  context: ContextSetup;
-  elasticsearch: InternalElasticsearchServiceSetup;
-  http: InternalHttpServiceSetup;
-}
+export type PluginsServiceSetupDeps = InternalCoreSetup;
 
 /** @internal */
 export interface PluginsServiceStartDeps {} // eslint-disable-line @typescript-eslint/no-empty-interface

src/core/server/plugins/plugins_system.test.ts

@@ -28,13 +28,13 @@ import { Env } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { CoreContext } from '../core_context';
 import { configServiceMock } from '../config/config_service.mock';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
+
 import { PluginWrapper } from './plugin';
 import { PluginName } from './types';
 import { PluginsSystem } from './plugins_system';
-import { contextServiceMock } from '../context/context_service.mock';
+
+import { coreMock } from '../mocks';
 
 const logger = loggingServiceMock.create();
 function createPlugin(
@@ -67,11 +67,8 @@ const configService = configServiceMock.create();
 configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let env: Env;
 let coreContext: CoreContext;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
+
 beforeEach(() => {
   env = Env.createDefault(getEnvOptions());
 

src/core/server/server.ts

@@ -21,7 +21,7 @@ import { take } from 'rxjs/operators';
 import { Type } from '@kbn/config-schema';
 
 import { ConfigService, Env, Config, ConfigPath } from './config';
-import { ElasticsearchService, ElasticsearchServiceSetup } from './elasticsearch';
+import { ElasticsearchService } from './elasticsearch';
 import { HttpService, InternalHttpServiceSetup } from './http';
 import { LegacyService } from './legacy';
 import { Logger, LoggerFactory } from './logging';
@@ -39,7 +39,7 @@ import { config as uiSettingsConfig } from './ui_settings';
 import { mapToObject } from '../utils/';
 import { ContextService } from './context';
 import { SavedObjectsServiceSetup } from './saved_objects/saved_objects_service';
-import { RequestHandlerContext } from '.';
+import { RequestHandlerContext, InternalCoreSetup } from '.';
 
 const coreId = Symbol('core');
 
@@ -97,7 +97,7 @@ export class Server {
       http: httpSetup,
     });
 
-    const coreSetup = {
+    const coreSetup: InternalCoreSetup = {
       context: contextServiceSetup,
       elasticsearch: elasticsearchServiceSetup,
       http: httpSetup,
@@ -116,7 +116,7 @@ export class Server {
       legacy: legacySetup,
     });
 
-    this.registerCoreContext({ ...coreSetup, savedObjects: savedObjectsSetup });
+    this.registerCoreContext(coreSetup, savedObjectsSetup);
 
     return coreSetup;
   }
@@ -158,27 +158,31 @@ export class Server {
     );
   }
 
-  private registerCoreContext(coreSetup: {
-    http: InternalHttpServiceSetup;
-    elasticsearch: ElasticsearchServiceSetup;
-    savedObjects: SavedObjectsServiceSetup;
-  }) {
+  private registerCoreContext(
+    coreSetup: InternalCoreSetup,
+    savedObjects: SavedObjectsServiceSetup
+  ) {
     coreSetup.http.registerRouteHandlerContext(
       coreId,
       'core',
       async (context, req): Promise<RequestHandlerContext['core']> => {
         const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
         const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
+        const savedObjectsClient = savedObjects.clientProvider.getClient(req);
+
         return {
           savedObjects: {
             // Note: the client provider doesn't support new ES clients
             // emitted from adminClient$
-            client: coreSetup.savedObjects.clientProvider.getClient(req),
+            client: savedObjectsClient,
           },
           elasticsearch: {
             adminClient: adminClient.asScoped(req),
             dataClient: dataClient.asScoped(req),
           },
+          uiSettings: {
+            client: coreSetup.uiSettings.asScopedToClient(savedObjectsClient),
+          },
         };
       }
     );

src/core/server/ui_settings/index.ts

@@ -17,16 +17,15 @@
  * under the License.
  */
 
-export {
-  IUiSettingsClient,
-  UiSettingsClient,
-  UiSettingsServiceOptions,
-} from './ui_settings_client';
+export { UiSettingsClient, UiSettingsServiceOptions } from './ui_settings_client';
 
 export { config } from './ui_settings_config';
+export { UiSettingsService } from './ui_settings_service';
+
 export {
+  UiSettingsServiceSetup,
+  IUiSettingsClient,
   UiSettingsParams,
-  UiSettingsService,
   InternalUiSettingsServiceSetup,
   UiSettingsType,
-} from './ui_settings_service';
+} from './types';

src/core/server/ui_settings/routes/delete.ts

@@ -0,0 +1,61 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+import { IRouter } from '../../http';
+import { SavedObjectsErrorHelpers } from '../../saved_objects';
+import { CannotOverrideError } from '../ui_settings_errors';
+
+const validate = {
+  params: schema.object({
+    key: schema.string(),
+  }),
+};
+
+export function registerDeleteRoute(router: IRouter) {
+  router.delete(
+    { path: '/api/kibana/settings/{key}', validate },
+    async (context, request, response) => {
+      try {
+        const uiSettingsClient = context.core.uiSettings.client;
+
+        await uiSettingsClient.remove(request.params.key);
+
+        return response.ok({
+          body: {
+            settings: await uiSettingsClient.getUserProvided(),
+          },
+        });
+      } catch (error) {
+        if (SavedObjectsErrorHelpers.isSavedObjectsClientError(error)) {
+          return response.customError({
+            body: error,
+            statusCode: error.output.statusCode,
+          });
+        }
+
+        if (error instanceof CannotOverrideError) {
+          return response.badRequest({ body: error });
+        }
+
+        throw error;
+      }
+    }
+  );
+}