Move core config service to kbn/config package

package.json

@@ -137,6 +137,7 @@
     "@hapi/wreck": "^15.0.2",
     "@kbn/analytics": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
+    "@kbn/config": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/interpreter": "1.0.0",

packages/kbn-config/README.md

@@ -0,0 +1,9 @@
+# `@kbn/config` — Kibana configuration file loader
+
+`@kbn/config-schema` is a TypeScript library inspired by Joi and designed to allow run-time validation of the
+Kibana configuration entries providing developers with a fully typed model of the validated data.
+
+## Table of Contents
+
+- [Why `@kbn/config-schema`?](#why-kbnconfig-schema)
+

packages/kbn-config/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@kbn/config",
+  "main": "./target/out/index.js",
+  "types": "./target/types/index.d.ts",
+  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc",
+    "kbn:bootstrap": "yarn build"
+  },
+  "dependencies": {
+    "@kbn/config-schema": "1.0.0",
+    "@kbn/dev-utils": "1.0.0",
+    "rxjs": "^6.5.5",
+    "js-yaml": "3.13.1"
+  },
+  "devDependencies": {
+    "typescript": "4.0.2",
+    "tsd": "^0.7.4"
+  },
+  "peerDependencies": {
+    "lodash": "^4.17.15",
+    "@elastic/safer-lodash-set": "0.0.0",
+    "moment": "^2.24.0",
+    "type-detect": "^4.0.8"
+  }
+}

src/core/server/config/config.ts → packages/kbn-config/src/config.ts

@@ -23,7 +23,7 @@ export type ConfigPath = string | string[];
 /**
  * Checks whether specified value can be considered as config path.
  * @param value Value to check.
- * @internal
+ * @public
  */
 export function isConfigPath(value: unknown): value is ConfigPath {
   if (!value) {

src/core/server/config/config_service.test.mocks.ts → packages/kbn-config/src/config_service.test.mocks.ts

@@ -18,7 +18,7 @@
  */
 
 export const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] });
-jest.mock('../../../../package.json', () => mockPackage);
+jest.mock('../../../package.json', () => mockPackage);
 
 export const mockApplyDeprecations = jest.fn((config, deprecations, log) => config);
 jest.mock('./deprecation/apply_deprecations', () => ({

src/core/server/config/config_service.test.ts → packages/kbn-config/src/config_service.test.ts

@@ -21,17 +21,22 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { first, take } from 'rxjs/operators';
 
 import { mockPackage, mockApplyDeprecations } from './config_service.test.mocks';
-import { rawConfigServiceMock } from './raw_config_service.mock';
+import { rawConfigServiceMock } from './raw/raw_config_service.mock';
 
 import { schema } from '@kbn/config-schema';
 
 import { ConfigService, Env } from '.';
-import { loggingSystemMock } from '../logging/logging_system.mock';
+
 import { getEnvOptions } from './__mocks__/env';
 
 const emptyArgv = getEnvOptions();
 const defaultEnv = new Env('/kibana', emptyArgv);
-const logger = loggingSystemMock.create();
+
+// TODO: fix
+// import { loggingSystemMock } from '../logging/logging_system.mock';
+// const logger = loggingSystemMock.create();
+const loggingSystemMock: any = {};
+const logger: any = {};
 
 const getRawConfigProvider = (rawConfig: Record<string, any>) =>
   rawConfigServiceMock.create({ rawConfig });

src/core/server/config/config_service.ts → packages/kbn-config/src/config_service.ts

@@ -23,16 +23,16 @@ import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { distinctUntilChanged, first, map, shareReplay, take } from 'rxjs/operators';
 
 import { Config, ConfigPath, Env } from '.';
-import { Logger, LoggerFactory } from '../logging';
+import { Logger, LoggerFactory } from './logging';
 import { hasConfigPathIntersection } from './config';
-import { RawConfigurationProvider } from './raw_config_service';
+import { RawConfigurationProvider } from './raw/raw_config_service';
 import {
   applyDeprecations,
   ConfigDeprecationWithContext,
   ConfigDeprecationProvider,
   configDeprecationFactory,
 } from './deprecation';
-import { LegacyObjectToConfigAdapter } from '../legacy/config';
+import { LegacyObjectToConfigAdapter } from './legacy';
 
 /** @internal */
 export type IConfigService = PublicMethodsOf<ConfigService>;

src/core/server/config/deprecation/deprecation_factory.ts → packages/kbn-config/src/deprecation/deprecation_factory.ts

@@ -19,8 +19,8 @@
 
 import { set } from '@elastic/safer-lodash-set';
 import { get } from 'lodash';
+import { unset } from '../utils';
 import { ConfigDeprecation, ConfigDeprecationLogger, ConfigDeprecationFactory } from './types';
-import { unset } from '../../../utils';
 
 const _rename = (
   config: Record<string, any>,

packages/kbn-config/src/deprecation/index.ts

@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+export {
+  ConfigDeprecation,
+  ConfigDeprecationWithContext,
+  ConfigDeprecationLogger,
+  ConfigDeprecationFactory,
+  ConfigDeprecationProvider,
+} from './types';
+export { configDeprecationFactory } from './deprecation_factory';
+export { applyDeprecations } from './apply_deprecations';

src/core/server/config/env.test.mocks.ts → packages/kbn-config/src/env.test.mocks.ts

@@ -27,4 +27,4 @@ jest.mock('path', () => ({
 }));
 
 export const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] });
-jest.mock('../../../../package.json', () => mockPackage);
+jest.mock('../../../package.json', () => mockPackage);

src/core/server/config/env.ts → packages/kbn-config/src/env.ts

@@ -22,7 +22,7 @@ import { PackageInfo, EnvironmentMode } from './types';
 
 // `require` is necessary for this to work inside x-pack code as well
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const pkg = require('../../../../package.json');
+const pkg = require('../../../package.json');
 
 /** @internal */
 export interface EnvOptions {
@@ -55,7 +55,7 @@ export class Env {
    * @internal
    */
   public static createDefault(options: EnvOptions): Env {
-    const repoRoot = dirname(require.resolve('../../../../package.json'));
+    const repoRoot = dirname(require.resolve('../../../package.json'));
     return new Env(repoRoot, options);
   }
 

packages/kbn-config/src/index.ts

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+export {
+  applyDeprecations,
+  ConfigDeprecation,
+  ConfigDeprecationFactory,
+  configDeprecationFactory,
+  ConfigDeprecationLogger,
+  ConfigDeprecationProvider,
+  ConfigDeprecationWithContext,
+} from './deprecation';
+
+export { RawConfigurationProvider, RawConfigService } from './raw';
+
+export { ConfigService, IConfigService } from './config_service';
+export { Config, ConfigPath, isConfigPath, hasConfigPathIntersection } from './config';
+export { ObjectToConfigAdapter } from './object_to_config_adapter';
+export { CliArgs, Env } from './env';
+export { EnvironmentMode, PackageInfo } from './types';
+export { LegacyObjectToConfigAdapter } from './legacy';
+
+// mocks
+export { configMock } from './config.mock';
+export { configServiceMock } from './config_service.mock';
+export { rawConfigServiceMock } from './raw/raw_config_service.mock';
+export { getEnvOptions } from './__mocks__/env';

packages/kbn-config/src/legacy/index.ts

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export { LegacyObjectToConfigAdapter } from './legacy_object_to_config_adapter';