Merge branch 'master' into nls/no-use-location

package.json

@@ -92,6 +92,7 @@
     "**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
     "**/image-diff/gm/debug": "^2.6.9",
     "**/load-grunt-config/lodash": "^4.17.20",
+    "**/node-jose/node-forge": "^0.10.0",
     "**/react-dom": "^16.12.0",
     "**/react": "^16.12.0",
     "**/react-test-renderer": "^16.12.0",
@@ -191,7 +192,7 @@
     "moment-timezone": "^0.5.27",
     "mustache": "2.3.2",
     "node-fetch": "1.7.3",
-    "node-forge": "^0.9.1",
+    "node-forge": "^0.10.0",
     "opn": "^5.5.0",
     "oppsy": "^2.0.0",
     "p-map": "^4.0.0",
@@ -305,7 +306,7 @@
     "@types/moment-timezone": "^0.5.12",
     "@types/mustache": "^0.8.31",
     "@types/node": ">=10.17.17 <10.20.0",
-    "@types/node-forge": "^0.9.0",
+    "@types/node-forge": "^0.9.5",
     "@types/normalize-path": "^3.0.0",
     "@types/opn": "^5.1.0",
     "@types/pegjs": "^0.10.1",

packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js

@@ -27,11 +27,7 @@ exports.getWebpackConfig = function (kibanaPath) {
       mainFields: ['browser', 'main'],
       modules: ['node_modules', resolve(kibanaPath, 'node_modules')],
       alias: {
-        // Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/legacy/ui/ui_bundler_env.js#L30-L36
-        ui: resolve(kibanaPath, 'src/legacy/ui/public'),
-
         // Dev defaults for test bundle https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/core_plugins/tests_bundle/index.js#L73-L78
-        ng_mock$: resolve(kibanaPath, 'src/test_utils/public/ng_mock'),
         fixtures: resolve(kibanaPath, 'src/fixtures'),
         test_utils: resolve(kibanaPath, 'src/test_utils/public'),
       },

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());