fixes after merge with system_actions_mvp branch

elastic · Oct 26, 2023 · 853d376 · 853d376
1 parent b66fd6d
commit 853d376
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 44 deletions.
diff --git a/x-pack/plugins/alerting/common/index.ts b/x-pack/plugins/alerting/common/index.ts
@@ -41,8 +41,6 @@ export * from './rule_circuit_breaker_error_message';
 
 export { isSystemAction } from './system_actions/is_system_action';
 
-export { isSystemAction } from './system_actions/is_system_action';
-
 export type {
   MaintenanceWindowModificationMetadata,
   DateRange,

diff --git a/x-pack/plugins/alerting/common/routes/rule/response/schemas/v1.ts b/x-pack/plugins/alerting/common/routes/rule/response/schemas/v1.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { rRuleResponseSchemaV1 } from '../../../r_rule';
 import {
   ruleNotifyWhen as ruleNotifyWhenV1,
   ruleExecutionStatusValues as ruleExecutionStatusValuesV1,
@@ -180,48 +181,9 @@ export const monitoringSchema = schema.object({
   }),
 });
 
-export const rRuleSchema = schema.object({
-  dtstart: schema.string(),
-  tzid: schema.string(),
-  freq: schema.maybe(
-    schema.oneOf([
-      schema.literal(0),
-      schema.literal(1),
-      schema.literal(2),
-      schema.literal(3),
-      schema.literal(4),
-      schema.literal(5),
-      schema.literal(6),
-    ])
-  ),
-  until: schema.maybe(schema.string()),
-  count: schema.maybe(schema.number()),
-  interval: schema.maybe(schema.number()),
-  wkst: schema.maybe(
-    schema.oneOf([
-      schema.literal('MO'),
-      schema.literal('TU'),
-      schema.literal('WE'),
-      schema.literal('TH'),
-      schema.literal('FR'),
-      schema.literal('SA'),
-      schema.literal('SU'),
-    ])
-  ),
-  byweekday: schema.maybe(schema.arrayOf(schema.oneOf([schema.string(), schema.number()]))),
-  bymonth: schema.maybe(schema.arrayOf(schema.number())),
-  bysetpos: schema.maybe(schema.arrayOf(schema.number())),
-  bymonthday: schema.arrayOf(schema.number()),
-  byyearday: schema.arrayOf(schema.number()),
-  byweekno: schema.arrayOf(schema.number()),
-  byhour: schema.arrayOf(schema.number()),
-  byminute: schema.arrayOf(schema.number()),
-  bysecond: schema.arrayOf(schema.number()),
-});
-
 export const ruleSnoozeScheduleSchema = schema.object({
   duration: schema.number(),
-  rRule: rRuleSchema,
+  rRule: rRuleResponseSchemaV1,
   id: schema.maybe(schema.string()),
   skipRecurrences: schema.maybe(schema.arrayOf(schema.string())),
 });

diff --git a/x-pack/plugins/alerting/server/application/rule/methods/bulk_edit/bulk_edit_rules.ts b/x-pack/plugins/alerting/server/application/rule/methods/bulk_edit/bulk_edit_rules.ts
@@ -80,6 +80,7 @@ import {
 } from '../../transforms';
 import { validateScheduleLimit, ValidateScheduleLimitResult } from '../get_schedule_frequency';
 import { bulkEditOperationsSchema } from './schemas';
+import { denormalizeActions } from '../../../../rules_client/lib/denormalize_actions';
 
 const isValidInterval = (interval: string | undefined): interval is string => {
   return interval !== undefined;
@@ -546,9 +547,13 @@ async function updateRuleAttributesAndParamsInMemory<Params extends RuleParams>(
       validatedMutatedAlertTypeParams
     );
 
-    const ruleAttributes = await transformRuleDomainToRuleAttributes({
-      actions: updatedRuleActions as NormalizedAlertActionWithGeneratedValues[],
+    const { actions: actionsWithRefs } = await denormalizeActions(
       context,
+      updatedRuleActions as NormalizedAlertActionWithGeneratedValues[]
+    );
+
+    const ruleAttributes = transformRuleDomainToRuleAttributes({
+      actionsWithRefs,
       rule: updatedRule,
       params: {
         legacyId: rule.attributes.legacyId,