Skip to content

Commit befb7bc

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into nls/no-use-location
2 parents 23a6c9b + 8276afd commit befb7bc

410 files changed

Lines changed: 12617 additions & 4277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/visualize/images/lens_drag_drop.gif‎

-166 KB
Loading

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
9393
"**/image-diff/gm/debug": "^2.6.9",
9494
"**/load-grunt-config/lodash": "^4.17.20",
95+
"**/node-jose/node-forge": "^0.10.0",
9596
"**/react-dom": "^16.12.0",
9697
"**/react": "^16.12.0",
9798
"**/react-test-renderer": "^16.12.0",
@@ -191,7 +192,7 @@
191192
"moment-timezone": "^0.5.27",
192193
"mustache": "2.3.2",
193194
"node-fetch": "1.7.3",
194-
"node-forge": "^0.9.1",
195+
"node-forge": "^0.10.0",
195196
"opn": "^5.5.0",
196197
"oppsy": "^2.0.0",
197198
"p-map": "^4.0.0",
@@ -305,7 +306,7 @@
305306
"@types/moment-timezone": "^0.5.12",
306307
"@types/mustache": "^0.8.31",
307308
"@types/node": ">=10.17.17 <10.20.0",
308-
"@types/node-forge": "^0.9.0",
309+
"@types/node-forge": "^0.9.5",
309310
"@types/normalize-path": "^3.0.0",
310311
"@types/opn": "^5.1.0",
311312
"@types/pegjs": "^0.10.1",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ exports.getWebpackConfig = function (kibanaPath) {
2727
mainFields: ['browser', 'main'],
2828
modules: ['node_modules', resolve(kibanaPath, 'node_modules')],
2929
alias: {
30-
// Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/legacy/ui/ui_bundler_env.js#L30-L36
31-
ui: resolve(kibanaPath, 'src/legacy/ui/public'),
32-
3330
// Dev defaults for test bundle https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/core_plugins/tests_bundle/index.js#L73-L78
34-
ng_mock$: resolve(kibanaPath, 'src/test_utils/public/ng_mock'),
3531
fixtures: resolve(kibanaPath, 'src/fixtures'),
3632
test_utils: resolve(kibanaPath, 'src/test_utils/public'),
3733
},

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { ToolingLog } from '@kbn/dev-utils';
2121
import { defaultsDeep } from 'lodash';
2222

2323
import { Config } from './config';
24-
import { transformDeprecations } from './transform_deprecations';
2524

2625
const cache = new WeakMap();
2726

@@ -52,8 +51,7 @@ async function getSettingsFromFile(log: ToolingLog, path: string, settingOverrid
5251
await cache.get(configProvider)!
5352
);
5453

55-
const logDeprecation = (error: string | Error) => log.error(error);
56-
return transformDeprecations(settingsWithDefaults, logDeprecation);
54+
return settingsWithDefaults;
5755
}
5856

5957
export async function readConfigFile(log: ToolingLog, path: string, settingOverrides: any = {}) {

‎packages/kbn-test/src/functional_test_runner/lib/config/transform_deprecations.ts‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -217,34 +217,4 @@ describe('getUnusedConfigKeys', () => {
217217
})
218218
).toEqual([]);
219219
});
220-
221-
describe('using deprecation', () => {
222-
it('should use the plugin deprecations provider', async () => {
223-
expect(
224-
await getUnusedConfigKeys({
225-
coreHandledConfigPaths: [],
226-
pluginSpecs: [
227-
({
228-
getDeprecationsProvider() {
229-
return async ({ rename }: any) => [rename('foo1', 'foo2')];
230-
},
231-
getConfigPrefix: () => 'foo',
232-
} as unknown) as LegacyPluginSpec,
233-
],
234-
disabledPluginSpecs: [],
235-
settings: {
236-
foo: {
237-
foo: 'dolly',
238-
foo1: 'bar',
239-
},
240-
},
241-
legacyConfig: getConfig({
242-
foo: {
243-
foo2: 'bar',
244-
},
245-
}),
246-
})
247-
).toEqual(['foo.foo']);
248-
});
249-
});
250220
});

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import { set } from '@elastic/safer-lodash-set';
21-
import { difference, get } from 'lodash';
22-
// @ts-expect-error
23-
import { getTransform } from '../../../../legacy/deprecation/index';
20+
import { difference } from 'lodash';
2421
import { unset } from '../../../../legacy/utils';
2522
import { getFlattenedObject } from '../../../utils';
2623
import { hasConfigPathIntersection } from '../../config';
@@ -41,21 +38,6 @@ export async function getUnusedConfigKeys({
4138
settings: LegacyVars;
4239
legacyConfig: LegacyConfig;
4340
}) {
44-
// transform deprecated plugin settings
45-
for (let i = 0; i < pluginSpecs.length; i++) {
46-
const spec = pluginSpecs[i];
47-
const transform = await getTransform(spec);
48-
const prefix = spec.getConfigPrefix();
49-
50-
// nested plugin prefixes (a.b) translate to nested objects
51-
const pluginSettings = get(settings, prefix);
52-
if (pluginSettings) {
53-
// flattened settings are expected to be converted to nested objects
54-
// a.b = true => { a: { b: true }}
55-
set(settings, prefix, transform(pluginSettings));
56-
}
57-
}
58-
5941
// remove config values from disabled plugins
6042
for (const spec of disabledPluginSpecs) {
6143
unset(settings, spec.getConfigPrefix());

‎src/legacy/deprecation/__tests__/create_transform.js‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎src/legacy/deprecation/create_transform.js‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/legacy/deprecation/deprecations/__tests__/rename.js‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)