[nodejs client] fix hookup issues in src/core/server/opensearch

src/core/server/opensearch/client/cluster_client.ts

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-import { Client } from '@opensearch-project/opensearch';
+import { Client } from '@opensearch-project/opensearch/api/new';
 import { Logger } from '../../logging';
 import { GetAuthHeaders, Headers, isOpenSearchDashboardsRequest, isRealRequest } from '../../http';
 import { ensureRawRequest, filterHeaders } from '../../http/router';

src/core/server/opensearch/client/configure_client.ts

@@ -31,7 +31,7 @@
  */
 import { Buffer } from 'buffer';
 import { stringify } from 'querystring';
-import { Client } from '@opensearch-project/opensearch';
+import { Client } from '@opensearch-project/opensearch/api/new';
 import { RequestBody } from '@opensearch-project/opensearch/lib/Transport';
 
 import { Logger } from '../../logging';

src/core/server/opensearch/client/mocks.test.ts

@@ -54,7 +54,6 @@ describe('Mocked client', () => {
   });
 
   it('nested level API methods should be mocked', () => {
-    expectMocked(client.asyncSearch.get);
     expectMocked(client.nodes.info);
   });
 

src/core/server/opensearch/client/mocks.ts

@@ -29,7 +29,7 @@
  * Modifications Copyright OpenSearch Contributors. See
  * GitHub history for details.
  */
-import { Client, ApiResponse } from '@opensearch-project/opensearch';
+import { Client, ApiResponse } from '@opensearch-project/opensearch/api/new';
 import { TransportRequestPromise } from '@opensearch-project/opensearch/lib/Transport';
 import { OpenSearchClient } from './types';
 import { ICustomClusterClient } from './cluster_client';
@@ -176,9 +176,9 @@ const createErrorTransportRequestPromise = (err: any): MockedTransportRequestPro
   return promise as MockedTransportRequestPromise<never>;
 };
 
-function createApiResponse(opts: Partial<ApiResponse> = {}): ApiResponse {
+function createApiResponse<TResponse = Record<string, any>>(opts: Partial<ApiResponse> = {}): ApiResponse<TResponse> {
   return {
-    body: {},
+    body: {} as any,
     statusCode: 200,
     headers: {},
     warnings: [],

src/core/server/opensearch/version_check/ensure_opensearch_version.test.ts

@@ -169,7 +169,7 @@ describe('pollOpenSearchNodesVersion', () => {
     internalClient.nodes.info.mockImplementationOnce(() => createOpenSearchError(error));
   };
 
-  it('returns iscCompatible=false and keeps polling when a poll request throws', (done) => {
+  it('returns isCompatible=false and keeps polling when a poll request throws', (done) => {
     expect.assertions(3);
     const expectedCompatibilityResults = [false, false, true];
     jest.clearAllMocks();