refactor and type fixes

elastic · Aug 13, 2021 · d5c29fa · d5c29fa
1 parent 63e033c
commit d5c29fa
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 29 deletions.
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -130,6 +130,15 @@ export class AlertsClient {
     };
   }
 
+  private getAlertStatusFieldUpdate(
+    source: ParsedTechnicalFields | undefined,
+    status: STATUS_VALUES
+  ) {
+    return source?.[ALERT_WORKFLOW_STATUS] == null
+      ? { signal: { status } }
+      : { [ALERT_WORKFLOW_STATUS]: status };
+  }
+
   /**
    * Accepts an array of ES documents and executes ensureAuthorized for the given operation
    * @param items
@@ -313,10 +322,7 @@ export class AlertsClient {
       }
 
       const bulkUpdateRequest = mgetRes.body.docs.flatMap((item) => {
-        const fieldToUpdate =
-          item?._source?.[ALERT_WORKFLOW_STATUS] == null
-            ? { signal: { status } }
-            : { [ALERT_WORKFLOW_STATUS]: status };
+        const fieldToUpdate = this.getAlertStatusFieldUpdate(item?._source, status);
         return [
           {
             update: {
@@ -508,12 +514,10 @@ export class AlertsClient {
         this.logger.error(errorMessage);
         throw Boom.notFound(errorMessage);
       }
-
-      const fieldToUpdate =
-        alert?.hits.hits[0]._source?.[ALERT_WORKFLOW_STATUS] == null
-          ? { signal: { status } }
-          : { [ALERT_WORKFLOW_STATUS]: status };
-
+      const fieldToUpdate = this.getAlertStatusFieldUpdate(
+        alert?.hits.hits[0]._source,
+        status as STATUS_VALUES
+      );
       const { body: response } = await this.esClient.update<ParsedTechnicalFields>({
         ...decodeVersion(_version),
         id,

diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
@@ -249,8 +249,6 @@ export const DETECTION_ENGINE_SIGNALS_MIGRATION_URL = `${DETECTION_ENGINE_SIGNAL
 export const DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL = `${DETECTION_ENGINE_SIGNALS_URL}/migration_status`;
 export const DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL = `${DETECTION_ENGINE_SIGNALS_URL}/finalize_migration`;
 
-export const RAC_ALERTS_BULK_UPDATE_URL = '/internal/rac/alerts/bulk_update';
-
 /**
  * Common naming convention for an unauthenticated user
  */

diff --git a/x-pack/plugins/timelines/common/constants.ts b/x-pack/plugins/timelines/common/constants.ts
@@ -13,3 +13,5 @@ export const DEFAULT_NUMBER_FORMAT = 'format:number:defaultPattern';
 export const FILTER_OPEN: AlertStatus = 'open';
 export const FILTER_CLOSED: AlertStatus = 'closed';
 export const FILTER_IN_PROGRESS: AlertStatus = 'in-progress';
+
+export const RAC_ALERTS_BULK_UPDATE_URL = '/internal/rac/alerts/bulk_update';
diff --git a/x-pack/plugins/timelines/public/container/use_update_alerts.ts b/x-pack/plugins/timelines/public/container/use_update_alerts.ts
@@ -10,8 +10,7 @@ import { CoreStart } from '../../../../../src/core/public';
 
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { AlertStatus } from '../../../timelines/common';
-
-export const RAC_ALERTS_BULK_UPDATE_URL = '/internal/rac/alerts/bulk_update';
+import { RAC_ALERTS_BULK_UPDATE_URL } from '../../common/constants';
 
 /**
  * Update alert status by query

diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts b/x-pack/test/detection_engine_api_integration/basic/tests/update_rac_alerts.ts
@@ -9,10 +9,8 @@ import expect from '@kbn/expect';
 
 import type { estypes } from '@elastic/elasticsearch';
 import { Signal } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
-import {
-  RAC_ALERTS_BULK_UPDATE_URL,
-  DETECTION_ENGINE_QUERY_SIGNALS_URL,
-} from '../../../../plugins/security_solution/common/constants';
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../plugins/security_solution/common/constants';
+import { RAC_ALERTS_BULK_UPDATE_URL } from '../../../../plugins/timelines/common/constants';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import {
   createSignalsIndex,
@@ -39,29 +37,19 @@ export default ({ getService }: FtrProviderContext) => {
           .post(RAC_ALERTS_BULK_UPDATE_URL)
           .set('kbn-xsrf', 'true')
           .send({ ids: ['123'], status: 'open', index: '.siem-signals-default' });
-        //   .expect(200);
-        // console.error('BODY', JSON.stringify(body, null, 2));
 
         // remove any server generated items that are indeterministic
         delete body.took;
-
         expect(body).to.eql(getSignalStatusEmptyResponse());
       });
 
       it('should not give errors when querying and the signals index does exist and is empty', async () => {
         await createSignalsIndex(supertest);
-        const { body } = await supertest
+        await supertest
           .post(RAC_ALERTS_BULK_UPDATE_URL)
           .set('kbn-xsrf', 'true')
           .send({ ids: ['123'], status: 'open', index: '.siem-signals-default' })
           .expect(200);
-
-        // remove any server generated items that are indeterministic
-        // delete body.took;
-
-        // expect(body).to.eql(getSignalStatusEmptyResponse());
-
-        // await deleteSignalsIndex(supertest);
       });
     });