Opensearch Migration

.github/workflows/docker.yaml

@@ -11,16 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:11.5
+        image: postgres:16.3
         env:
           POSTGRES_MULTIPLE_DATABASES: searchneu_dev
           POSTGRES_USER: postgres
         ports:
           - 5432:5432
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
+        image: opensearchproject/opensearch:2.19.0
         env:
-          discovery.type: single-node
+          - discovery.type=single-node
+          - plugins.security.disabled=true
+          - OPENSEARCH_INITIAL_ADMIN_PASSWORD=sUpp3rS3curePa55W0RD!
         ports:
           - 9200:9200
     env:

infrastructure/dev/compose.yaml

@@ -1,6 +1,6 @@
 services:
   postgresql:
-    image: postgres:11.19-bullseye
+    image: postgres:16.3
     ports:
       - 5432:5432
     volumes:
@@ -11,11 +11,14 @@ services:
       - POSTGRES_USER=postgres
     env_file:
       - ../../.env
-  es:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
+
+  opensearch:
+    image: opensearchproject/opensearch:2.19.0
     ports:
       - 9200:9200
     environment:
       - discovery.type=single-node
+      - plugins.security.disabled=true
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=sUpp3rS3curePa55W0RD!
 volumes:
   pg:

package.json

@@ -6,7 +6,7 @@
     "about:babel-node-ts": "//// This command is used to run Typescript files on the fly. Mainly used in other commands, not standalone",
     "babel-node-ts": "babel-node --extensions '.js,.jsx,.ts,.tsx'",
     "about:dev": "//// Runs the API server - the course catalog API",
-    "dev": "NODE_ENV=dev node --watch $(yarn babel-node-ts graphql/index.ts)",
+    "dev": "NODE_ENV=dev yarn babel-node-ts graphql/index.ts",
     "about:dev:notifs": "//// Runs the API server along with the notifications server",
     "dev:notifs": "ENABLE_NOTIFS=true yarn dev",
     "about:scrape": "//// Scrapes ALL of the latest class data from Banner",
@@ -64,8 +64,8 @@
     "@babel/core": "^7.10.2",
     "@babel/node": "^7.0.0",
     "@babel/register": "^7.0.0",
-    "@elastic/elasticsearch": "7.17.0",
-    "@prisma/client": "6",
+    "@opensearch-project/opensearch": "^3.3.0",
+    "@prisma/client": "5.22.0",
     "@typescript-eslint/typescript-estree": "^8.10.0",
     "amplitude": "^6.0.0",
     "apollo-server": "^3.13.0",

utils/elastic.ts

@@ -1,10 +1,9 @@
-/* eslint-disable no-underscore-dangle */
 /*
  * This file is part of Search NEU and licensed under AGPL3.
  * See the license file in the root folder for details.
  */
 
-import { Client } from "@elastic/elasticsearch";
+import { Client as OsClient, errors } from "@opensearch-project/opensearch";
 import pMap from "p-map";
 import _ from "lodash";
 import macros from "./macros";
@@ -16,11 +15,12 @@ import {
 } from "../types/searchTypes";
 import employeeMap from "../scrapers/employees/employeeMapping.json";
 import classMap from "../scrapers/classes/classMapping.json";
-import { ResponseError } from "@elastic/elasticsearch/lib/errors";
+import { Search_Request } from "@opensearch-project/opensearch/api";
 
+// TODO: The localhost should NOT be hardcoded in!
 const URL: string =
   macros.getEnvVariable("elasticURL") || "http://localhost:9200";
-const client = new Client({ node: URL });
+const client = new OsClient({ node: URL });
 
 const BULKSIZE = 2000;
 /**
@@ -287,7 +287,7 @@ export class Elastic {
       index: index,
       from: from,
       size: size,
-      body: body,
+      body: body as Search_Request["body"],
     });
   }
 
@@ -298,7 +298,7 @@ export class Elastic {
       multiQuery.push({ index });
       multiQuery.push(query);
     }
-    return client.msearch({ body: multiQuery });
+    return client.msearch({ body: multiQuery }) as unknown as EsMultiResult;
   }
 
   closeClient(): void {
@@ -325,7 +325,7 @@ export class Elastic {
         }
 
         // If it's a 429, we'll get a ResponseError
-        if (e instanceof ResponseError) {
+        if (e instanceof errors.ResponseError) {
           macros.warn("Request failed - retrying...");
           // Each time, we want to wait a little longer
           const timeoutMs = (i + 1) * RETRY_TIME_MULTIPLIER;