Merge pull request #133 from Enterprise-CMCS/master

Release to val

.codeclimate.yml

@@ -3,3 +3,18 @@ checks:
   method-lines:
     config:
       threshold: 1000 # defacto disable
+exclude_patterns:
+  - "config/"
+  - "db/"
+  - "dist/"
+  - "features/"
+  - "**/node_modules/"
+  - "script/"
+  - "**/spec/"
+  - "**/test/"
+  - "**/tests/"
+  - "Tests/"
+  - "**/vendor/"
+  - "**/*_test.go"
+  - "**/*.d.ts"
+  - "src/services/ui/src/pages/faq/**"

.github/workflows/workspace-setup.yml

@@ -11,7 +11,7 @@ concurrency:
 jobs:
   test:
     runs-on: macos-12
-    timeout-minutes: 30 # MacOS runners are more expensive than linux, so we want to be sure to stop any stuck builds.
+    timeout-minutes: 120 # MacOS runners are more expensive than linux, so we want to be sure to stop any stuck builds.
     environment:
       name: test-ws-setup
     env:
@@ -60,12 +60,12 @@ jobs:
           direnv allow
           direnv exec run deploy --stage $STAGE_NAME
 
-      - name: Test test
-        run: |
-          source /tmp/.profile
-          nvm use
-          direnv allow
-          direnv exec run test --stage $STAGE_NAME
+      # - name: Test test
+      #   run: |
+      #     source /tmp/.profile
+      #     nvm use
+      #     direnv allow
+      #     direnv exec run test --stage $STAGE_NAME
 
       - name: Test destroy
         run: |
@@ -74,12 +74,18 @@ jobs:
           direnv allow
           direnv exec run destroy --stage $STAGE_NAME --verify false --wait false
 
+  notify_of_failure:
+    runs-on: ubuntu-20.04
+    needs:
+      - test
+    if: failure()
+    steps:
       - name: Slack Notification
         uses: rtCamp/action-slack-notify@v2
-        if: env.SLACK_WEBHOOK != '' && failure()
+        if: env.SLACK_WEBHOOK != ''
         env:
           SLACK_COLOR: ${{job.status}}
           SLACK_ICON: https://github.com/Enterprise-CMCS.png?size=48
           SLACK_TITLE: Failure
           SLACK_USERNAME: ${{ github.repository }} - ${{job.status}}
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

README.md

@@ -15,7 +15,7 @@
     <img alt="Slack" src="https://img.shields.io/badge/Slack-channel-purple.svg">
   </a>
   <a href="https://codeclimate.com/github/Enterprise-CMCS/macpro-mako/maintainability">
-    <img src="https://api.codeclimate.com/v1/badges/81d2233c0cfa7557c7ab/maintainability" />
+    <img src="https://api.codeclimate.com/v1/badges/f4480e77af640e6fa864/maintainability" />
   </a>
   <a href="https://dependabot.com/">
     <img alt="Dependabot" src="https://badgen.net/badge/Dependabot/enabled/green?icon=dependabot">

docs/assets/setup.sh

@@ -21,7 +21,7 @@ if [ "$CI" != "true" ]; then
     case $selectedshell in
       "zsh")
         shell=$selectedshell
-        shellprofile="$HOME/.zshrc"
+        shellprofile="$HOME/.zshenv"
         macprorcfile="$HOME/.macprorc"
         ;;
 

package.json

@@ -16,6 +16,7 @@
     "test:watch": "turbo test:watch",
     "test:gui": "turbo test:gui",
     "e2e": "turbo e2e",
+    "e2e:ui": "turbo e2e:ui",
     "coverage": "vitest run --coverage",
     "test-gui": "vitest --ui",
     "test-tsc": "tsc --skipLibCheck --noEmit"
@@ -34,7 +35,6 @@
     "@enterprise-cmcs/serverless-waf-plugin": "^1.3.0",
     "@serverless/compose": "^1.3.0",
     "@stratiformdigital/serverless-iam-helper": "^3.2.0",
-    "@stratiformdigital/serverless-idempotency-helper": "^3.1.0",
     "@stratiformdigital/serverless-online": "^3.1.0",
     "@stratiformdigital/serverless-s3-security-helper": "^4.0.0",
     "@stratiformdigital/serverless-stage-destroyer": "^2.0.0",
@@ -43,14 +43,16 @@
     "@vitest/coverage-c8": "^0.29.8",
     "@vitest/ui": "^0.29.8",
     "aws-sdk-client-mock": "^2.0.1",
+    "esbuild": "^0.19.3",
     "prettier": "2.7.1",
     "semantic-release": "^19.0.5",
     "serverless": "^3.17.0",
-    "serverless-bundle": "^6.0.0",
     "serverless-disable-functions": "^1.0.0",
+    "serverless-esbuild": "^1.47.0",
     "serverless-plugin-scripts": "^1.0.2",
     "serverless-plugin-typescript": "^2.1.4",
     "serverless-plugin-warmup": "^7.1.0",
+    "serverless-scriptable-plugin": "^1.3.1",
     "serverless-stack-termination-protection": "^2.0.2",
     "turbo": "^1.9.3",
     "vitest": "^0.29.8"

serverless-compose.yml

@@ -3,13 +3,18 @@ services:
     path: src/services/alerts
   dashboard:
     path: src/services/dashboard
+    params:
+      CloudfrontDistributionId: ${ui-infra.CloudFrontDistributionId}
   data:
     path: src/services/data
+    params:
+      ECSFailureTopicArn: ${alerts.ECSFailureTopicArn}
   ui-infra:
     path: src/services/ui-infra
   api:
     path: src/services/api
     params:
+      ECSFailureTopicArn: ${alerts.ECSFailureTopicArn}
       osDomainArn: ${data.OpenSearchDomainArn}
       osDomain: ${data.OpenSearchDomainEndpoint}
   auth:
@@ -31,3 +36,4 @@ services:
       CognitoUserPoolId: ${auth.UserPoolId}
       CognitoUserPoolClientId: ${auth.UserPoolClientId}
       CognitoUserPoolClientDomain: ${auth.UserPoolClientDomain}
+      BootstrapUsersPassword: ${auth.BootstrapUsersPassword}

src/cli/run.ts

@@ -104,15 +104,26 @@ yargs(process.argv.slice(2))
   .command(
     "e2e",
     "run e2e tests.",
-    {},
-    async () => {
+    {
+      ui: { type: "boolean", demandOption: false, default: false },
+    },
+    async (argv: any) => {
       await install_deps_for_services();
       await runner.run_command_and_output(
         `Install playwright`,
         ["yarn", "playwright", "install", "--with-deps"],
         "."
       );
-      await runner.run_command_and_output(`e2e tests`, ["yarn", "e2e"], ".");
+
+      if (argv.ui) {
+        await runner.run_command_and_output(
+          `e2e:ui tests`,
+          ["yarn", "e2e:ui"],
+          "."
+        );
+      } else {
+        await runner.run_command_and_output(`e2e tests`, ["yarn", "e2e"], ".");
+      }
     }
   )
   .command("test-gui", "open unit-testing gui for vitest.", {}, async () => {

src/libs/index.ts

@@ -1,4 +1,3 @@
-export * from "./dynamodb-lib";
 export * from "./cognito-lib";
 export * from "./opensearch-lib";
 export * from "./env";

src/libs/opensearch-lib.ts

@@ -103,7 +103,17 @@ export async function search(host:string, index:string, query:any){
       index: index,
       body: query,
     });
-    return response.body.hits;
+    return response.body;
+  } catch(e) {
+    console.log({e})
+  }
+}
+
+export async function getItem(host:string, index:string, id:string){
+  client = client || (await getClient(host));
+  try {
+    const response = await client.get({id, index})
+    return response.body;
   } catch(e) {
     console.log({e})
   }

src/packages/shared-types/onemac.ts

@@ -1,18 +1,25 @@
 import { z } from "zod";
 import { s3ParseUrl } from "shared-utils/s3-url-parser";
 
+const onemacAttachmentSchema = z.object({
+  s3Key: z.string(),
+  filename: z.string(),
+  title: z.string(),
+  contentType: z.string(),
+  url: z.string().url(),
+});
+
 export const onemacSchema = z.object({
-  additionalInformation: z.string().optional(),
+  additionalInformation: z.string().nullable().default(null),
   submitterName: z.string(),
   submitterEmail: z.string(),
-  attachments: z
+  attachments: z.array(onemacAttachmentSchema).nullish(),
+  raiResponses: z
     .array(
       z.object({
-        s3Key: z.string(),
-        filename: z.string(),
-        title: z.string(),
-        contentType: z.string(),
-        url: z.string().url(),
+        additionalInformation: z.string().nullable().default(null),
+        submissionTimestamp: z.number(),
+        attachments: z.array(onemacAttachmentSchema),
       })
     )
     .nullish(),
@@ -35,9 +42,31 @@ export const transformOnemac = (id: string) => {
           key,
         };
       }) ?? null,
+    raiResponses:
+      data.raiResponses?.map((response) => {
+        return {
+          additionalInformation: response.additionalInformation,
+          submissionTimestamp: response.submissionTimestamp,
+          attachments:
+            response.attachments?.map((attachment) => {
+              const uploadDate = parseInt(attachment.s3Key.split("/")[0]);
+              const parsedUrl = s3ParseUrl(attachment.url);
+              if (!parsedUrl) return null;
+              const { bucket, key } = parsedUrl;
+
+              return {
+                ...attachment,
+                uploadDate,
+                bucket,
+                key,
+              };
+            }) ?? null,
+        };
+      }) ?? null,
     additionalInformation: data.additionalInformation,
     submitterEmail: data.submitterEmail,
     submitterName: data.submitterName,
+    origin: "oneMAC",
   }));
 };