Merge branch 'master' of https://github.com/elastic/kibana into metri…

…cs-alerting

package.json

@@ -77,7 +77,7 @@
     "url": "https://github.com/elastic/kibana.git"
   },
   "resolutions": {
-    "**/@types/node": "10.12.27",
+    "**/@types/node": ">=10.17.17 <10.20.0",
     "**/@types/react": "^16.9.19",
     "**/@types/react-router": "^5.1.3",
     "**/@types/hapi": "^17.0.18",
@@ -350,7 +350,7 @@
     "@types/mocha": "^5.2.7",
     "@types/moment-timezone": "^0.5.12",
     "@types/mustache": "^0.8.31",
-    "@types/node": "^10.12.27",
+    "@types/node": ">=10.17.17 <10.20.0",
     "@types/node-forge": "^0.9.0",
     "@types/normalize-path": "^3.0.0",
     "@types/numeral": "^0.0.26",

packages/kbn-config-schema/src/internals/index.ts

@@ -314,7 +314,8 @@ export const internals = Joi.extend([
           for (const [entryKey, entryValue] of value) {
             const { value: validatedEntryKey, error: keyError } = Joi.validate(
               entryKey,
-              params.key
+              params.key,
+              { presence: 'required' }
             );
 
             if (keyError) {
@@ -323,7 +324,8 @@ export const internals = Joi.extend([
 
             const { value: validatedEntryValue, error: valueError } = Joi.validate(
               entryValue,
-              params.value
+              params.value,
+              { presence: 'required' }
             );
 
             if (valueError) {
@@ -374,7 +376,8 @@ export const internals = Joi.extend([
           for (const [entryKey, entryValue] of Object.entries(value)) {
             const { value: validatedEntryKey, error: keyError } = Joi.validate(
               entryKey,
-              params.key
+              params.key,
+              { presence: 'required' }
             );
 
             if (keyError) {
@@ -383,7 +386,8 @@ export const internals = Joi.extend([
 
             const { value: validatedEntryValue, error: valueError } = Joi.validate(
               entryValue,
-              params.value
+              params.value,
+              { presence: 'required' }
             );
 
             if (valueError) {

packages/kbn-config-schema/src/types/map_of_type.test.ts

@@ -159,6 +159,24 @@ test('object within mapOf', () => {
   expect(type.validate(value)).toEqual(expected);
 });
 
+test('enforces required object fields within mapOf', () => {
+  const type = schema.mapOf(
+    schema.string(),
+    schema.object({
+      bar: schema.object({
+        baz: schema.number(),
+      }),
+    })
+  );
+  const value = {
+    foo: {},
+  };
+
+  expect(() => type.validate(value)).toThrowErrorMatchingInlineSnapshot(
+    `"[foo.bar.baz]: expected value of type [number] but got [undefined]"`
+  );
+});
+
 test('error preserves full path', () => {
   const type = schema.object({
     grandParentKey: schema.object({

packages/kbn-config-schema/src/types/map_type.ts

@@ -57,7 +57,10 @@ export class MapOfType<K, V> extends Type<Map<K, V>> {
           path.length,
           0,
           // If `key` validation failed, let's stress that to make error more obvious.
-          type === 'map.key' ? `key("${entryKey}")` : entryKey.toString()
+          type === 'map.key' ? `key("${entryKey}")` : entryKey.toString(),
+          // Error could have happened deep inside value/key schema and error message should
+          // include full path.
+          ...(reason instanceof SchemaTypeError ? reason.path : [])
         );
 
         return reason instanceof SchemaTypesError

packages/kbn-config-schema/src/types/record_of_type.test.ts

@@ -159,6 +159,24 @@ test('object within recordOf', () => {
   expect(type.validate(value)).toEqual({ foo: { bar: 123 } });
 });
 
+test('enforces required object fields within recordOf', () => {
+  const type = schema.recordOf(
+    schema.string(),
+    schema.object({
+      bar: schema.object({
+        baz: schema.number(),
+      }),
+    })
+  );
+  const value = {
+    foo: {},
+  };
+
+  expect(() => type.validate(value)).toThrowErrorMatchingInlineSnapshot(
+    `"[foo.bar.baz]: expected value of type [number] but got [undefined]"`
+  );
+});
+
 test('error preserves full path', () => {
   const type = schema.object({
     grandParentKey: schema.object({

packages/kbn-config-schema/src/types/record_type.ts

@@ -49,7 +49,10 @@ export class RecordOfType<K extends string, V> extends Type<Record<K, V>> {
           path.length,
           0,
           // If `key` validation failed, let's stress that to make error more obvious.
-          type === 'record.key' ? `key("${entryKey}")` : entryKey.toString()
+          type === 'record.key' ? `key("${entryKey}")` : entryKey.toString(),
+          // Error could have happened deep inside value/key schema and error message should
+          // include full path.
+          ...(reason instanceof SchemaTypeError ? reason.path : [])
         );
 
         return reason instanceof SchemaTypesError

packages/kbn-dev-utils/src/run/run.ts

@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { inspect } from 'util';
+
 // @ts-ignore @types are outdated and module is super simple
 import exitHook from 'exit-hook';
 
@@ -62,7 +64,11 @@ export async function run(fn: RunFn, options: Options = {}) {
 
   process.on('unhandledRejection', error => {
     log.error('UNHANDLED PROMISE REJECTION');
-    log.error(error);
+    log.error(
+      error instanceof Error
+        ? error
+        : new Error(`non-Error type rejection value: ${inspect(error)}`)
+    );
     process.exit(1);
   });
 

packages/kbn-pm/dist/index.js

@@ -39806,6 +39806,7 @@ exports.isFailError = fail_1.isFailError;
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = __webpack_require__(36);
+const util_1 = __webpack_require__(29);
 // @ts-ignore @types are outdated and module is super simple
 const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(348));
 const tooling_log_1 = __webpack_require__(415);
@@ -39825,7 +39826,9 @@ async function run(fn, options = {}) {
     });
     process.on('unhandledRejection', error => {
         log.error('UNHANDLED PROMISE REJECTION');
-        log.error(error);
+        log.error(error instanceof Error
+            ? error
+            : new Error(`non-Error type rejection value: ${util_1.inspect(error)}`));
         process.exit(1);
     });
     const handleErrorWithoutExit = (error) => {

packages/kbn-pm/package.json

@@ -26,7 +26,7 @@
     "@types/lodash.clonedeepwith": "^4.5.3",
     "@types/log-symbols": "^2.0.0",
     "@types/ncp": "^2.0.1",
-    "@types/node": "^10.12.27",
+    "@types/node": ">=10.17.17 <10.20.0",
     "@types/ora": "^1.3.5",
     "@types/read-pkg": "^4.0.0",
     "@types/strip-ansi": "^3.0.0",

packages/kbn-test/src/functional_test_runner/cli.ts

@@ -18,6 +18,7 @@
  */
 
 import { resolve } from 'path';
+import { inspect } from 'util';
 import { run, createFlagError, Flags } from '@kbn/dev-utils';
 import { FunctionalTestRunner } from './functional_test_runner';
 
@@ -86,7 +87,11 @@ export function runFtrCli() {
         }
       };
 
-      process.on('unhandledRejection', err => teardown(err));
+      process.on('unhandledRejection', err =>
+        teardown(
+          err instanceof Error ? err : new Error(`non-Error type rejection value: ${inspect(err)}`)
+        )
+      );
       process.on('SIGTERM', () => teardown());
       process.on('SIGINT', () => teardown());
 

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -53,8 +53,6 @@ export { wrapInI18nContext } from 'ui/i18n';
 import { search } from '../../../../../plugins/data/public';
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
 // @ts-ignore
-export { shortenDottedString } from '../../common/utils/shorten_dotted_string';
-// @ts-ignore
 export { intervalOptions } from 'ui/agg_types';
 export { subscribeWithScope } from '../../../../../plugins/kibana_legacy/public';
 // @ts-ignore

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx

@@ -21,7 +21,7 @@ import classNames from 'classnames';
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 
 import { FieldIcon, FieldIconProps } from '../../../../../../../../../plugins/kibana_react/public';
-import { shortenDottedString } from '../../../../kibana_services';
+import { shortenDottedString } from '../../../helpers';
 import { getFieldTypeName } from './field_type_name';
 
 // property field is provided at discover's field chooser

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx

@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern, shortenDottedString } from '../../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
+import { shortenDottedString } from '../../../../helpers';
 
 export type SortOrder = [string, string];
 export interface ColumnProps {

src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/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 { shortenDottedString } from './shorten_dotted_string';

src/legacy/core_plugins/kibana/common/utils/shorten_dotted_string.js → src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/shorten_dotted_string.ts

@@ -22,10 +22,5 @@ const DOT_PREFIX_RE = /(.).+?\./g;
 /**
  * Convert a dot.notated.string into a short
  * version (d.n.string)
- *
- * @param {string} str - the long string to convert
- * @return {string}
  */
-export function shortenDottedString(input) {
-  return typeof input !== 'string' ? input : input.replace(DOT_PREFIX_RE, '$1.');
-}
+export const shortenDottedString = (input: string) => input.replace(DOT_PREFIX_RE, '$1.');

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js

@@ -178,6 +178,7 @@ export class Table extends PureComponent {
           { defaultMessage: 'Type of the saved object' }
         ),
         sortable: false,
+        'data-test-subj': 'savedObjectsTableRowType',
         render: (type, object) => {
           return (
             <EuiToolTip position="top" content={getSavedObjectLabel(type)}>
@@ -201,6 +202,7 @@ export class Table extends PureComponent {
         ),
         dataType: 'string',
         sortable: false,
+        'data-test-subj': 'savedObjectsTableRowTitle',
         render: (title, object) => {
           const { path } = object.meta.inAppUrl || {};
           const canGoInApp = this.props.canGoInApp(object);
@@ -230,6 +232,7 @@ export class Table extends PureComponent {
             icon: 'inspect',
             onClick: object => goInspectObject(object),
             available: object => !!object.meta.editUrl,
+            'data-test-subj': 'savedObjectsTableAction-inspect',
           },
           {
             name: i18n.translate(
@@ -246,10 +249,12 @@ export class Table extends PureComponent {
             type: 'icon',
             icon: 'kqlSelector',
             onClick: object => onShowRelationships(object),
+            'data-test-subj': 'savedObjectsTableAction-relationships',
           },
           ...this.extraActions.map(action => {
             return {
               ...action.euiAction,
+              'data-test-subj': `savedObjectsTableAction-${action.id}`,
               onClick: object => {
                 this.setState({
                   activeAction: action,
@@ -372,6 +377,9 @@ export class Table extends PureComponent {
             pagination={pagination}
             selection={selection}
             onChange={onTableChange}
+            rowProps={item => ({
+              'data-test-subj': `savedObjectsTableRow row-${item.id}`,
+            })}
           />
         </div>
       </Fragment>