Merge branch 'master' into feat/matrix-histogram-search-strategy

packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts

@@ -21,7 +21,6 @@ import { ToolingLog } from '@kbn/dev-utils';
 import { defaultsDeep } from 'lodash';
 
 import { Config } from './config';
-import { transformDeprecations } from './transform_deprecations';
 
 const cache = new WeakMap();
 
@@ -52,8 +51,7 @@ async function getSettingsFromFile(log: ToolingLog, path: string, settingOverrid
     await cache.get(configProvider)!
   );
 
-  const logDeprecation = (error: string | Error) => log.error(error);
-  return transformDeprecations(settingsWithDefaults, logDeprecation);
+  return settingsWithDefaults;
 }
 
 export async function readConfigFile(log: ToolingLog, path: string, settingOverrides: any = {}) {

src/core/server/legacy/config/get_unused_config_keys.test.ts

@@ -217,34 +217,4 @@ describe('getUnusedConfigKeys', () => {
       })
     ).toEqual([]);
   });
-
-  describe('using deprecation', () => {
-    it('should use the plugin deprecations provider', async () => {
-      expect(
-        await getUnusedConfigKeys({
-          coreHandledConfigPaths: [],
-          pluginSpecs: [
-            ({
-              getDeprecationsProvider() {
-                return async ({ rename }: any) => [rename('foo1', 'foo2')];
-              },
-              getConfigPrefix: () => 'foo',
-            } as unknown) as LegacyPluginSpec,
-          ],
-          disabledPluginSpecs: [],
-          settings: {
-            foo: {
-              foo: 'dolly',
-              foo1: 'bar',
-            },
-          },
-          legacyConfig: getConfig({
-            foo: {
-              foo2: 'bar',
-            },
-          }),
-        })
-      ).toEqual(['foo.foo']);
-    });
-  });
 });

src/core/server/legacy/config/get_unused_config_keys.ts

@@ -17,10 +17,7 @@
  * under the License.
  */
 
-import { set } from '@elastic/safer-lodash-set';
-import { difference, get } from 'lodash';
-// @ts-expect-error
-import { getTransform } from '../../../../legacy/deprecation/index';
+import { difference } from 'lodash';
 import { unset } from '../../../../legacy/utils';
 import { getFlattenedObject } from '../../../utils';
 import { hasConfigPathIntersection } from '../../config';
@@ -41,21 +38,6 @@ export async function getUnusedConfigKeys({
   settings: LegacyVars;
   legacyConfig: LegacyConfig;
 }) {
-  // transform deprecated plugin settings
-  for (let i = 0; i < pluginSpecs.length; i++) {
-    const spec = pluginSpecs[i];
-    const transform = await getTransform(spec);
-    const prefix = spec.getConfigPrefix();
-
-    // nested plugin prefixes (a.b) translate to nested objects
-    const pluginSettings = get(settings, prefix);
-    if (pluginSettings) {
-      // flattened settings are expected to be converted to nested objects
-      // a.b = true => { a: { b: true }}
-      set(settings, prefix, transform(pluginSettings));
-    }
-  }
-
   // remove config values from disabled plugins
   for (const spec of disabledPluginSpecs) {
     unset(settings, spec.getConfigPrefix());