remove legacy core deprecations

elastic · Dec 10, 2019 · b9e0c6c · b9e0c6c
1 parent 46b7532
commit b9e0c6c
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 377 deletions.
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
@@ -29,15 +29,14 @@ import { REPO_ROOT } from '@kbn/dev-utils';
 import Log from '../log';
 import Worker from './worker';
 import { Config } from '../../legacy/server/config/config';
-import { transformDeprecations } from '../../legacy/server/config/transform_deprecations';
 
 process.env.kbnWorkerType = 'managr';
 
 export default class ClusterManager {
   static create(opts, settings = {}, basePathProxy) {
     return new ClusterManager(
       opts,
-      Config.withDefaultSchema(transformDeprecations(settings)),
+      Config.withDefaultSchema(settings),
       basePathProxy
     );
   }

diff --git a/src/core/server/legacy/config/ensure_valid_configuration.test.ts b/src/core/server/legacy/config/ensure_valid_configuration.test.ts
@@ -50,7 +50,7 @@ describe('ensureValidConfiguration', () => {
       coreHandledConfigPaths: ['core', 'elastic'],
       pluginSpecs: 'pluginSpecs',
       disabledPluginSpecs: 'disabledPluginSpecs',
-      inputSettings: 'settings',
+      settings: 'settings',
       legacyConfig: 'pluginExtendedConfig',
     });
   });

diff --git a/src/core/server/legacy/config/ensure_valid_configuration.ts b/src/core/server/legacy/config/ensure_valid_configuration.ts
@@ -30,7 +30,7 @@ export async function ensureValidConfiguration(
     coreHandledConfigPaths: await configService.getUsedPaths(),
     pluginSpecs,
     disabledPluginSpecs,
-    inputSettings: settings,
+    settings,
     legacyConfig: pluginExtendedConfig,
   });
 

diff --git a/src/core/server/legacy/config/get_unused_config_keys.test.ts b/src/core/server/legacy/config/get_unused_config_keys.test.ts
@@ -20,17 +20,10 @@
 import { LegacyPluginSpec } from '../plugins/find_legacy_plugin_specs';
 import { LegacyConfig } from './types';
 import { getUnusedConfigKeys } from './get_unused_config_keys';
-// @ts-ignore
-import { transformDeprecations } from '../../../../legacy/server/config/transform_deprecations';
-
-jest.mock('../../../../legacy/server/config/transform_deprecations', () => ({
-  transformDeprecations: jest.fn().mockImplementation(s => s),
-}));
 
 describe('getUnusedConfigKeys', () => {
   beforeEach(() => {
     jest.resetAllMocks();
-    transformDeprecations.mockImplementation((s: any) => s);
   });
 
   const getConfig = (values: Record<string, any> = {}): LegacyConfig =>
@@ -45,7 +38,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {},
+          settings: {},
           legacyConfig: getConfig(),
         })
       ).toEqual([]);
@@ -57,7 +50,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             presentInBoth: true,
             alsoInBoth: 'someValue',
           },
@@ -75,7 +68,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             presentInBoth: true,
           },
           legacyConfig: getConfig({
@@ -92,7 +85,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             presentInBoth: true,
             onlyInSetting: 'value',
           },
@@ -109,7 +102,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             elasticsearch: {
               username: 'foo',
               password: 'bar',
@@ -131,7 +124,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             env: 'development',
           },
           legacyConfig: getConfig({
@@ -149,7 +142,7 @@ describe('getUnusedConfigKeys', () => {
           coreHandledConfigPaths: [],
           pluginSpecs: [],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             prop: ['a', 'b', 'c'],
           },
           legacyConfig: getConfig({
@@ -171,7 +164,7 @@ describe('getUnusedConfigKeys', () => {
             getConfigPrefix: () => 'foo.bar',
           } as unknown) as LegacyPluginSpec,
         ],
-        inputSettings: {
+        settings: {
           foo: {
             bar: {
               unused: true,
@@ -194,7 +187,7 @@ describe('getUnusedConfigKeys', () => {
         coreHandledConfigPaths: ['core', 'foo.bar'],
         pluginSpecs: [],
         disabledPluginSpecs: [],
-        inputSettings: {
+        settings: {
           core: {
             prop: 'value',
           },
@@ -209,46 +202,6 @@ describe('getUnusedConfigKeys', () => {
   });
 
   describe('using deprecation', () => {
-    it('calls transformDeprecations with the settings', async () => {
-      await getUnusedConfigKeys({
-        coreHandledConfigPaths: [],
-        pluginSpecs: [],
-        disabledPluginSpecs: [],
-        inputSettings: {
-          prop: 'settings',
-        },
-        legacyConfig: getConfig({
-          prop: 'config',
-        }),
-      });
-      expect(transformDeprecations).toHaveBeenCalledTimes(1);
-      expect(transformDeprecations).toHaveBeenCalledWith({
-        prop: 'settings',
-      });
-    });
-
-    it('uses the transformed settings', async () => {
-      transformDeprecations.mockImplementation((settings: Record<string, any>) => {
-        delete settings.deprecated;
-        settings.updated = 'new value';
-        return settings;
-      });
-      expect(
-        await getUnusedConfigKeys({
-          coreHandledConfigPaths: [],
-          pluginSpecs: [],
-          disabledPluginSpecs: [],
-          inputSettings: {
-            onlyInSettings: 'bar',
-            deprecated: 'value',
-          },
-          legacyConfig: getConfig({
-            updated: 'config',
-          }),
-        })
-      ).toEqual(['onlyInSettings']);
-    });
-
     it('should use the plugin deprecations provider', async () => {
       expect(
         await getUnusedConfigKeys({
@@ -262,7 +215,7 @@ describe('getUnusedConfigKeys', () => {
             } as unknown) as LegacyPluginSpec,
           ],
           disabledPluginSpecs: [],
-          inputSettings: {
+          settings: {
             foo: {
               foo: 'dolly',
               foo1: 'bar',

diff --git a/src/core/server/legacy/config/get_unused_config_keys.ts b/src/core/server/legacy/config/get_unused_config_keys.ts
@@ -19,8 +19,6 @@
 
 import { difference, get, set } from 'lodash';
 // @ts-ignore
-import { transformDeprecations } from '../../../../legacy/server/config/transform_deprecations';
-// @ts-ignore
 import { getTransform } from '../../../../legacy/deprecation/index';
 import { unset, getFlattenedObject } from '../../../../legacy/utils';
 import { hasConfigPathIntersection } from '../../config';
@@ -33,18 +31,15 @@ export async function getUnusedConfigKeys({
   coreHandledConfigPaths,
   pluginSpecs,
   disabledPluginSpecs,
-  inputSettings,
+  settings,
   legacyConfig,
 }: {
   coreHandledConfigPaths: string[];
   pluginSpecs: LegacyPluginSpec[];
   disabledPluginSpecs: LegacyPluginSpec[];
-  inputSettings: Record<string, any>;
+  settings: Record<string, any>;
   legacyConfig: LegacyConfig;
 }) {
-  // transform deprecated core settings
-  const settings = transformDeprecations(inputSettings);
-
   // transform deprecated plugin settings
   for (let i = 0; i < pluginSpecs.length; i++) {
     const spec = pluginSpecs[i];

diff --git a/src/core/server/legacy/logging/legacy_logging_server.ts b/src/core/server/legacy/logging/legacy_logging_server.ts
@@ -20,7 +20,7 @@
 import { ServerExtType } from 'hapi';
 import Podium from 'podium';
 // @ts-ignore: implicit any for JS file
-import { Config, transformDeprecations } from '../../../../legacy/server/config';
+import { Config } from '../../../../legacy/server/config';
 // @ts-ignore: implicit any for JS file
 import { setupLogging } from '../../../../legacy/server/logging';
 import { LogLevel } from '../../logging/log_level';
@@ -99,7 +99,7 @@ export class LegacyLoggingServer {
       ops: { interval: 2147483647 },
     };
 
-    setupLogging(this, Config.withDefaultSchema(transformDeprecations(config)));
+    setupLogging(this, Config.withDefaultSchema(config));
   }
 
   public register({ plugin: { register }, options }: PluginRegisterParams): Promise<void> {

diff --git a/src/legacy/plugin_discovery/find_plugin_specs.js b/src/legacy/plugin_discovery/find_plugin_specs.js
@@ -21,7 +21,7 @@ import * as Rx from 'rxjs';
 import { distinct, toArray, mergeMap, share, shareReplay, filter, last, map, tap } from 'rxjs/operators';
 import { realpathSync } from 'fs';
 
-import { transformDeprecations, Config } from '../server/config';
+import { Config } from '../server/config';
 
 import {
   extendConfigService,
@@ -40,9 +40,7 @@ import {
 } from './errors';
 
 export function defaultConfig(settings) {
-  return Config.withDefaultSchema(
-    transformDeprecations(settings)
-  );
+  return Config.withDefaultSchema(settings);
 }
 
 function bufferAllResults(observable) {

diff --git a/src/legacy/plugin_discovery/plugin_config/settings.js b/src/legacy/plugin_discovery/plugin_config/settings.js
@@ -19,7 +19,6 @@
 
 import { get } from 'lodash';
 
-import * as serverConfig from '../../server/config';
 import { getTransform } from '../../deprecation';
 
 /**
@@ -33,7 +32,7 @@ import { getTransform } from '../../deprecation';
  */
 export async function getSettings(spec, rootSettings, logDeprecation) {
   const prefix = spec.getConfigPrefix();
-  const rawSettings = get(serverConfig.transformDeprecations(rootSettings), prefix);
+  const rawSettings = get(rootSettings, prefix);
   const transform = await getTransform(spec);
   return transform(rawSettings, logDeprecation);
 }
diff --git a/src/legacy/server/config/index.js b/src/legacy/server/config/index.js
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export { transformDeprecations } from './transform_deprecations';
 export { Config } from './config';
diff --git a/src/legacy/server/config/transform_deprecations.js b/src/legacy/server/config/transform_deprecations.js