Merge pull request #265 from Enterprise-CMCS/bruce

feat(OY-26537): OS changelog package activity
Enterprise-CMCS · Dec 19, 2023 · e66cb71 · e66cb71
2 parents 147b66e + 0956f64
commit e66cb71
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 216 deletions.
diff --git a/src/libs/opensearch-lib.ts b/src/libs/opensearch-lib.ts
@@ -7,6 +7,7 @@ import * as aws4 from "aws4";
 import axios from "axios";
 import { aws4Interceptor } from "aws4-axios";
 import { STSClient, AssumeRoleCommand } from "@aws-sdk/client-sts";
+import { OsIndex } from "shared-types";
 let client: Client;
 
 export async function getClient(host: string) {
@@ -39,7 +40,7 @@ export async function updateData(host: string, indexObject: any) {
 
 export async function bulkUpdateData(
   host: string,
-  index: string,
+  index: OsIndex,
   arrayOfDocuments: any
 ) {
   client = client || (await getClient(host));
@@ -59,7 +60,7 @@ export async function bulkUpdateData(
   console.log(response);
 }
 
-export async function deleteIndex(host: string, index: string) {
+export async function deleteIndex(host: string, index: OsIndex) {
   client = client || (await getClient(host));
   var response = await client.indices.delete({ index });
 }
@@ -110,7 +111,7 @@ export async function mapRole(
   }
 }
 
-export async function search(host: string, index: string, query: any) {
+export async function search(host: string, index: OsIndex, query: any) {
   client = client || (await getClient(host));
   try {
     const response = await client.search({
@@ -123,7 +124,7 @@ export async function search(host: string, index: string, query: any) {
   }
 }
 
-export async function getItem(host: string, index: string, id: string) {
+export async function getItem(host: string, index: OsIndex, id: string) {
   client = client || (await getClient(host));
   try {
     const response = await client.get({ id, index });
@@ -133,27 +134,14 @@ export async function getItem(host: string, index: string, id: string) {
   }
 }
 
-export async function indexExists(host: string, index: string) {
+// check it exists - then create
+export async function createIndex(host: string, index: OsIndex) {
   client = client || (await getClient(host));
   try {
-    const indexExists = await client.indices.exists({ index });
-    if (indexExists.body) {
-      return true;
-    } else {
-      return false;
-    }
-  } catch (error) {
-    console.error("Error creating index:", error);
-    throw error;
-  }
-}
+    const exists = await client.indices.exists({ index });
+    if(!!exists.body) return;
 
-export async function createIndex(host: string, index: string) {
-  client = client || (await getClient(host));
-  try {
-    const createResponse = await client.indices.create({
-      index,
-    });
+    await client.indices.create({ index });
   } catch (error) {
     console.error("Error creating index:", error);
     throw error;
@@ -162,7 +150,7 @@ export async function createIndex(host: string, index: string) {
 
 export async function updateFieldMapping(
   host: string,
-  index: string,
+  index: OsIndex,
   properties: object
 ) {
   client = client || (await getClient(host));

diff --git a/src/packages/shared-types/opensearch.ts b/src/packages/shared-types/opensearch.ts
@@ -104,3 +104,5 @@ export type OsExportHeaderOptions<TData> = {
   transform: (data: TData) => string;
   name: string;
 };
+
+export type OsIndex = "main" | "seatool" | "changelog";
diff --git a/src/services/data/handlers/index.ts b/src/services/data/handlers/index.ts
@@ -2,6 +2,7 @@ import { Handler } from "aws-lambda";
 import { send, SUCCESS, FAILED } from "cfn-response-async";
 type ResponseStatus = typeof SUCCESS | typeof FAILED;
 import * as os from "./../../../libs/opensearch-lib";
+import { OsIndex } from "shared-types";
 
 export const customResourceWrapper: Handler = async (event, context) => {
   console.log("request:", JSON.stringify(event, undefined, 2));
@@ -24,29 +25,40 @@ export const handler: Handler = async () => {
   await manageIndex();
 };
 
+const manageIndexResource = async (resource: {
+  index: OsIndex;
+  update?: object;
+}) => {
+  if (!process.env.osDomain) {
+    throw new Error("process.env.osDomain must be defined");
+  }
+
+  const createIndex = await os.createIndex(
+    process.env.osDomain,
+    resource.index
+  );
+  console.log({ createIndex });
+
+  if (!resource.update) return;
+
+  const updateFieldMapping = await os.updateFieldMapping(
+    process.env.osDomain,
+    resource.index,
+    resource.update
+  );
+  console.log(updateFieldMapping);
+};
+
 async function manageIndex() {
   try {
-    if (!process.env.osDomain)
-      throw new Error("process.env.osDomain must be defined");
-
-    if (!(await os.indexExists(process.env.osDomain, "main"))) {
-      const createIndexReponse = await os.createIndex(
-        process.env.osDomain,
-        "main"
-      );
-      console.log(createIndexReponse);
-      const updateFieldMappingResponse = await os.updateFieldMapping(
-        process.env.osDomain,
-        "main",
-        {
-          rais: {
-            type: "object",
-            enabled: false,
-          },
-        }
-      );
-      console.log(updateFieldMappingResponse);
-    }
+    await manageIndexResource({
+      index: "main",
+      update: { rais: { type: "object", enabled: false } },
+    });
+
+    await manageIndexResource({
+      index: "changelog",
+    });
   } catch (error) {
     console.log(error);
     throw "ERROR:  Error occured during index management.";