chore(deps): Bump @opensearch-project/opensearch from 2.13.0 to 3.0.0

package.json

@@ -9,7 +9,7 @@
     "@bugsnag/js": "8.1.2",
     "@bugsnag/plugin-express": "8.1.1",
     "@maxmind/geoip2-node": "5.0.0",
-    "@opensearch-project/opensearch": "2.13.0",
+    "@opensearch-project/opensearch": "3.0.0",
     "@retracedhq/retraced": "0.7.18",
     "@root/walk": "1.1.0",
     "@segment/analytics-node": "2.2.0",

src/_db/commands/reindex/postgres.ts

@@ -94,11 +94,8 @@
   if (!aliasesBlob) {
     logger.error({ msg: "no aliasesBlob for index " + esTargetIndex });
   } else {
-    aliasesBlob.body.split("\n").forEach((aliasDesc) => {
-      const parts = aliasDesc.split(" ");
-      if (parts.length >= 2) {
-        currentIndices.push(parts[1]);
-      }
+    aliasesBlob.body.forEach((aliasRec) => {
+      currentIndicesWrite.push(aliasRec.alias!);
     });
     logger.info({ msg: "found current read indices", count: currentIndices.length });
   }
@@ -108,11 +105,8 @@
   if (!aliasesBlobWrite.body) {
     logger.error({ msg: "no aliasesBlobWrite" });
   } else {
-    aliasesBlobWrite.body.split("\n").forEach((aliasDesc) => {
-      const parts = aliasDesc.split(" ");
-      if (parts.length >= 2) {
-        currentIndicesWrite.push(parts[1]);
-      }
+    aliasesBlobWrite.body.forEach((aliasRec) => {
+      currentIndicesWrite.push(aliasRec.alias!);
     });
   }
 

src/_db/commands/reindex/shared/page.ts

@@ -98,7 +98,6 @@ export const makePageIndexer = (writeIndex: string) => async (result: Event[]) =
     body.push({
       index: {
         _index: writeIndex,
-        _type: "_doc",
       },
     });
     body.push(eventToIndex);

src/_processor/test/workers/ElasticsearchSaverTest.ts

@@ -118,16 +118,12 @@ class ElasticsearchSaverTest {
       x.index(
         TypeMoq.It.isValue({
           index: "retraced.proj01.env01.current",
-          type: "_doc",
           body: expectedIndexed,
           id: expectedIndexed.canonical_time.toString() + "-" + expectedIndexed.id,
         })
       )
     )
-      .returns(
-        () =>
-          Promise.resolve({ body: {} }) as TransportRequestPromise<ApiResponse<Record<string, any>, unknown>>
-      )
+      .returns(() => Promise.resolve({ body: {} }) as TransportRequestPromise<ApiResponse>)
       .verifiable(TypeMoq.Times.once());
 
     clock

src/_processor/workers/saveEventToElasticsearch.ts

@@ -63,7 +63,6 @@ export class ElasticsearchSaver {
   private async esIndex(event: any, alias: string) {
     const resp = await this.es.index({
       index: alias,
-      type: "_doc",
       body: event,
       id: event.id ? event.canonical_time.toString() + "-" + event.id : undefined,
     });

src/models/environment/delete.ts

@@ -88,14 +88,14 @@ export default async function (opts: Options) {
           const indexName = resp.body[0].index;
 
           // Delete all aliases attached to the soon-to-be-deleted index
-          es.indices.deleteAlias({ index: indexName, name: "_all" }, (err2) => {
+          es.indices.deleteAlias({ index: indexName!, name: "_all" }, (err2) => {
             if (err2) {
               reject(err2);
               return;
             }
 
             // Finally, delete the index itself
-            es.indices.delete({ index: indexName }, (err3) => {
+            es.indices.delete({ index: indexName! }, (err3) => {
               if (err3) {
                 reject(err3);
                 return;

src/models/event/query.ts

@@ -1,7 +1,7 @@
 import _ from "lodash";
 import searchQueryParser from "search-query-parser";
 import moment from "moment";
-import { ApiResponse, RequestParams } from "@opensearch-project/opensearch";
+import { ApiResponse, type API } from "@opensearch-project/opensearch";
 
 import { Scope } from "../../security/scope";
 import { scope, getESWithRetry, ClientWithRetry } from "../../persistence/elasticsearch";
@@ -294,7 +294,7 @@ export function parse(searchQuery: string): any {
   return q;
 }
 
-export function searchParams(opts: Options): RequestParams.Search {
+export function searchParams(opts: Options): API.Search_Request {
   const searchQuery = parse(opts.query);
   const [index, securityFilters] = scope(opts.scope);
 
@@ -354,19 +354,9 @@ export function searchParams(opts: Options): RequestParams.Search {
       ],
     },
   };
-
-  // return {
-  //   index,
-  //   type: "_doc",
-  //   _source: true,
-  //   size: opts.size != 0 ? opts.size : undefined,
-  //   sort: [`canonical_time: ${opts.sort}`],
-  //   search_after: opts.cursor,
-  //   body: { query },
-  // };
 }
 
-export function searchParamsPaginated(opts: OptionsPaginated): RequestParams.Search {
+export function searchParamsPaginated(opts: OptionsPaginated): API.Search_Request {
   const searchQuery = parse(opts.query);
   const [index, securityFilters] = scope(opts.scope);
 

src/models/event/search.ts

@@ -188,7 +188,6 @@ export default async function (opts: Options): Promise<Result> {
 
   const params: any = {
     index: opts.index,
-    type: "_doc",
     _source: true,
     from: opts.offset || 0,
     size: opts.fetchAll ? 5000 : opts.length,

src/test/models/event/countBy.ts

@@ -20,7 +20,7 @@ class EventsCountByTest {
           },
         },
       },
-    } as ApiResponse<any>;
+    } as ApiResponse;
 
     es.setup((x) => x.search(TypeMoq.It.isAny())).returns((params): any => {
       assert.deepEqual(params.body.query.bool.filter, [

src/test/models/event/query.ts

@@ -1,7 +1,7 @@
 import { suite, test } from "@testdeck/mocha";
 
 import { parse, searchParams, Options } from "../../../models/event/query";
-import { RequestParams } from "@opensearch-project/opensearch";
+import { type API } from "@opensearch-project/opensearch";
 import assert from "assert";
 
 @suite
@@ -164,7 +164,7 @@ class QueryEventsTest {
       cursor: [1492060162148, "abc123"],
     };
     const output = searchParams(input);
-    const answer: RequestParams.Search = {
+    const answer: API.Search_Request = {
       index: "retraced.p1.e1.current",
       _source: "true",
       size: 10,