fixed test

elastic · Oct 26, 2021 · 8cf9415 · 8cf9415
1 parent 6684e70
commit 8cf9415
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
@@ -148,8 +148,8 @@ export class ActionsClient {
     }
 
     const actionType = this.actionTypeRegistry.get(actionTypeId);
-    let validatedActionTypeConfig = validateConfig(actionType, config);
-    let validatedActionTypeSecrets = validateSecrets(actionType, secrets);
+    const validatedActionTypeConfig = validateConfig(actionType, config);
+    const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
     if (actionType.validate?.connector) {
       validateConnector(actionType, { config, secrets });
     }
@@ -221,8 +221,8 @@ export class ActionsClient {
     const { actionTypeId } = attributes;
     const { name, config, secrets } = action;
     const actionType = this.actionTypeRegistry.get(actionTypeId);
-    let validatedActionTypeConfig = validateConfig(actionType, config);
-    let validatedActionTypeSecrets = validateSecrets(actionType, secrets);
+    const validatedActionTypeConfig = validateConfig(actionType, config);
+    const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
     if (actionType.validate?.connector) {
       validateConnector(actionType, { config, secrets });
     }

diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -282,14 +282,9 @@ test('throws an error when connector is invalid', async () => {
       config: schema.object({
         param1: schema.string(),
       }),
-      connector: schema.object({
-        config: schema.object({
-          param1: schema.string(),
-        }),
-        secrets: schema.object({
-          param2: schema.string(),
-        }),
-      }),
+      connector: () => {
+        return 'error';
+      },
     },
     executor: jest.fn(),
   };

diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -152,18 +152,10 @@ export class ActionExecutor {
           validatedConfig = validateConfig(actionType, config as Record<string, unknown>);
           validatedSecrets = validateSecrets(actionType, secrets as Record<string, unknown>);
           if (actionType.validate?.connector) {
-            const validateActionTypeConnector = validateConnector(actionType, {
+            validateConnector(actionType, {
               config: config as Record<string, unknown>,
               secrets: secrets as Record<string, unknown>,
             });
-            validatedConfig = {
-              ...validatedConfig,
-              ...(validateActionTypeConnector.config as Record<string, unknown>),
-            };
-            validatedSecrets = {
-              ...validatedSecrets,
-              ...(validateActionTypeConnector.secrets as Record<string, unknown>),
-            };
           }
         } catch (err) {
           span?.setOutcome('failure');

diff --git a/.../alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts b/.../alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
@@ -284,6 +284,7 @@ export default function emailTest({ getService }: FtrProviderContext) {
           config: {
             service: '__json',
             from: '[email protected]',
+            hasAuth: false,
           },
         })
         .expect(200);