update and clean scripts

Co-Authored-By: Copilot <[email protected]>

Author: baileycash-elastic

x-pack/platform/plugins/shared/rule_registry/server/alert_data_client/alerts_client.test.ts

@@ -14,7 +14,7 @@ import { fromKueryExpression } from '@kbn/es-query';
 import { IndexPatternsFetcher } from '@kbn/data-views-plugin/server';
 import { ALERT_RULE_CONSUMER, ALERT_RULE_TYPE_ID, SPACE_IDS } from '@kbn/rule-data-utils';
 import {
-  getStatusUpdateScript,
+  STATUS_UPDATE_SCRIPT,
   ADD_TAGS_UPDATE_SCRIPT,
   REMOVE_TAGS_UPDATE_SCRIPT,
 } from '../utils/alert_client_bulk_update_scripts';
@@ -860,12 +860,13 @@ describe('AlertsClient', () => {
           {
             script: {
               source: [
-                getStatusUpdateScript('acknowledged'),
+                STATUS_UPDATE_SCRIPT,
                 ADD_TAGS_UPDATE_SCRIPT,
                 REMOVE_TAGS_UPDATE_SCRIPT,
               ].join('\n'),
               lang: 'painless',
               params: {
+                status: 'acknowledged',
                 addTags: ['reviewed'],
                 removeTags: ['pending'],
               },
@@ -880,12 +881,13 @@ describe('AlertsClient', () => {
           {
             script: {
               source: [
-                getStatusUpdateScript('acknowledged'),
+                STATUS_UPDATE_SCRIPT,
                 ADD_TAGS_UPDATE_SCRIPT,
                 REMOVE_TAGS_UPDATE_SCRIPT,
               ].join('\n'),
               lang: 'painless',
               params: {
+                status: 'acknowledged',
                 addTags: ['reviewed'],
                 removeTags: ['pending'],
               },
@@ -1028,8 +1030,11 @@ describe('AlertsClient', () => {
           },
           {
             script: {
-              source: getStatusUpdateScript('acknowledged'),
+              source: STATUS_UPDATE_SCRIPT,
               lang: 'painless',
+              params: {
+                status: 'acknowledged',
+              },
             },
           },
         ],
@@ -1082,8 +1087,11 @@ describe('AlertsClient', () => {
           },
           {
             script: {
-              source: getStatusUpdateScript('acknowledged'),
+              source: STATUS_UPDATE_SCRIPT,
               lang: 'painless',
+              params: {
+                status: 'acknowledged',
+              },
             },
           },
         ],

x-pack/platform/plugins/shared/rule_registry/server/alert_data_client/alerts_client.ts

@@ -71,8 +71,8 @@ import { getConsumersFilter } from '../lib/get_consumers_filter';
 import { mergeUniqueFieldsByName } from '../utils/unique_fields';
 import { getAlertFieldsFromIndexFetcher } from '../utils/get_alert_fields_from_index_fetcher';
 import {
+  STATUS_UPDATE_SCRIPT,
   ADD_TAGS_UPDATE_SCRIPT,
-  getStatusUpdateScript,
   REMOVE_TAGS_UPDATE_SCRIPT,
 } from '../utils/alert_client_bulk_update_scripts';
 import type { GetAlertFieldsResponseV1 } from '../routes/get_alert_fields';
@@ -803,10 +803,11 @@ export class AlertsClient {
     removeTags,
   }: BulkUpdateOptions<Params>) {
     const scriptOps: string[] = [];
-    const params: Record<string, string[]> = {};
+    const params: Record<string, string[] | STATUS_VALUES> = {};
 
     if (status != null) {
-      scriptOps.push(getStatusUpdateScript(status));
+      params.status = status;
+      scriptOps.push(STATUS_UPDATE_SCRIPT);
     }
 
     if (addTags != null && addTags.length > 0) {

x-pack/platform/plugins/shared/rule_registry/server/utils/alert_client_bulk_update_scripts.ts

@@ -10,35 +10,33 @@ import {
   ALERT_WORKFLOW_TAGS,
 } from '../../common/technical_rule_data_field_names';
 
-export const getStatusUpdateScript = (status: string) => {
-  return `
-          if (ctx._source['${ALERT_WORKFLOW_STATUS}'] != null) {
-            ctx._source['${ALERT_WORKFLOW_STATUS}'] = '${status}';
-          }
-          if (ctx._source.signal != null && ctx._source.signal.status != null) {
-            ctx._source.signal.status = '${status}';
-          }
-        `;
-};
+export const STATUS_UPDATE_SCRIPT = `
+  if (ctx._source['${ALERT_WORKFLOW_STATUS}'] != null) {
+    ctx._source['${ALERT_WORKFLOW_STATUS}'] = params.status;
+  }
+  if (ctx._source.signal != null && ctx._source.signal.status != null) {
+    ctx._source.signal.status = params.status;
+  }
+`;
 
 export const ADD_TAGS_UPDATE_SCRIPT = `
-        if (ctx._source['${ALERT_WORKFLOW_TAGS}'] == null) {
-          ctx._source['${ALERT_WORKFLOW_TAGS}'] = new ArrayList();
-        }
-        for (item in params.addTags) {
-          if (!ctx._source['${ALERT_WORKFLOW_TAGS}'].contains(item)) {
-            ctx._source['${ALERT_WORKFLOW_TAGS}'].add(item);
-          }
-        }
-      `;
+  if (ctx._source['${ALERT_WORKFLOW_TAGS}'] == null) {
+    ctx._source['${ALERT_WORKFLOW_TAGS}'] = new ArrayList();
+  }
+  for (item in params.addTags) {
+    if (!ctx._source['${ALERT_WORKFLOW_TAGS}'].contains(item)) {
+      ctx._source['${ALERT_WORKFLOW_TAGS}'].add(item);
+    }
+  }
+`;
 
 export const REMOVE_TAGS_UPDATE_SCRIPT = `
-        if (ctx._source['${ALERT_WORKFLOW_TAGS}'] != null) {
-          for (int i = 0; i < params.removeTags.length; i++) {
-            if (ctx._source['${ALERT_WORKFLOW_TAGS}'].contains(params.removeTags[i])) {
-              int index = ctx._source['${ALERT_WORKFLOW_TAGS}'].indexOf(params.removeTags[i]);
-              ctx._source['${ALERT_WORKFLOW_TAGS}'].remove(index);
-            }
-          }
-        }
-      `;
+  if (ctx._source['${ALERT_WORKFLOW_TAGS}'] != null) {
+    for (int i = 0; i < params.removeTags.length; i++) {
+      if (ctx._source['${ALERT_WORKFLOW_TAGS}'].contains(params.removeTags[i])) {
+        int index = ctx._source['${ALERT_WORKFLOW_TAGS}'].indexOf(params.removeTags[i]);
+        ctx._source['${ALERT_WORKFLOW_TAGS}'].remove(index);
+      }
+    }
+  }
+`;