From 1d3b040c6fccdc12afcb07e2d2fb2cc3dca0be0a Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 21:51:35 -0700
Subject: [PATCH] Validation succeed as long as status code in response is 200
 (#6399) (#6447)

Signed-off-by: cliu123 <lc12251109@gmail.com>
(cherry picked from commit 476cffc2f793b424d68981aaaee9aa1f9fd958be)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: ZilongX <99905560+ZilongX@users.noreply.github.com>
---
 .../data_source_connection_validator.test.ts  | 30 ++++++++-----------
 .../data_source_connection_validator.ts       |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/plugins/data_source/server/routes/data_source_connection_validator.test.ts b/src/plugins/data_source/server/routes/data_source_connection_validator.test.ts
index bb7a8b91d67..69eafcce8e7 100644
--- a/src/plugins/data_source/server/routes/data_source_connection_validator.test.ts
+++ b/src/plugins/data_source/server/routes/data_source_connection_validator.test.ts
@@ -133,24 +133,20 @@ describe('DataSourceManagement: data_source_connection_validator.ts', () => {
       expect(validateDataSourcesResponse.statusCode).toBe(200);
     });
 
-    test('failure: opensearch client response code is 200 and response body is empty', async () => {
-      try {
-        const opensearchClient = opensearchServiceMock.createOpenSearchClient();
-        opensearchClient.cat.indices.mockResolvedValue(opensearchServiceMock.createApiResponse());
-        const dataSourceValidator = new DataSourceConnectionValidator(opensearchClient, {
-          auth: {
-            statusCode: 200,
-            body: '',
-            credentials: {
-              service: SigV4ServiceName.OpenSearchServerless,
-            },
+    test('Success: opensearch client response code is 200 and response body is empty', async () => {
+      const opensearchClient = opensearchServiceMock.createOpenSearchClient();
+      opensearchClient.cat.indices.mockResolvedValue(opensearchServiceMock.createApiResponse());
+      const dataSourceValidator = new DataSourceConnectionValidator(opensearchClient, {
+        auth: {
+          statusCode: 200,
+          body: '',
+          credentials: {
+            service: SigV4ServiceName.OpenSearchServerless,
           },
-        });
-        const validateDataSourcesResponse = await dataSourceValidator.validate();
-        expect(validateDataSourcesResponse.statusCode).toBe(200);
-      } catch (e) {
-        expect(e).toBeTruthy();
-      }
+        },
+      });
+      const validateDataSourcesResponse = await dataSourceValidator.validate();
+      expect(validateDataSourcesResponse.statusCode).toBe(200);
     });
 
     test('failure: opensearch client response code is other than 200', async () => {
diff --git a/src/plugins/data_source/server/routes/data_source_connection_validator.ts b/src/plugins/data_source/server/routes/data_source_connection_validator.ts
index 60e00d85565..e47788878fc 100644
--- a/src/plugins/data_source/server/routes/data_source_connection_validator.ts
+++ b/src/plugins/data_source/server/routes/data_source_connection_validator.ts
@@ -20,7 +20,7 @@ export class DataSourceConnectionValidator {
         this.dataSourceAttr.auth?.credentials?.service === SigV4ServiceName.OpenSearchServerless
       ) {
         validationResponse = await this.callDataCluster.cat.indices();
-        if (validationResponse?.statusCode === 200 && validationResponse?.body) {
+        if (validationResponse?.statusCode === 200) {
           return validationResponse;
         }
       } else {