reapplied changes after merge conflict

elastic · May 4, 2020 · e1f83ef · e1f83ef
1 parent 7215df9
commit e1f83ef
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts b/...test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
@@ -18,6 +18,7 @@ export enum ExternalServiceSimulator {
   PAGERDUTY = 'pagerduty',
   SERVICENOW = 'servicenow',
   SLACK = 'slack',
+  JIRA = 'jira',
   WEBHOOK = 'webhook',
 }
 
@@ -30,6 +31,7 @@ export function getAllExternalServiceSimulatorPaths(): string[] {
     getExternalServiceSimulatorPath(service)
   );
   allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.SERVICENOW}/api/now/v2/table/incident`);
+  allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.JIRA}/rest/api/2/issue`);
   return allPaths;
 }
 

diff --git a/...pi_integration/common/fixtures/plugins/actions_simulators/server/servicenow_simulation.ts b/...pi_integration/common/fixtures/plugins/actions_simulators/server/servicenow_simulation.ts
@@ -48,11 +48,7 @@ export function initPlugin(router: IRouter, path: string) {
       options: {
         authRequired: false,
       },
-      validate: {
-        params: schema.object({
-          id: schema.string(),
-        }),
-      },
+      validate: {},
     },
     async function(
       context: RequestHandlerContext,
@@ -67,7 +63,7 @@ export function initPlugin(router: IRouter, path: string) {
 
   router.get(
     {
-      path: `${path}/api/now/v2/table/incident`,
+      path: `${path}/api/now/v2/table/incident/{id}`,
       options: {
         authRequired: false,
       },

diff --git a/.../test/alerting_api_integration/common/fixtures/plugins/actions_simulators_legacy/index.ts b/.../test/alerting_api_integration/common/fixtures/plugins/actions_simulators_legacy/index.ts
@@ -12,6 +12,7 @@ import {
 
 import { initPlugin as initWebhook } from './webhook_simulation';
 import { initPlugin as initSlack } from './slack_simulation';
+import { initPlugin as initJira } from './jira_simulation';
 
 // eslint-disable-next-line import/no-default-export
 export default function(kibana: any) {
@@ -21,6 +22,7 @@ export default function(kibana: any) {
     init: (server: Hapi.Server) => {
       initWebhook(server, getExternalServiceSimulatorPath(ExternalServiceSimulator.WEBHOOK));
       initSlack(server, getExternalServiceSimulatorPath(ExternalServiceSimulator.SLACK));
+      initJira(server, getExternalServiceSimulatorPath(ExternalServiceSimulator.JIRA));
     },
   });
 }
diff --git a/...ins/actions_simulators/jira_simulation.ts → ...ions_simulators_legacy/jira_simulation.ts b/...ins/actions_simulators/jira_simulation.ts → ...ions_simulators_legacy/jira_simulation.ts