fixed types

elastic · Apr 2, 2021 · 3c2b78d · 3c2b78d
1 parent 3266b39
commit 3c2b78d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/x-pack/plugins/alerting/server/routes/create_rule.ts b/x-pack/plugins/alerting/server/routes/create_rule.ts
@@ -65,7 +65,7 @@ const rewriteBodyReq: RewriteRequestCase<CreateOptions<AlertTypeParams>['data']>
   ...rest,
   alertTypeId,
   notifyWhen,
-  actions,
+  actions: actions.map((action) => rewriteBodyReqActions(action)),
 });
 const rewriteBodyRes: RewriteResponseCase<SanitizedAlert<AlertTypeParams>> = ({
   actions,
@@ -130,11 +130,12 @@ export const createRuleRoute = (
           try {
             const createdRule: SanitizedAlert<AlertTypeParams> = await alertsClient.create<AlertTypeParams>(
               {
-                data: rewriteBodyReq({
-                  ...rule,
-                  notify_when: rule.notify_when as AlertNotifyWhenType,
-                  actions: rule.actions.map((action) => rewriteBodyReqActions(action)),
-                }),
+                data: {
+                  ...rewriteBodyReq({
+                    ...rule,
+                    notify_when: rule.notify_when as AlertNotifyWhenType,
+                  }),
+                },
                 options: { id: params?.id },
               }
             );

diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.ts b/x-pack/plugins/alerting/server/routes/legacy/create.ts
@@ -35,7 +35,7 @@ export const bodySchema = schema.object({
     schema.object({
       group: schema.string(),
       id: schema.string(),
-      actionTypeId: schema.maybe(schema.string()),
+      actionTypeId: schema.string(),
       params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
     }),
     { defaultValue: [] }

diff --git a/x-pack/plugins/alerting/server/routes/legacy/update.ts b/x-pack/plugins/alerting/server/routes/legacy/update.ts
@@ -35,7 +35,7 @@ const bodySchema = schema.object({
       group: schema.string(),
       id: schema.string(),
       params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
-      actionTypeId: schema.maybe(schema.string()),
+      actionTypeId: schema.string(),
     }),
     { defaultValue: [] }
   ),

diff --git a/x-pack/plugins/alerting/server/routes/update_rule.ts b/x-pack/plugins/alerting/server/routes/update_rule.ts
@@ -57,12 +57,13 @@ const rewriteBodyReqActions: RewriteRequestCase<AlertAction> = ({
 });
 
 const rewriteBodyReq: RewriteRequestCase<UpdateOptions<AlertTypeParams>> = (result) => {
-  const { notify_when: notifyWhen, ...rest } = result.data;
+  const { notify_when: notifyWhen, actions, ...rest } = result.data;
   return {
     ...result,
     data: {
       ...rest,
       notifyWhen,
+      actions: actions.map((action) => rewriteBodyReqActions(action)),
     },
   };
 };
@@ -137,7 +138,6 @@ export const updateRuleRoute = (
                 data: {
                   ...rule,
                   notify_when: rule.notify_when as AlertNotifyWhenType,
-                  actions: rule.actions.map((action) => rewriteBodyReqActions(action)),
                 },
               })
             );