get the functional tests passing

elastic · Jul 11, 2019 · 7260dd7 · 7260dd7
1 parent f50be60
commit 7260dd7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/email.ts
@@ -56,6 +56,9 @@ export default function emailTest({ getService }: KibanaFunctionalTestDefaultPro
           actionTypeConfig: {
             from: 'bob@example.com',
             service: '__json',
+            host: null,
+            port: null,
+            secure: null,
           },
         },
         references: [],

diff --git a/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts b/x-pack/test/api_integration/apis/actions/builtin_action_types/slack.ts
@@ -72,7 +72,7 @@ export default function slackTest({ getService }: KibanaFunctionalTestDefaultPro
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The following actionTypeConfig attributes are invalid: webhookUrl [any.required]',
+              'The actionTypeConfig is invalid: [webhookUrl]: expected value of type [string] but got [undefined]',
           });
         });
     });

diff --git a/x-pack/test/api_integration/apis/actions/create.ts b/x-pack/test/api_integration/apis/actions/create.ts
@@ -123,7 +123,7 @@ export default function createActionTests({ getService }: KibanaFunctionalTestDe
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The following actionTypeConfig attributes are invalid: encrypted [any.required]',
+              'The actionTypeConfig is invalid: [encrypted]: expected value of type [string] but got [undefined]',
           });
         });
     });

diff --git a/x-pack/test/api_integration/apis/actions/update.ts b/x-pack/test/api_integration/apis/actions/update.ts
@@ -178,7 +178,7 @@ export default function updateActionTests({ getService }: KibanaFunctionalTestDe
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'The following actionTypeConfig attributes are invalid: encrypted [any.required]',
+              'The actionTypeConfig is invalid: [encrypted]: expected value of type [string] but got [undefined]',
           });
         });
     });

diff --git a/x-pack/test/api_integration/fixtures/plugins/alerts/index.ts b/x-pack/test/api_integration/fixtures/plugins/alerts/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { AlertExecutorOptions, AlertType } from '../../../../../legacy/plugins/alerting';
 import { ActionTypeExecutorOptions, ActionType } from '../../../../../legacy/plugins/actions';
 
@@ -20,19 +20,15 @@ export default function(kibana: any) {
         name: 'Test: Index Record',
         unencryptedAttributes: ['unencrypted'],
         validate: {
-          params: Joi.object()
-            .keys({
-              index: Joi.string().required(),
-              reference: Joi.string().required(),
-              message: Joi.string().required(),
-            })
-            .required(),
-          config: Joi.object()
-            .keys({
-              encrypted: Joi.string().required(),
-              unencrypted: Joi.string().required(),
-            })
-            .required(),
+          params: schema.object({
+            index: schema.string(),
+            reference: schema.string(),
+            message: schema.string(),
+          }),
+          config: schema.object({
+            encrypted: schema.string(),
+            unencrypted: schema.string(),
+          }),
         },
         async executor({ config, params, services }: ActionTypeExecutorOptions) {
           return await services.callCluster('index', {
@@ -52,12 +48,10 @@ export default function(kibana: any) {
         name: 'Test: Failing',
         unencryptedAttributes: [],
         validate: {
-          params: Joi.object()
-            .keys({
-              index: Joi.string().required(),
-              reference: Joi.string().required(),
-            })
-            .required(),
+          params: schema.object({
+            index: schema.string(),
+            reference: schema.string(),
+          }),
         },
         async executor({ config, params, services }: ActionTypeExecutorOptions) {
           await services.callCluster('index', {
@@ -143,11 +137,9 @@ export default function(kibana: any) {
         id: 'test.validation',
         name: 'Test: Validation',
         validate: {
-          params: Joi.object()
-            .keys({
-              param1: Joi.string().required(),
-            })
-            .required(),
+          params: schema.object({
+            param1: schema.string(),
+          }),
         },
         async executor({ services, params, state }: AlertExecutorOptions) {},
       };