[7.x] Change alert and action HTTP DELETE to return 204 (#41933)

x-pack/legacy/plugins/actions/server/routes/delete.test.ts

@@ -22,9 +22,8 @@ it('deletes an action with proper parameters', async () => {
 
   actionsClient.delete.mockResolvedValueOnce({ success: true });
   const { payload, statusCode } = await server.inject(request);
-  expect(statusCode).toBe(200);
-  const response = JSON.parse(payload);
-  expect(response).toEqual({ success: true });
+  expect(statusCode).toBe(204);
+  expect(payload).toEqual('');
   expect(actionsClient.delete).toHaveBeenCalledTimes(1);
   expect(actionsClient.delete.mock.calls[0]).toMatchInlineSnapshot(`
 Array [

x-pack/legacy/plugins/actions/server/routes/delete.ts

@@ -26,10 +26,11 @@ export function deleteRoute(server: Hapi.Server) {
           .required(),
       },
     },
-    async handler(request: DeleteRequest) {
+    async handler(request: DeleteRequest, h: Hapi.ResponseToolkit) {
       const { id } = request.params;
       const actionsClient = request.getActionsClient!();
-      return await actionsClient.delete({ id });
+      await actionsClient.delete({ id });
+      return h.response().code(204);
     },
   });
 }

x-pack/legacy/plugins/alerting/server/routes/delete.test.ts

@@ -20,9 +20,8 @@ test('deletes an alert with proper parameters', async () => {
 
   alertsClient.delete.mockResolvedValueOnce({});
   const { payload, statusCode } = await server.inject(request);
-  expect(statusCode).toBe(200);
-  const response = JSON.parse(payload);
-  expect(response).toEqual({});
+  expect(statusCode).toBe(204);
+  expect(payload).toEqual('');
   expect(alertsClient.delete).toHaveBeenCalledTimes(1);
   expect(alertsClient.delete.mock.calls[0]).toMatchInlineSnapshot(`
 Array [

x-pack/legacy/plugins/alerting/server/routes/delete.ts

@@ -26,10 +26,11 @@ export function deleteAlertRoute(server: Hapi.Server) {
           .required(),
       },
     },
-    async handler(request: DeleteRequest) {
+    async handler(request: DeleteRequest, h: Hapi.ResponseToolkit) {
       const { id } = request.params;
       const alertsClient = request.getAlertsClient!();
-      return await alertsClient.delete({ id });
+      await alertsClient.delete({ id });
+      return h.response().code(204);
     },
   });
 }

x-pack/test/api_integration/apis/actions/delete.ts

@@ -18,11 +18,11 @@ export default function deleteActionTests({ getService }: KibanaFunctionalTestDe
     beforeEach(() => esArchiver.load('actions/basic'));
     afterEach(() => esArchiver.unload('actions/basic'));
 
-    it('should return 200 when deleting an action', async () => {
+    it('should return 204 when deleting an action', async () => {
       await supertest
         .delete(`/api/action/${ES_ARCHIVER_ACTION_ID}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200, {});
+        .expect(204, '');
     });
 
     it(`should return 404 when action doesn't exist`, async () => {

x-pack/test/api_integration/apis/alerting/alerts.ts

@@ -31,7 +31,7 @@ export default function alertTests({ getService }: KibanaFunctionalTestDefaultPr
           return supertest
             .delete(`/api/alert/${id}`)
             .set('kbn-xsrf', 'foo')
-            .expect(200);
+            .expect(204, '');
         })
       );
       await esArchiver.unload('actions/basic');

x-pack/test/api_integration/apis/alerting/create.ts

@@ -25,7 +25,7 @@ export default function createAlertTests({ getService }: KibanaFunctionalTestDef
           return supertest
             .delete(`/api/alert/${id}`)
             .set('kbn-xsrf', 'foo')
-            .expect(200);
+            .expect(204, '');
         })
       );
       await esArchiver.unload('actions/basic');

x-pack/test/api_integration/apis/alerting/delete.ts

@@ -39,11 +39,11 @@ export default function createDeleteTests({ getService }: KibanaFunctionalTestDe
       });
     }
 
-    it('should return 200 when deleting an alert and removing scheduled task', async () => {
+    it('should return 204 when deleting an alert and removing scheduled task', async () => {
       await supertest
         .delete(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200);
+        .expect(204, '');
       let hasThrownError = false;
       try {
         await getScheduledTask(scheduledTaskId);

x-pack/test/api_integration/apis/alerting/disable.ts

@@ -33,7 +33,7 @@ export default function createDisableAlertTests({
       await supertest
         .delete(`/api/alert/${createdAlert.id}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200);
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 

x-pack/test/api_integration/apis/alerting/enable.ts

@@ -33,7 +33,7 @@ export default function createEnableAlertTests({
       await supertest
         .delete(`/api/alert/${createdAlert.id}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200);
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 

x-pack/test/api_integration/apis/alerting/find.ts

@@ -32,7 +32,7 @@ export default function createFindTests({ getService }: KibanaFunctionalTestDefa
       await supertest
         .delete(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200);
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 

x-pack/test/api_integration/apis/alerting/get.ts

@@ -32,7 +32,7 @@ export default function createGetTests({ getService }: KibanaFunctionalTestDefau
       await supertest
         .delete(`/api/alert/${alertId}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200);
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });
 

x-pack/test/api_integration/apis/alerting/update.ts

@@ -32,7 +32,7 @@ export default function createUpdateTests({ getService }: KibanaFunctionalTestDe
       await supertest
         .delete(`/api/alert/${createdAlert.id}`)
         .set('kbn-xsrf', 'foo')
-        .expect(200);
+        .expect(204, '');
       await esArchiver.unload('actions/basic');
     });