From 6dfce9f05cecf9429d0446b61e6adac79ac91106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= <mikecote@users.noreply.github.com>
Date: Tue, 5 Jan 2021 10:22:47 -0500
Subject: [PATCH] Improve webhook errror messages (#87044) (#87299)

* Initial work

* Fix variables to pull from

* Rename some variables

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../server/builtin_action_types/webhook.ts    | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
index 3d872d6e7e311..089363990643f 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -176,8 +176,14 @@ export async function executor(
     const { error } = result;
 
     if (error.response) {
-      const { status, statusText, headers: responseHeaders } = error.response;
-      const message = `[${status}] ${statusText}`;
+      const {
+        status,
+        statusText,
+        headers: responseHeaders,
+        data: { message: responseMessage },
+      } = error.response;
+      const responseMessageAsSuffix = responseMessage ? `: ${responseMessage}` : '';
+      const message = `[${status}] ${statusText}${responseMessageAsSuffix}`;
       logger.error(`error on ${actionId} webhook event: ${message}`);
       // The request was made and the server responded with a status code
       // that falls out of the range of 2xx
@@ -195,6 +201,10 @@ export async function executor(
         );
       }
       return errorResultInvalid(actionId, message);
+    } else if (error.isAxiosError) {
+      const message = `[${error.code}] ${error.message}`;
+      logger.error(`error on ${actionId} webhook event: ${message}`);
+      return errorResultRequestFailed(actionId, message);
     }
 
     logger.error(`error on ${actionId} webhook action: unexpected error`);
@@ -222,6 +232,21 @@ function errorResultInvalid(
   };
 }
 
+function errorResultRequestFailed(
+  actionId: string,
+  serviceMessage: string
+): ActionTypeExecutorResult<unknown> {
+  const errMessage = i18n.translate('xpack.actions.builtin.webhook.requestFailedErrorMessage', {
+    defaultMessage: 'error calling webhook, request failed',
+  });
+  return {
+    status: 'error',
+    message: errMessage,
+    actionId,
+    serviceMessage,
+  };
+}
+
 function errorResultUnexpectedError(actionId: string): ActionTypeExecutorResult<void> {
   const errMessage = i18n.translate('xpack.actions.builtin.webhook.unreachableErrorMessage', {
     defaultMessage: 'error calling webhook, unexpected error',