From 17f60409521efda35a170c306edbb205bac60293 Mon Sep 17 00:00:00 2001 From: Timothy Sullivan Date: Wed, 8 Jan 2020 17:04:39 -0700 Subject: [PATCH] revert unrelated config change --- .../legacy/plugins/reporting/__snapshots__/index.test.js.snap | 2 -- x-pack/legacy/plugins/reporting/config.ts | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap b/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap index 42fa20bf3516c..469f5e6e7b3c6 100644 --- a/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap +++ b/x-pack/legacy/plugins/reporting/__snapshots__/index.test.js.snap @@ -154,7 +154,6 @@ Object { }, }, "enabled": true, - "encryptionKey": null, "index": ".reporting", "kibanaServer": Object {}, "poll": Object { @@ -336,7 +335,6 @@ Object { }, }, "enabled": true, - "encryptionKey": null, "index": ".reporting", "kibanaServer": Object {}, "poll": Object { diff --git a/x-pack/legacy/plugins/reporting/config.ts b/x-pack/legacy/plugins/reporting/config.ts index 68185b29ff2f7..34fc1f452fbc0 100644 --- a/x-pack/legacy/plugins/reporting/config.ts +++ b/x-pack/legacy/plugins/reporting/config.ts @@ -140,9 +140,7 @@ export async function config(Joi: any) { }).default(), encryptionKey: Joi.when(Joi.ref('$dist'), { is: true, - then: Joi.string() - .allow(null) - .default(null), + then: Joi.string(), otherwise: Joi.string().default('a'.repeat(32)), }), roles: Joi.object({