devide system actions validation into 2 functions

cnasikas · Oct 24, 2023 · 35153ca · 35153ca
1 parent 3957566
commit 35153ca
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/x-pack/plugins/alerting/server/application/rule/methods/create/create_rule.ts b/x-pack/plugins/alerting/server/application/rule/methods/create/create_rule.ts
@@ -8,7 +8,7 @@ import Semver from 'semver';
 import Boom from '@hapi/boom';
 import { SavedObject, SavedObjectsUtils } from '@kbn/core/server';
 import { withSpan } from '@kbn/apm-utils';
-import { validateSystemActions } from '../../../../lib/validate_system_actions';
+import { validateSystemActionsWithRuleTypeId } from '../../../../lib/validate_system_actions';
 import { parseDuration } from '../../../../../common/parse_duration';
 import { WriteOperations, AlertingAuthorizationEntity } from '../../../../authorization';
 import {
@@ -80,8 +80,7 @@ export async function createRule<Params extends RuleParams = never>(
     throw Boom.badRequest(`Error validating create data - ${error.message}`);
   }
 
-  await validateSystemActions({
-    actionsClient,
+  validateSystemActionsWithRuleTypeId({
     connectorAdapterRegistry: context.connectorAdapterRegistry,
     systemActions,
   });

diff --git a/x-pack/plugins/alerting/server/lib/validate_system_actions.ts b/x-pack/plugins/alerting/server/lib/validate_system_actions.ts
@@ -11,24 +11,43 @@ import { ConnectorAdapterRegistry } from '../connector_adapters/connector_adapte
 import { bulkValidateConnectorAdapterActionParams } from '../connector_adapters/validate_rule_action_params';
 import { NormalizedSystemAction } from '../rules_client';
 import { RuleSystemAction } from '../types';
-interface Params {
+interface ValidateSystemActionsWithRuleTypeIdParams {
+  connectorAdapterRegistry: ConnectorAdapterRegistry;
+  systemActions: RuleSystemAction[];
+}
+
+interface ValidateSystemActionsWithoutRuleTypeIdParams {
   actionsClient: ActionsClient;
   connectorAdapterRegistry: ConnectorAdapterRegistry;
   systemActions: Array<RuleSystemAction | NormalizedSystemAction>;
 }
 
-export const validateSystemActions = async ({
+export const validateSystemActionsWithRuleTypeId = ({
+  connectorAdapterRegistry,
+  systemActions,
+}: ValidateSystemActionsWithRuleTypeIdParams) => {
+  if (systemActions.length === 0) {
+    return;
+  }
+
+  bulkValidateConnectorAdapterActionParams({
+    connectorAdapterRegistry,
+    actions: systemActions,
+  });
+};
+
+export const validateSystemActionsWithoutRuleTypeId = async ({
   actionsClient,
   connectorAdapterRegistry,
   systemActions,
-}: Params) => {
+}: ValidateSystemActionsWithoutRuleTypeIdParams) => {
   if (systemActions.length === 0) {
     return;
   }
 
   /**
    * When updating or creating a rule the actions may not contain
-   * the actionTypeId. We need to getBulk using the
+   * the actionTypeId (for example: bulk operations). We need to getBulk using the
    * actionsClient to get the actionTypeId of each action.
    * The actionTypeId is needed to get the schema of
    * the action params using the connector adapter registry