system action in bulk disable api

elastic · Oct 31, 2023 · e17d2a7 · e17d2a7
1 parent f7ecb3b
commit e17d2a7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/.../plugins/alerting/server/application/rule/methods/bulk_disable/bulk_disable_rules.test.ts b/.../plugins/alerting/server/application/rule/methods/bulk_disable/bulk_disable_rules.test.ts
@@ -95,6 +95,7 @@ const rulesClientParams: jest.Mocked<ConstructorOptions> = {
   isAuthenticationTypeAPIKey: jest.fn(),
   getAuthenticationAPIKey: jest.fn(),
   connectorAdapterRegistry: new ConnectorAdapterRegistry(),
+  isSystemAction: jest.fn(),
   getAlertIndicesAlias: jest.fn(),
   alertsService: null,
 };
@@ -656,25 +657,25 @@ describe('bulkDisableRules', () => {
       await rulesClient.bulkDisableRules({ filter: 'fake_filter' });
 
       expect(migrateLegacyActions).toHaveBeenCalledTimes(4);
-      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+      expect(migrateLegacyActions).toHaveBeenNthCalledWith(1, expect.any(Object), {
         attributes: enabledRuleForBulkOps1.attributes,
         ruleId: enabledRuleForBulkOps1.id,
         actions: [],
         references: [],
       });
-      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+      expect(migrateLegacyActions).toHaveBeenNthCalledWith(2, expect.any(Object), {
         attributes: enabledRuleForBulkOps2.attributes,
         ruleId: enabledRuleForBulkOps2.id,
         actions: [],
         references: [],
       });
-      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+      expect(migrateLegacyActions).toHaveBeenNthCalledWith(3, expect.any(Object), {
         attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
         ruleId: siemRuleForBulkOps1.id,
         actions: [],
         references: [],
       });
-      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+      expect(migrateLegacyActions).toHaveBeenNthCalledWith(4, expect.any(Object), {
         attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
         ruleId: siemRuleForBulkOps2.id,
         actions: [],

diff --git a/x-pack/plugins/alerting/server/application/rule/methods/bulk_disable/bulk_disable_rules.ts b/x-pack/plugins/alerting/server/application/rule/methods/bulk_disable/bulk_disable_rules.ts
@@ -50,6 +50,7 @@ export const bulkDisableRules = async <Params extends RuleParams>(
   }
 
   const { ids, filter } = options;
+  const actionsClient = await context.getActionsClient();
 
   const kueryNodeFilter = ids ? convertRuleIdsToKueryNode(ids) : buildKueryNodeFilter(filter);
   const authorizationFilter = await getAuthorizationFilter(context, { action: 'DISABLE' });
@@ -93,13 +94,17 @@ export const bulkDisableRules = async <Params extends RuleParams>(
     // fix the type cast from SavedObjectsBulkUpdateObject to SavedObjectsBulkUpdateObject
     // when we are doing the bulk disable and this should fix itself
     const ruleType = context.ruleTypeRegistry.get(attributes.alertTypeId!);
-    const ruleDomain = transformRuleAttributesToRuleDomain<Params>(attributes as RuleAttributes, {
-      id,
-      logger: context.logger,
-      ruleType,
-      references,
-      omitGeneratedValues: false,
-    });
+    const ruleDomain = transformRuleAttributesToRuleDomain<Params>(
+      attributes as RuleAttributes,
+      {
+        id,
+        logger: context.logger,
+        ruleType,
+        references,
+        omitGeneratedValues: false,
+      },
+      (connectorId: string) => actionsClient.isSystemAction(connectorId)
+    );
 
     try {
       ruleDomainSchema.validate(ruleDomain);

diff --git a/...ck/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.ts b/...ck/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.ts
@@ -7,15 +7,13 @@
 
 import Boom from '@hapi/boom';
 import { i18n } from '@kbn/i18n';
-
 import { AlertConsumers } from '@kbn/rule-data-utils';
-
 import type { SavedObjectReference } from '@kbn/core/server';
 import type { RulesClientContext } from '../..';
 import { RawRuleAction, RawRule } from '../../../types';
 import { validateActions } from '../validate_actions';
-import { injectReferencesIntoActions } from '../../common';
 import { retrieveMigratedLegacyActions } from './retrieve_migrated_legacy_actions';
+import { transformRawActionsToDomainActions } from '../../../application/rule/transforms/transform_raw_actions_to_domain_actions';
 
 type MigrateLegacyActions = (
   context: RulesClientContext,
@@ -66,7 +64,12 @@ export const migrateLegacyActions: MigrateLegacyActions = async (
         // set to undefined to avoid both per-actin and rule level values clashing
         throttle: undefined,
         notifyWhen: undefined,
-        actions: injectReferencesIntoActions(ruleId, legacyActions, legacyActionsReferences),
+        actions: transformRawActionsToDomainActions({
+          ruleId,
+          actions: legacyActions,
+          references: legacyActionsReferences,
+          isSystemAction: context.isSystemAction,
+        }),
       });
     };