Fixed tests

opensearch-project · Apr 3, 2024 · 0eda66f · 0eda66f
1 parent 14b8eeb
commit 0eda66f
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 92 deletions.
diff --git a/public/services/IndexService.ts b/public/services/IndexService.ts
@@ -23,20 +23,23 @@ import { MDSEnabledClientService } from "./MDSEnabledClientService";
 export default class IndexService extends MDSEnabledClientService {
   getIndices = async (queryObject: HttpFetchQuery): Promise<ServerResponse<GetIndicesResponse>> => {
     let url = `..${NODE_API._INDICES}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    return (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetIndicesResponse>;
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    return (await this.httpClient.get(url, params)) as ServerResponse<GetIndicesResponse>;
   };
 
   getDataStreams = async (queryObject: HttpFetchQuery): Promise<ServerResponse<GetDataStreamsResponse>> => {
     const url = `..${NODE_API._DATA_STREAMS}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    return await this.httpClient.get(url, { query: queryObject });
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    return await this.httpClient.get(url, params);
   };
 
   getAliases = async (queryObject: HttpFetchQuery): Promise<ServerResponse<GetAliasesResponse>> => {
     const url = `..${NODE_API._ALIASES}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    return await this.httpClient.get(url, { query: queryObject });
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    return await this.httpClient.get(url, params);
   };
 
   getDataStreamsAndIndicesNames = async (searchValue: string): Promise<ServerResponse<GetDataStreamsAndIndicesNamesResponse>> => {
@@ -88,28 +91,31 @@ export default class IndexService extends MDSEnabledClientService {
 
   applyPolicy = async (indices: string[], policyId: string, queryObject?: HttpFetchQuery): Promise<ServerResponse<ApplyPolicyResponse>> => {
     const body = { indices, policyId };
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
     const url = `..${NODE_API.APPLY_POLICY}`;
     return (await this.httpClient.post(url, {
       body: JSON.stringify(body),
-      query: queryObject,
+      ...params,
     })) as ServerResponse<ApplyPolicyResponse>;
   };
 
   editRolloverAlias = async (index: string, alias: string, queryObject?: HttpFetchQuery): Promise<ServerResponse<AcknowledgedResponse>> => {
     const body = { index, alias };
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
     const url = `..${NODE_API.EDIT_ROLLOVER_ALIAS}`;
     return (await this.httpClient.post(url, {
       body: JSON.stringify(body),
-      query: queryObject,
+      ...params,
     })) as ServerResponse<AcknowledgedResponse>;
   };
 
   searchPolicies = async (searchValue: string, source: boolean = false): Promise<ServerResponse<GetPoliciesResponse>> => {
     const str = searchValue.trim();
-    const queryObject = this.patchQueryObjectWithDataSourceId({ from: 0, size: 10, search: str, sortDirection: "desc", sortField: "id" });
+    const query = this.patchQueryObjectWithDataSourceId({ from: 0, size: 10, search: str, sortDirection: "desc", sortField: "id" });
+    const params = query ? { query } : {};
     const url = `..${NODE_API.POLICIES}`;
-    return (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetPoliciesResponse>;
+    return (await this.httpClient.get(url, params)) as ServerResponse<GetPoliciesResponse>;
   };
 }
diff --git a/public/services/MDSEnabledClientService.ts b/public/services/MDSEnabledClientService.ts
@@ -12,8 +12,8 @@ export abstract class MDSEnabledClientService {
   }
 
   patchQueryObjectWithDataSourceId(queryObject?: HttpFetchQuery): HttpFetchQuery | undefined {
-    queryObject = queryObject || {};
     if (this.mdsEnabled) {
+      queryObject = queryObject || {};
       queryObject.dataSourceId = this.dataSourceId;
     }
     return queryObject;

diff --git a/public/services/ManagedIndexService.test.ts b/public/services/ManagedIndexService.test.ts
@@ -16,7 +16,7 @@ describe("ManagedIndexService spec", () => {
     await managedIndexService.getManagedIndex(managedIndexUuid);
 
     expect(httpClientMock.get).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.MANAGED_INDICES}/${managedIndexUuid}`);
+    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.MANAGED_INDICES}/${managedIndexUuid}`, expect.anything());
   });
 
   it("calls get managed indices nodejs route when calling getManagedIndices", async () => {
@@ -33,7 +33,7 @@ describe("ManagedIndexService spec", () => {
     await managedIndexService.getDataStreams();
 
     expect(httpClientMock.get).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API._DATA_STREAMS}`);
+    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API._DATA_STREAMS}`, expect.anything());
   });
 
   it("calls retry policy nodejs route when calling retryManagedIndexPolicy", async () => {

diff --git a/public/services/ManagedIndexService.ts b/public/services/ManagedIndexService.ts
@@ -18,23 +18,25 @@ import { MDSEnabledClientService } from "./MDSEnabledClientService";
 export default class ManagedIndexService extends MDSEnabledClientService {
   getManagedIndex = async (managedIndexUuid: string, queryObject: HttpFetchQuery | undefined): Promise<ServerResponse<any>> => {
     let url = `..${NODE_API.MANAGED_INDICES}/${managedIndexUuid}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<any>;
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<any>;
     return response;
   };
 
   getManagedIndices = async (queryObject: HttpFetchQuery | undefined): Promise<ServerResponse<GetManagedIndicesResponse>> => {
     let url = `..${NODE_API.MANAGED_INDICES}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    console.log("queryObject", queryObject);
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetManagedIndicesResponse>;
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<GetManagedIndicesResponse>;
     return response;
   };
 
   getDataStreams = async (queryObject: HttpFetchQuery | undefined): Promise<ServerResponse<GetDataStreamsResponse>> => {
     let url = `..${NODE_API._DATA_STREAMS}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetDataStreamsResponse>;
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<GetDataStreamsResponse>;
     return response;
   };
 
@@ -44,20 +46,22 @@ export default class ManagedIndexService extends MDSEnabledClientService {
     queryObject: HttpFetchQuery | undefined
   ): Promise<ServerResponse<RetryManagedIndexResponse>> => {
     const body = { index, state };
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
     const response = (await this.httpClient.post(`..${NODE_API.RETRY}`, {
       body: JSON.stringify(body),
-      query: queryObject,
+      ...params,
     })) as ServerResponse<RetryManagedIndexResponse>;
     return response;
   };
 
   removePolicy = async (indices: string[], queryObject: HttpFetchQuery | undefined): Promise<ServerResponse<RemovePolicyResponse>> => {
     const body = { indices };
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
     const response = (await this.httpClient.post(`..${NODE_API.REMOVE_POLICY}`, {
       body: JSON.stringify(body),
-      query: queryObject,
+      ...params,
     })) as ServerResponse<RemovePolicyResponse>;
     return response;
   };
@@ -70,10 +74,11 @@ export default class ManagedIndexService extends MDSEnabledClientService {
     queryObject?: HttpFetchQuery | undefined
   ): Promise<ServerResponse<ChangePolicyResponse>> => {
     const body = { indices, policyId, state, include };
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
     const response = (await this.httpClient.post(`..${NODE_API.CHANGE_POLICY}`, {
       body: JSON.stringify(body),
-      query: queryObject,
+      ...params,
     })) as ServerResponse<ChangePolicyResponse>;
     return response;
   };

diff --git a/public/services/NotificationService.test.ts b/public/services/NotificationService.test.ts
@@ -15,6 +15,6 @@ describe("NotificationService spec", () => {
     await notificationService.getChannels();
 
     expect(httpClientMock.get).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.CHANNELS}`);
+    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.CHANNELS}`, expect.anything());
   });
 });
diff --git a/public/services/NotificationService.ts b/public/services/NotificationService.ts
@@ -12,15 +12,17 @@ import { MDSEnabledClientService } from "./MDSEnabledClientService";
 export default class NotificationService extends MDSEnabledClientService {
   getChannels = async (): Promise<ServerResponse<GetChannelsResponse>> => {
     let url = `..${NODE_API.CHANNELS}`;
-    const queryObject = this.patchQueryObjectWithDataSourceId();
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetChannelsResponse>;
+    const query = this.patchQueryObjectWithDataSourceId();
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<GetChannelsResponse>;
     return response;
   };
 
   getChannel = async (channelId: string): Promise<ServerResponse<GetNotificationConfigsResponse>> => {
     let url = `..${NODE_API.CHANNELS}/${channelId}`;
-    const queryObject = this.patchQueryObjectWithDataSourceId();
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetNotificationConfigsResponse>;
+    const query = this.patchQueryObjectWithDataSourceId();
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<GetNotificationConfigsResponse>;
     return response;
   };
 }
diff --git a/public/services/PolicyService.test.ts b/public/services/PolicyService.test.ts
@@ -16,7 +16,7 @@ describe("PolicyService spec", () => {
     await policyService.getPolicy(policyId);
 
     expect(httpClientMock.get).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.POLICIES}/${policyId}`);
+    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.POLICIES}/${policyId}`, expect.anything());
   });
 
   it("calls get policies nodejs route when calling getPolicies", async () => {
@@ -44,6 +44,6 @@ describe("PolicyService spec", () => {
     await policyService.deletePolicy(policyId);
 
     expect(httpClientMock.delete).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.delete).toHaveBeenCalledWith(`..${NODE_API.POLICIES}/${policyId}`);
+    expect(httpClientMock.delete).toHaveBeenCalledWith(`..${NODE_API.POLICIES}/${policyId}`, expect.anything());
   });
 });
diff --git a/public/services/PolicyService.ts b/public/services/PolicyService.ts
@@ -13,8 +13,9 @@ import { MDSEnabledClientService } from "./MDSEnabledClientService";
 export default class PolicyService extends MDSEnabledClientService {
   getPolicies = async (queryObject: HttpFetchQuery | undefined): Promise<ServerResponse<GetPoliciesResponse>> => {
     let url = `..${NODE_API.POLICIES}`;
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<GetPoliciesResponse>;
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<GetPoliciesResponse>;
     return response;
   };
 
@@ -26,25 +27,25 @@ export default class PolicyService extends MDSEnabledClientService {
   ): Promise<ServerResponse<PutPolicyResponse>> => {
     let url = `..${NODE_API.POLICIES}/${policyId}`;
     let queryObject: HttpFetchQuery | undefined = { seqNo, primaryTerm };
-    queryObject = this.patchQueryObjectWithDataSourceId(queryObject);
-    console.log("PolicyService putPolicy queryObject: ", queryObject);
-    const response = (await this.httpClient.put(url, { query: queryObject, body: JSON.stringify(policy) })) as ServerResponse<
-      PutPolicyResponse
-    >;
+    const query = this.patchQueryObjectWithDataSourceId(queryObject);
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.put(url, { body: JSON.stringify(policy), ...params })) as ServerResponse<PutPolicyResponse>;
     return response;
   };
 
   getPolicy = async (policyId: string): Promise<ServerResponse<DocumentPolicy>> => {
     const url = `..${NODE_API.POLICIES}/${policyId}`;
-    const queryObject = this.patchQueryObjectWithDataSourceId();
-    const response = (await this.httpClient.get(url, { query: queryObject })) as ServerResponse<DocumentPolicy>;
+    const query = this.patchQueryObjectWithDataSourceId();
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.get(url, params)) as ServerResponse<DocumentPolicy>;
     return response;
   };
 
   deletePolicy = async (policyId: string): Promise<ServerResponse<boolean>> => {
     const url = `..${NODE_API.POLICIES}/${policyId}`;
-    const queryObject = this.patchQueryObjectWithDataSourceId();
-    const response = (await this.httpClient.delete(url, { query: queryObject })) as ServerResponse<boolean>;
+    const query = this.patchQueryObjectWithDataSourceId();
+    const params = query ? { query } : {};
+    const response = (await this.httpClient.delete(url, params)) as ServerResponse<boolean>;
     return response;
   };
 }
diff --git a/public/services/RollupService.test.ts b/public/services/RollupService.test.ts
@@ -17,7 +17,7 @@ describe("rollupService spec", () => {
     await rollupService.getRollup(rollupId);
 
     expect(httpClientMock.get).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}`);
+    expect(httpClientMock.get).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}`, expect.anything());
   });
 
   it("calls get rollups nodejs route when calling getRollups", async () => {
@@ -47,7 +47,7 @@ describe("rollupService spec", () => {
     await rollupService.deleteRollup(rollupId);
 
     expect(httpClientMock.delete).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.delete).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}`);
+    expect(httpClientMock.delete).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}`, expect.anything());
   });
 
   it("calls start rollup nodejs route when calling startRollup", async () => {
@@ -56,7 +56,7 @@ describe("rollupService spec", () => {
     await rollupService.startRollup(rollupId);
 
     expect(httpClientMock.post).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.post).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}/_start`);
+    expect(httpClientMock.post).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}/_start`, expect.anything());
   });
 
   it("calls stop rollup nodejs route when calling stopRollup", async () => {
@@ -65,7 +65,7 @@ describe("rollupService spec", () => {
     await rollupService.stopRollup(rollupId);
 
     expect(httpClientMock.post).toHaveBeenCalledTimes(1);
-    expect(httpClientMock.post).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}/_stop`);
+    expect(httpClientMock.post).toHaveBeenCalledWith(`..${NODE_API.ROLLUPS}/${rollupId}/_stop`, expect.anything());
   });
 
   it("calls get mappings nodejs route when calling getMappings", async () => {