From ec2b5f5163ed2f4e0456c1e05045ab605379869a Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 19:48:40 -0700
Subject: [PATCH] add body to error object (#6496) (#6502)

(cherry picked from commit 4339f4e089b2fe0343883d07cb8b8df55760a334)

Signed-off-by: Lu Yu <nluyu@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../data_source/server/lib/error.test.ts      | 23 +++++++++++++++++++
 src/plugins/data_source/server/lib/error.ts   |  6 +++++
 2 files changed, 29 insertions(+)

diff --git a/src/plugins/data_source/server/lib/error.test.ts b/src/plugins/data_source/server/lib/error.test.ts
index b22e58e39d03..f4f6cf241769 100644
--- a/src/plugins/data_source/server/lib/error.test.ts
+++ b/src/plugins/data_source/server/lib/error.test.ts
@@ -117,4 +117,27 @@ describe('CreateDataSourceError', () => {
       new DataSourceError(new Error('dummy'), 'Connection Failure', 400)
     );
   });
+
+  it('create data source error should be casted to a 400 DataSourceError', () => {
+    const error = new ResponseError({
+      statusCode: 401,
+      body: {
+        error: {
+          type: 'index_not_found_exception',
+        },
+      },
+      warnings: [],
+      headers: {
+        'WWW-Authenticate': 'content',
+      },
+      meta: {} as any,
+    });
+
+    const actual = new DataSourceError(error);
+
+    expect(actual).toMatchObject({
+      statusCode: 401,
+      body: { error: { type: 'index_not_found_exception' } },
+    });
+  });
 });
diff --git a/src/plugins/data_source/server/lib/error.ts b/src/plugins/data_source/server/lib/error.ts
index f0e1f3a9548b..8bb9e6ba45fa 100644
--- a/src/plugins/data_source/server/lib/error.ts
+++ b/src/plugins/data_source/server/lib/error.ts
@@ -11,6 +11,8 @@ import { OsdError } from '../../../opensearch_dashboards_utils/common';
 export class DataSourceError extends OsdError {
   // must have statusCode to avoid route handler in search.ts to return 500
   statusCode: number;
+  body: any;
+
   constructor(error: any, context?: string, statusCode?: number) {
     let message: string;
     if (context) {
@@ -23,6 +25,10 @@ export class DataSourceError extends OsdError {
 
     super('Data Source Error: ' + message);
 
+    if (error.body) {
+      this.body = error.body;
+    }
+
     if (statusCode) {
       this.statusCode = statusCode;
     } else if (error.statusCode) {