Presonalized configuration

elastic · Apr 16, 2020 · 763c60e · 763c60e
1 parent 1f48d52
commit 763c60e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/x-pack/plugins/actions/server/builtin_action_types/connectors/servicenow/service.test.ts b/x-pack/plugins/actions/server/builtin_action_types/connectors/servicenow/service.test.ts
@@ -30,9 +30,8 @@ describe('ServiceNow service', () => {
 
   beforeAll(() => {
     service = createExternalService({
-      url: 'https://dev102283.service-now.com',
-      username: 'admin',
-      password: 'admin',
+      config: { apiUrl: 'https://dev102283.service-now.com' },
+      secrets: { username: 'admin', password: 'admin' },
     });
   });
 
@@ -43,19 +42,28 @@ describe('ServiceNow service', () => {
   describe('createExternalService', () => {
     test('throws without url', () => {
       expect(() =>
-        createExternalService({ url: null, username: 'admin', password: 'admin' })
+        createExternalService({
+          config: { apiUrl: null },
+          secrets: { username: 'admin', password: 'admin' },
+        })
       ).toThrow();
     });
 
     test('throws without username', () => {
       expect(() =>
-        createExternalService({ url: 'test.com', username: '', password: 'admin' })
+        createExternalService({
+          config: { apiUrl: 'test.com' },
+          secrets: { username: '', password: 'admin' },
+        })
       ).toThrow();
     });
 
     test('throws without password', () => {
       expect(() =>
-        createExternalService({ url: 'test.com', username: '', password: undefined })
+        createExternalService({
+          config: { apiUrl: 'test.com' },
+          secrets: { username: '', password: undefined },
+        })
       ).toThrow();
     });
   });

diff --git a/x-pack/plugins/actions/server/builtin_action_types/connectors/servicenow/service.ts b/x-pack/plugins/actions/server/builtin_action_types/connectors/servicenow/service.ts
@@ -6,7 +6,13 @@
 
 import axios from 'axios';
 
-import { ExternalServiceCredential, ExternalService, ExternalServiceParams } from '../types';
+import {
+  ExternalServiceCredential,
+  ExternalService,
+  ExternalServiceParams,
+  ConnectorPublicConfigurationType,
+  ConnectorSecretConfigurationType,
+} from '../types';
 import { addTimeZoneToDate, patch, request } from '../utils';
 
 const API_VERSION = 'v2';
@@ -21,10 +27,12 @@ export const getErrorMessage = (msg: string) => {
 };
 
 export const createExternalService = ({
-  url,
-  username,
-  password,
+  config,
+  secrets,
 }: ExternalServiceCredential): ExternalService => {
+  const { apiUrl: url } = config as ConnectorPublicConfigurationType;
+  const { username, password } = secrets as ConnectorSecretConfigurationType;
+
   if (!url || !username || !password) {
     throw Error('[Action][ServiceNow]: Wrong configuration.');
   }

diff --git a/x-pack/plugins/actions/server/builtin_action_types/connectors/types.ts b/x-pack/plugins/actions/server/builtin_action_types/connectors/types.ts
@@ -42,9 +42,8 @@ export interface ConnectorConfiguration {
 }
 
 export interface ExternalServiceCredential {
-  url: string;
-  username: string;
-  password: string;
+  config: Record<string, any>;
+  secrets: Record<string, any>;
 }
 
 export interface ConnectorValidation {

diff --git a/x-pack/plugins/actions/server/builtin_action_types/connectors/utils.ts b/x-pack/plugins/actions/server/builtin_action_types/connectors/utils.ts
@@ -19,7 +19,6 @@ import {
 import {
   CreateConnectorArgs,
   ConnectorPublicConfigurationType,
-  ConnectorSecretConfigurationType,
   CreateActionTypeArgs,
   ExecutorParams,
   MapRecord,
@@ -69,11 +68,9 @@ export const createConnectorExecutor = ({
 ): Promise<ActionTypeExecutorResult> => {
   const actionId = execOptions.actionId;
   const {
-    apiUrl,
     casesConfiguration: { mapping: configurationMapping },
   } = execOptions.config as ConnectorPublicConfigurationType;
 
-  const { username, password } = execOptions.secrets as ConnectorSecretConfigurationType;
   const params = execOptions.params as ExecutorParams;
   const { action, actionParams } = params;
   const { comments, externalId, ...restParams } = actionParams;
@@ -87,7 +84,10 @@ export const createConnectorExecutor = ({
     actionId,
   };
 
-  const externalService = createExternalService({ url: apiUrl, username, password });
+  const externalService = createExternalService({
+    config: execOptions.config,
+    secrets: execOptions.secrets,
+  });
 
   if (!api[action]) {
     throw new Error('[Action][Connector] Unsupported action type');