From 8d1bd5e9512237b2068eb6d41beadc2635d62743 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Tue, 7 Jan 2020 13:35:44 -0500
Subject: [PATCH 1/9] Update Duration to coerce number strings to numbers (in
 millis)

---
 packages/kbn-config-schema/src/duration/index.ts   | 14 ++++++++++----
 .../types/__snapshots__/duration_type.test.ts.snap |  2 ++
 .../src/types/duration_type.test.ts                |  8 ++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/kbn-config-schema/src/duration/index.ts b/packages/kbn-config-schema/src/duration/index.ts
index ff8f96614a193..35071d4dbaa7c 100644
--- a/packages/kbn-config-schema/src/duration/index.ts
+++ b/packages/kbn-config-schema/src/duration/index.ts
@@ -21,14 +21,20 @@ import { Duration, duration as momentDuration, DurationInputArg2, isDuration } f
 export { Duration, isDuration };
 
 const timeFormatRegex = /^(0|[1-9][0-9]*)(ms|s|m|h|d|w|M|Y)$/;
+const numberRegex = /^(0|[1-9][0-9]*)$/;
 
 function stringToDuration(text: string) {
   const result = timeFormatRegex.exec(text);
   if (!result) {
-    throw new Error(
-      `Failed to parse [${text}] as time value. ` +
-        `Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')`
-    );
+    const numberResult = numberRegex.exec(text);
+    if (!numberResult) {
+      throw new Error(
+        `Failed to parse [${text}] as time value. ` +
+          `Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')`
+      );
+    }
+    const count = parseInt(numberResult[1], 0);
+    return momentDuration(count, 'ms');
   }
 
   const count = parseInt(result[1], 0);
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
index a21c28e7cc614..21dbaee0db44d 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
@@ -6,6 +6,8 @@ exports[`#defaultValue can be a number 1`] = `"PT0.6S"`;
 
 exports[`#defaultValue can be a string 1`] = `"PT1H"`;
 
+exports[`#defaultValue can be a string-formatted number 1`] = `"PT0.6S"`;
+
 exports[`includes namespace in failure 1`] = `"[foo-namespace]: expected value of type [moment.Duration] but got [undefined]"`;
 
 exports[`is required by default 1`] = `"expected value of type [moment.Duration] but got [undefined]"`;
diff --git a/packages/kbn-config-schema/src/types/duration_type.test.ts b/packages/kbn-config-schema/src/types/duration_type.test.ts
index 39655d43d7b75..16263111262fd 100644
--- a/packages/kbn-config-schema/src/types/duration_type.test.ts
+++ b/packages/kbn-config-schema/src/types/duration_type.test.ts
@@ -51,6 +51,14 @@ describe('#defaultValue', () => {
     ).toMatchSnapshot();
   });
 
+  test('can be a string-formatted number', () => {
+    expect(
+      duration({
+        defaultValue: '600',
+      }).validate(undefined)
+    ).toMatchSnapshot();
+  });
+
   test('can be a number', () => {
     expect(
       duration({

From 056c5976d6cadf7b61cf239ac7d4ee3fa520bee8 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Tue, 7 Jan 2020 14:08:58 -0500
Subject: [PATCH 2/9] Coerce in a way that's consistent with kbn-config-schema

---
 packages/kbn-config-schema/src/duration/index.ts          | 8 +++-----
 .../src/types/__snapshots__/duration_type.test.ts.snap    | 2 ++
 .../kbn-config-schema/src/types/duration_type.test.ts     | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/kbn-config-schema/src/duration/index.ts b/packages/kbn-config-schema/src/duration/index.ts
index 35071d4dbaa7c..2dab725500b04 100644
--- a/packages/kbn-config-schema/src/duration/index.ts
+++ b/packages/kbn-config-schema/src/duration/index.ts
@@ -21,20 +21,18 @@ import { Duration, duration as momentDuration, DurationInputArg2, isDuration } f
 export { Duration, isDuration };
 
 const timeFormatRegex = /^(0|[1-9][0-9]*)(ms|s|m|h|d|w|M|Y)$/;
-const numberRegex = /^(0|[1-9][0-9]*)$/;
 
 function stringToDuration(text: string) {
   const result = timeFormatRegex.exec(text);
   if (!result) {
-    const numberResult = numberRegex.exec(text);
-    if (!numberResult) {
+    const number = Number(text);
+    if (typeof number !== 'number' || isNaN(number)) {
       throw new Error(
         `Failed to parse [${text}] as time value. ` +
           `Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')`
       );
     }
-    const count = parseInt(numberResult[1], 0);
-    return momentDuration(count, 'ms');
+    return numberToDuration(number);
   }
 
   const count = parseInt(result[1], 0);
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
index 21dbaee0db44d..2cfb61ebee6ca 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
@@ -24,4 +24,6 @@ exports[`returns error when not string or non-safe positive integer 5`] = `"expe
 
 exports[`returns error when not string or non-safe positive integer 6`] = `"expected value of type [moment.Duration] but got [RegExp]"`;
 
+exports[`returns error when not string or non-safe positive integer 7`] = `"Failed to parse [123foo] as time value. Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')"`;
+
 exports[`returns value by default 1`] = `"PT2M3S"`;
diff --git a/packages/kbn-config-schema/src/types/duration_type.test.ts b/packages/kbn-config-schema/src/types/duration_type.test.ts
index 16263111262fd..7c67d4eef9255 100644
--- a/packages/kbn-config-schema/src/types/duration_type.test.ts
+++ b/packages/kbn-config-schema/src/types/duration_type.test.ts
@@ -144,4 +144,6 @@ test('returns error when not string or non-safe positive integer', () => {
   expect(() => duration().validate([1, 2, 3])).toThrowErrorMatchingSnapshot();
 
   expect(() => duration().validate(/abc/)).toThrowErrorMatchingSnapshot();
+
+  expect(() => duration().validate('123foo')).toThrowErrorMatchingSnapshot();
 });

From 0e8cea92493c645d4e3552d6b3783ca2d987bd99 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Tue, 7 Jan 2020 15:54:18 -0500
Subject: [PATCH 3/9] Update ByteSizeValue to coerce strings to numbers

---
 .../src/byte_size_value/index.test.ts                  |  8 ++++----
 .../kbn-config-schema/src/byte_size_value/index.ts     | 10 +++++++---
 .../types/__snapshots__/byte_size_type.test.ts.snap    |  6 ++++++
 .../kbn-config-schema/src/types/byte_size_type.test.ts |  8 ++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/kbn-config-schema/src/byte_size_value/index.test.ts b/packages/kbn-config-schema/src/byte_size_value/index.test.ts
index 46ed96c83dd1f..1b9b3def65df0 100644
--- a/packages/kbn-config-schema/src/byte_size_value/index.test.ts
+++ b/packages/kbn-config-schema/src/byte_size_value/index.test.ts
@@ -20,6 +20,10 @@
 import { ByteSizeValue } from '.';
 
 describe('parsing units', () => {
+  test('number string (bytes)', () => {
+    expect(ByteSizeValue.parse('123').getValueInBytes()).toBe(123);
+  });
+
   test('bytes', () => {
     expect(ByteSizeValue.parse('123b').getValueInBytes()).toBe(123);
   });
@@ -37,10 +41,6 @@ describe('parsing units', () => {
     expect(ByteSizeValue.parse('1gb').getValueInBytes()).toBe(1073741824);
   });
 
-  test('throws an error when no unit specified', () => {
-    expect(() => ByteSizeValue.parse('123')).toThrowError('could not parse byte size value');
-  });
-
   test('throws an error when unsupported unit specified', () => {
     expect(() => ByteSizeValue.parse('1tb')).toThrowError('could not parse byte size value');
   });
diff --git a/packages/kbn-config-schema/src/byte_size_value/index.ts b/packages/kbn-config-schema/src/byte_size_value/index.ts
index fb0105503a149..8a55f73469c5a 100644
--- a/packages/kbn-config-schema/src/byte_size_value/index.ts
+++ b/packages/kbn-config-schema/src/byte_size_value/index.ts
@@ -35,9 +35,13 @@ export class ByteSizeValue {
   public static parse(text: string): ByteSizeValue {
     const match = /([1-9][0-9]*)(b|kb|mb|gb)/.exec(text);
     if (!match) {
-      throw new Error(
-        `could not parse byte size value [${text}]. Value must be a safe positive integer.`
-      );
+      const number = Number(text);
+      if (typeof number !== 'number' || isNaN(number)) {
+        throw new Error(
+          `could not parse byte size value [${text}]. Value must be a safe positive integer.`
+        );
+      }
+      return new ByteSizeValue(number);
     }
 
     const value = parseInt(match[1], 0);
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
index f6f45a96ca161..6029476a5e472 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
@@ -18,6 +18,12 @@ ByteSizeValue {
 }
 `;
 
+exports[`#defaultValue can be a string-formatted number 1`] = `
+ByteSizeValue {
+  "valueInBytes": 1024,
+}
+`;
+
 exports[`#max returns error when larger 1`] = `"Value is [1mb] ([1048576b]) but it must be equal to or less than [1kb]"`;
 
 exports[`#max returns value when smaller 1`] = `
diff --git a/packages/kbn-config-schema/src/types/byte_size_type.test.ts b/packages/kbn-config-schema/src/types/byte_size_type.test.ts
index 67eae1e7c382a..8966b6ea8ceb6 100644
--- a/packages/kbn-config-schema/src/types/byte_size_type.test.ts
+++ b/packages/kbn-config-schema/src/types/byte_size_type.test.ts
@@ -51,6 +51,14 @@ describe('#defaultValue', () => {
     ).toMatchSnapshot();
   });
 
+  test('can be a string-formatted number', () => {
+    expect(
+      byteSize({
+        defaultValue: '1024',
+      }).validate(undefined)
+    ).toMatchSnapshot();
+  });
+
   test('can be a number', () => {
     expect(
       byteSize({

From ff2da177e2addaf3e58175c7cb8bf7d01d9d786b Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:19:39 -0500
Subject: [PATCH 4/9] Update Boolean to coerce strings to boolean values

---
 .../kbn-config-schema/src/internals/index.ts   | 18 +++++++++++++++++-
 .../__snapshots__/boolean_type.test.ts.snap    |  4 ++++
 .../src/types/boolean_type.test.ts             | 11 +++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/kbn-config-schema/src/internals/index.ts b/packages/kbn-config-schema/src/internals/index.ts
index 4d5091eaa09b1..044c3050f9fa8 100644
--- a/packages/kbn-config-schema/src/internals/index.ts
+++ b/packages/kbn-config-schema/src/internals/index.ts
@@ -82,7 +82,23 @@ export const internals = Joi.extend([
     base: Joi.boolean(),
     coerce(value: any, state: State, options: ValidationOptions) {
       // If value isn't defined, let Joi handle default value if it's defined.
-      if (value !== undefined && typeof value !== 'boolean') {
+      if (value === undefined) {
+        return value;
+      }
+
+      // Allow strings 'true' and 'false' to be coerced to booleans (case-insensitive).
+
+      // From Joi docs on `Joi.boolean`:
+      // > Generates a schema object that matches a boolean data type. Can also
+      // >  be called via bool(). If the validation convert option is on
+      // > (enabled by default), a string (either "true" or "false") will be
+      // converted to a boolean if specified.
+      if (typeof value === 'string') {
+        const normalized = value.toLowerCase();
+        value = normalized === 'true' ? true : normalized === 'false' ? false : value;
+      }
+
+      if (typeof value !== 'boolean') {
         return this.createError('boolean.base', { value }, state, options);
       }
 
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap
index c3f33dc29bf50..0e5f6de2deea8 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap
@@ -9,3 +9,7 @@ exports[`returns error when not boolean 1`] = `"expected value of type [boolean]
 exports[`returns error when not boolean 2`] = `"expected value of type [boolean] but got [Array]"`;
 
 exports[`returns error when not boolean 3`] = `"expected value of type [boolean] but got [string]"`;
+
+exports[`returns error when not boolean 4`] = `"expected value of type [boolean] but got [number]"`;
+
+exports[`returns error when not boolean 5`] = `"expected value of type [boolean] but got [string]"`;
diff --git a/packages/kbn-config-schema/src/types/boolean_type.test.ts b/packages/kbn-config-schema/src/types/boolean_type.test.ts
index d6e274f05e3ff..24a0fe2f62b1d 100644
--- a/packages/kbn-config-schema/src/types/boolean_type.test.ts
+++ b/packages/kbn-config-schema/src/types/boolean_type.test.ts
@@ -23,6 +23,13 @@ test('returns value by default', () => {
   expect(schema.boolean().validate(true)).toBe(true);
 });
 
+test('handles boolean strings', () => {
+  expect(schema.boolean().validate('true')).toBe(true);
+  expect(schema.boolean().validate('TRUE')).toBe(true);
+  expect(schema.boolean().validate('false')).toBe(false);
+  expect(schema.boolean().validate('FALSE')).toBe(false);
+});
+
 test('is required by default', () => {
   expect(() => schema.boolean().validate(undefined)).toThrowErrorMatchingSnapshot();
 });
@@ -49,4 +56,8 @@ test('returns error when not boolean', () => {
   expect(() => schema.boolean().validate([1, 2, 3])).toThrowErrorMatchingSnapshot();
 
   expect(() => schema.boolean().validate('abc')).toThrowErrorMatchingSnapshot();
+
+  expect(() => schema.boolean().validate(0)).toThrowErrorMatchingSnapshot();
+
+  expect(() => schema.boolean().validate('no')).toThrowErrorMatchingSnapshot();
 });

From 89f8964159a493816f9f4fdca752612366c06588 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Tue, 7 Jan 2020 17:41:23 -0500
Subject: [PATCH 5/9] Fix Jest test

---
 .../actions/server/builtin_action_types/es_index.test.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
index 35d81ba74fa72..1da8b06e1587a 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts
@@ -142,7 +142,7 @@ describe('params validation', () => {
     );
 
     expect(() => {
-      validateParams(actionType, { refresh: 'true' });
+      validateParams(actionType, { refresh: 'foo' });
     }).toThrowErrorMatchingInlineSnapshot(
       `"error validating action params: [refresh]: expected value of type [boolean] but got [string]"`
     );

From c90d6cfe3dd98421eaaafb0ef16dcb656f8a66d9 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 8 Jan 2020 10:57:52 -0500
Subject: [PATCH 6/9] Address PR review feedback

---
 packages/kbn-config-schema/README.md          | 19 ++++++++++--------
 .../__snapshots__/index.test.ts.snap          | 10 ++++++----
 .../src/byte_size_value/index.test.ts         |  2 +-
 .../src/byte_size_value/index.ts              |  6 +++---
 .../kbn-config-schema/src/duration/index.ts   |  7 +++----
 .../__snapshots__/byte_size_type.test.ts.snap | 20 +++++++++----------
 .../__snapshots__/duration_type.test.ts.snap  | 16 +++++++--------
 .../src/types/boolean_type.test.ts            |  4 ++++
 .../src/types/byte_size_type.test.ts          | 16 +++++++++++++--
 .../src/types/duration_type.test.ts           | 14 +++++++++++--
 10 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/packages/kbn-config-schema/README.md b/packages/kbn-config-schema/README.md
index fd62f1b3c03b2..edd48f1cea422 100644
--- a/packages/kbn-config-schema/README.md
+++ b/packages/kbn-config-schema/README.md
@@ -128,10 +128,10 @@ Validates input data as a number.
 __Output type:__ `number`
 
 __Options:__
-  * `defaultValue: number | Reference<number> | (() => number)` - defines a default value, see [Default values](#default-values) section for more details.
-  * `validate: (value: number) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
-  * `min: number` - defines a minimum value the number should have.
-  * `max: number` - defines a maximum value the number should have.
+  * `defaultValue: number | string | Reference<number | string> | (() => number | string)` - defines a default value, see [Default values](#default-values) section for more details.
+  * `validate: (value: number | string) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
+  * `min: number | string` - defines a minimum value the number should have.
+  * `max: number | string` - defines a maximum value the number should have.
 
 __Usage:__
 ```typescript
@@ -148,14 +148,17 @@ Validates input data as a boolean.
 __Output type:__ `boolean`
 
 __Options:__
-  * `defaultValue: boolean | Reference<boolean> | (() => boolean)` - defines a default value, see [Default values](#default-values) section for more details.
-  * `validate: (value: boolean) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
+  * `defaultValue: boolean | string | Reference<boolean | string> | (() => boolean | string)` - defines a default value, see [Default values](#default-values) section for more details.
+  * `validate: (value: boolean | string) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
 
 __Usage:__
 ```typescript
 const valueSchema = schema.boolean({ defaultValue: false });
 ```
 
+__Notes:__
+* The `schema.boolean()` also supports a string as input if it equals `'true'` or `'false'` (case-insensitive).
+
 #### `schema.literal()`
 
 Validates input data as a [string](https://www.typescriptlang.org/docs/handbook/advanced-types.html#string-literal-types), [numeric](https://www.typescriptlang.org/docs/handbook/advanced-types.html#numeric-literal-types) or boolean literal.
@@ -397,7 +400,7 @@ const valueSchema = schema.byteSize({ min: '3kb' });
 ```
 
 __Notes:__
-* The string value for `schema.byteSize()` and its options supports the following prefixes: `b`, `kb`, `mb`, `gb` and `tb`.
+* The string value for `schema.byteSize()` and its options supports the following optional suffixes: `b`, `kb`, `mb`, `gb` and `tb`. The default suffix is `b`.
 * The number value is treated as a number of bytes and hence should be a positive integer, e.g. `100` is equal to `'100b'`.
 * Currently you cannot specify zero bytes with a string format and should use number `0` instead.
 
@@ -417,7 +420,7 @@ const valueSchema = schema.duration({ defaultValue: '70ms' });
 ```
 
 __Notes:__
-* The string value for `schema.duration()` supports the following prefixes: `ms`, `s`, `m`, `h`, `d`, `w`, `M` and `Y`.
+* The string value for `schema.duration()` supports the following optional suffixes: `ms`, `s`, `m`, `h`, `d`, `w`, `M` and `Y`. The default suffix is `ms`.
 * The number value is treated as a number of milliseconds and hence should be a positive integer, e.g. `100` is equal to `'100ms'`.
 
 #### `schema.conditional()`
diff --git a/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap b/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap
index 1db6930062a9a..97e9082401b3d 100644
--- a/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap
+++ b/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap
@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`#constructor throws if number of bytes is negative 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-1024]"`;
+exports[`#constructor throws if number of bytes is negative 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-1024]."`;
 
-exports[`#constructor throws if number of bytes is not safe 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]"`;
+exports[`#constructor throws if number of bytes is not safe 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]."`;
 
-exports[`#constructor throws if number of bytes is not safe 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]"`;
+exports[`#constructor throws if number of bytes is not safe 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]."`;
 
-exports[`#constructor throws if number of bytes is not safe 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]"`;
+exports[`#constructor throws if number of bytes is not safe 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]."`;
+
+exports[`parsing units throws an error when unsupported unit specified 1`] = `"Failed to parse [1tb] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] (e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer."`;
diff --git a/packages/kbn-config-schema/src/byte_size_value/index.test.ts b/packages/kbn-config-schema/src/byte_size_value/index.test.ts
index 1b9b3def65df0..198d95aa0ab4c 100644
--- a/packages/kbn-config-schema/src/byte_size_value/index.test.ts
+++ b/packages/kbn-config-schema/src/byte_size_value/index.test.ts
@@ -42,7 +42,7 @@ describe('parsing units', () => {
   });
 
   test('throws an error when unsupported unit specified', () => {
-    expect(() => ByteSizeValue.parse('1tb')).toThrowError('could not parse byte size value');
+    expect(() => ByteSizeValue.parse('1tb')).toThrowErrorMatchingSnapshot();
   });
 });
 
diff --git a/packages/kbn-config-schema/src/byte_size_value/index.ts b/packages/kbn-config-schema/src/byte_size_value/index.ts
index 8a55f73469c5a..48862821bb78d 100644
--- a/packages/kbn-config-schema/src/byte_size_value/index.ts
+++ b/packages/kbn-config-schema/src/byte_size_value/index.ts
@@ -38,7 +38,8 @@ export class ByteSizeValue {
       const number = Number(text);
       if (typeof number !== 'number' || isNaN(number)) {
         throw new Error(
-          `could not parse byte size value [${text}]. Value must be a safe positive integer.`
+          `Failed to parse [${text}] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] ` +
+            `(e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer.`
         );
       }
       return new ByteSizeValue(number);
@@ -53,8 +54,7 @@ export class ByteSizeValue {
   constructor(private readonly valueInBytes: number) {
     if (!Number.isSafeInteger(valueInBytes) || valueInBytes < 0) {
       throw new Error(
-        `Value in bytes is expected to be a safe positive integer, ` +
-          `but provided [${valueInBytes}]`
+        `Value in bytes is expected to be a safe positive integer, but provided [${valueInBytes}].`
       );
     }
   }
diff --git a/packages/kbn-config-schema/src/duration/index.ts b/packages/kbn-config-schema/src/duration/index.ts
index 2dab725500b04..b96b5a3687bbb 100644
--- a/packages/kbn-config-schema/src/duration/index.ts
+++ b/packages/kbn-config-schema/src/duration/index.ts
@@ -28,8 +28,8 @@ function stringToDuration(text: string) {
     const number = Number(text);
     if (typeof number !== 'number' || isNaN(number)) {
       throw new Error(
-        `Failed to parse [${text}] as time value. ` +
-          `Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')`
+        `Failed to parse [${text}] as time value. Value must be a duration in milliseconds, or follow the format ` +
+          `<count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer.`
       );
     }
     return numberToDuration(number);
@@ -44,8 +44,7 @@ function stringToDuration(text: string) {
 function numberToDuration(numberMs: number) {
   if (!Number.isSafeInteger(numberMs) || numberMs < 0) {
     throw new Error(
-      `Failed to parse [${numberMs}] as time value. ` +
-        `Value should be a safe positive integer number.`
+      `Value in milliseconds is expected to be a safe positive integer, but provided [${numberMs}].`
     );
   }
 
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
index 6029476a5e472..ea2102b1776fb 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap
@@ -44,20 +44,18 @@ exports[`includes namespace in failure 1`] = `"[foo-namespace]: expected value o
 
 exports[`is required by default 1`] = `"expected value of type [ByteSize] but got [undefined]"`;
 
-exports[`returns error when not string or positive safe integer 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-123]"`;
+exports[`returns error when not valid string or positive safe integer 1`] = `"Value in bytes is expected to be a safe positive integer, but provided [-123]."`;
 
-exports[`returns error when not string or positive safe integer 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]"`;
+exports[`returns error when not valid string or positive safe integer 2`] = `"Value in bytes is expected to be a safe positive integer, but provided [NaN]."`;
 
-exports[`returns error when not string or positive safe integer 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]"`;
+exports[`returns error when not valid string or positive safe integer 3`] = `"Value in bytes is expected to be a safe positive integer, but provided [Infinity]."`;
 
-exports[`returns error when not string or positive safe integer 4`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]"`;
+exports[`returns error when not valid string or positive safe integer 4`] = `"Value in bytes is expected to be a safe positive integer, but provided [9007199254740992]."`;
 
-exports[`returns error when not string or positive safe integer 5`] = `"expected value of type [ByteSize] but got [Array]"`;
+exports[`returns error when not valid string or positive safe integer 5`] = `"expected value of type [ByteSize] but got [Array]"`;
 
-exports[`returns error when not string or positive safe integer 6`] = `"expected value of type [ByteSize] but got [RegExp]"`;
+exports[`returns error when not valid string or positive safe integer 6`] = `"expected value of type [ByteSize] but got [RegExp]"`;
 
-exports[`returns value by default 1`] = `
-ByteSizeValue {
-  "valueInBytes": 123,
-}
-`;
+exports[`returns error when not valid string or positive safe integer 7`] = `"Failed to parse [123foo] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] (e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer."`;
+
+exports[`returns error when not valid string or positive safe integer 8`] = `"Failed to parse [123 456] as byte value. Value must be either number of bytes, or follow the format <count>[b|kb|mb|gb] (e.g., '1024kb', '200mb', '1gb'), where the number is a safe positive integer."`;
diff --git a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
index 2cfb61ebee6ca..c4e4ff652a2d7 100644
--- a/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
+++ b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap
@@ -12,18 +12,18 @@ exports[`includes namespace in failure 1`] = `"[foo-namespace]: expected value o
 
 exports[`is required by default 1`] = `"expected value of type [moment.Duration] but got [undefined]"`;
 
-exports[`returns error when not string or non-safe positive integer 1`] = `"Failed to parse [-123] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 1`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [-123]."`;
 
-exports[`returns error when not string or non-safe positive integer 2`] = `"Failed to parse [NaN] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 2`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [NaN]."`;
 
-exports[`returns error when not string or non-safe positive integer 3`] = `"Failed to parse [Infinity] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 3`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [Infinity]."`;
 
-exports[`returns error when not string or non-safe positive integer 4`] = `"Failed to parse [9007199254740992] as time value. Value should be a safe positive integer number."`;
+exports[`returns error when not valid string or non-safe positive integer 4`] = `"Value in milliseconds is expected to be a safe positive integer, but provided [9007199254740992]."`;
 
-exports[`returns error when not string or non-safe positive integer 5`] = `"expected value of type [moment.Duration] but got [Array]"`;
+exports[`returns error when not valid string or non-safe positive integer 5`] = `"expected value of type [moment.Duration] but got [Array]"`;
 
-exports[`returns error when not string or non-safe positive integer 6`] = `"expected value of type [moment.Duration] but got [RegExp]"`;
+exports[`returns error when not valid string or non-safe positive integer 6`] = `"expected value of type [moment.Duration] but got [RegExp]"`;
 
-exports[`returns error when not string or non-safe positive integer 7`] = `"Failed to parse [123foo] as time value. Format must be <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y')"`;
+exports[`returns error when not valid string or non-safe positive integer 7`] = `"Failed to parse [123foo] as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer."`;
 
-exports[`returns value by default 1`] = `"PT2M3S"`;
+exports[`returns error when not valid string or non-safe positive integer 8`] = `"Failed to parse [123 456] as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer."`;
diff --git a/packages/kbn-config-schema/src/types/boolean_type.test.ts b/packages/kbn-config-schema/src/types/boolean_type.test.ts
index 24a0fe2f62b1d..e94999b505437 100644
--- a/packages/kbn-config-schema/src/types/boolean_type.test.ts
+++ b/packages/kbn-config-schema/src/types/boolean_type.test.ts
@@ -26,8 +26,12 @@ test('returns value by default', () => {
 test('handles boolean strings', () => {
   expect(schema.boolean().validate('true')).toBe(true);
   expect(schema.boolean().validate('TRUE')).toBe(true);
+  expect(schema.boolean().validate('True')).toBe(true);
+  expect(schema.boolean().validate('TrUe')).toBe(true);
   expect(schema.boolean().validate('false')).toBe(false);
   expect(schema.boolean().validate('FALSE')).toBe(false);
+  expect(schema.boolean().validate('False')).toBe(false);
+  expect(schema.boolean().validate('FaLse')).toBe(false);
 });
 
 test('is required by default', () => {
diff --git a/packages/kbn-config-schema/src/types/byte_size_type.test.ts b/packages/kbn-config-schema/src/types/byte_size_type.test.ts
index 8966b6ea8ceb6..7c65ec2945b49 100644
--- a/packages/kbn-config-schema/src/types/byte_size_type.test.ts
+++ b/packages/kbn-config-schema/src/types/byte_size_type.test.ts
@@ -23,7 +23,15 @@ import { ByteSizeValue } from '../byte_size_value';
 const { byteSize } = schema;
 
 test('returns value by default', () => {
-  expect(byteSize().validate('123b')).toMatchSnapshot();
+  expect(byteSize().validate('123b')).toEqual(new ByteSizeValue(123));
+});
+
+test('handles numeric strings', () => {
+  expect(byteSize().validate('123')).toEqual(new ByteSizeValue(123));
+});
+
+test('handles numbers', () => {
+  expect(byteSize().validate(123)).toEqual(new ByteSizeValue(123));
 });
 
 test('is required by default', () => {
@@ -96,7 +104,7 @@ describe('#max', () => {
   });
 });
 
-test('returns error when not string or positive safe integer', () => {
+test('returns error when not valid string or positive safe integer', () => {
   expect(() => byteSize().validate(-123)).toThrowErrorMatchingSnapshot();
 
   expect(() => byteSize().validate(NaN)).toThrowErrorMatchingSnapshot();
@@ -108,4 +116,8 @@ test('returns error when not string or positive safe integer', () => {
   expect(() => byteSize().validate([1, 2, 3])).toThrowErrorMatchingSnapshot();
 
   expect(() => byteSize().validate(/abc/)).toThrowErrorMatchingSnapshot();
+
+  expect(() => byteSize().validate('123foo')).toThrowErrorMatchingSnapshot();
+
+  expect(() => byteSize().validate('123 456')).toThrowErrorMatchingSnapshot();
 });
diff --git a/packages/kbn-config-schema/src/types/duration_type.test.ts b/packages/kbn-config-schema/src/types/duration_type.test.ts
index 7c67d4eef9255..09e92ce727f2a 100644
--- a/packages/kbn-config-schema/src/types/duration_type.test.ts
+++ b/packages/kbn-config-schema/src/types/duration_type.test.ts
@@ -23,7 +23,15 @@ import { schema } from '..';
 const { duration, object, contextRef, siblingRef } = schema;
 
 test('returns value by default', () => {
-  expect(duration().validate('123s')).toMatchSnapshot();
+  expect(duration().validate('123s')).toEqual(momentDuration(123000));
+});
+
+test('handles numeric string', () => {
+  expect(duration().validate('123000')).toEqual(momentDuration(123000));
+});
+
+test('handles number', () => {
+  expect(duration().validate(123000)).toEqual(momentDuration(123000));
 });
 
 test('is required by default', () => {
@@ -132,7 +140,7 @@ Object {
   });
 });
 
-test('returns error when not string or non-safe positive integer', () => {
+test('returns error when not valid string or non-safe positive integer', () => {
   expect(() => duration().validate(-123)).toThrowErrorMatchingSnapshot();
 
   expect(() => duration().validate(NaN)).toThrowErrorMatchingSnapshot();
@@ -146,4 +154,6 @@ test('returns error when not string or non-safe positive integer', () => {
   expect(() => duration().validate(/abc/)).toThrowErrorMatchingSnapshot();
 
   expect(() => duration().validate('123foo')).toThrowErrorMatchingSnapshot();
+
+  expect(() => duration().validate('123 456')).toThrowErrorMatchingSnapshot();
 });

From 4312f73b4f2fe6c0276b340bd79c17d1b290401d Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 8 Jan 2020 11:56:16 -0500
Subject: [PATCH 7/9] Whoops

---
 packages/kbn-config-schema/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/kbn-config-schema/README.md b/packages/kbn-config-schema/README.md
index edd48f1cea422..11c94a1de320b 100644
--- a/packages/kbn-config-schema/README.md
+++ b/packages/kbn-config-schema/README.md
@@ -128,10 +128,10 @@ Validates input data as a number.
 __Output type:__ `number`
 
 __Options:__
-  * `defaultValue: number | string | Reference<number | string> | (() => number | string)` - defines a default value, see [Default values](#default-values) section for more details.
+  * `defaultValue: number | Reference<number> | (() => number)` - defines a default value, see [Default values](#default-values) section for more details.
   * `validate: (value: number | string) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
-  * `min: number | string` - defines a minimum value the number should have.
-  * `max: number | string` - defines a maximum value the number should have.
+  * `min: number` - defines a minimum value the number should have.
+  * `max: number` - defines a maximum value the number should have.
 
 __Usage:__
 ```typescript

From 5fd48d831dcab0c6089da1a8d290329407a5a045 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 8 Jan 2020 11:58:41 -0500
Subject: [PATCH 8/9] Whoops 2

---
 packages/kbn-config-schema/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kbn-config-schema/README.md b/packages/kbn-config-schema/README.md
index 11c94a1de320b..d883bc88c2a16 100644
--- a/packages/kbn-config-schema/README.md
+++ b/packages/kbn-config-schema/README.md
@@ -148,7 +148,7 @@ Validates input data as a boolean.
 __Output type:__ `boolean`
 
 __Options:__
-  * `defaultValue: boolean | string | Reference<boolean | string> | (() => boolean | string)` - defines a default value, see [Default values](#default-values) section for more details.
+  * `defaultValue: boolean | Reference<boolean> | (() => boolean)` - defines a default value, see [Default values](#default-values) section for more details.
   * `validate: (value: boolean | string) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
 
 __Usage:__

From afed31c8702eb06ac76a097e0035fc0610e8b8cf Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 8 Jan 2020 13:27:21 -0500
Subject: [PATCH 9/9] Whoops 3

---
 packages/kbn-config-schema/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/kbn-config-schema/README.md b/packages/kbn-config-schema/README.md
index d883bc88c2a16..e6f3e60128983 100644
--- a/packages/kbn-config-schema/README.md
+++ b/packages/kbn-config-schema/README.md
@@ -129,7 +129,7 @@ __Output type:__ `number`
 
 __Options:__
   * `defaultValue: number | Reference<number> | (() => number)` - defines a default value, see [Default values](#default-values) section for more details.
-  * `validate: (value: number | string) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
+  * `validate: (value: number) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
   * `min: number` - defines a minimum value the number should have.
   * `max: number` - defines a maximum value the number should have.
 
@@ -149,7 +149,7 @@ __Output type:__ `boolean`
 
 __Options:__
   * `defaultValue: boolean | Reference<boolean> | (() => boolean)` - defines a default value, see [Default values](#default-values) section for more details.
-  * `validate: (value: boolean | string) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
+  * `validate: (value: boolean) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
 
 __Usage:__
 ```typescript