Merge pull request #199 from Enterprise-CMCS/master

Release to val

.github/workflows/deploy.yml

@@ -27,11 +27,24 @@ jobs:
           if [[ ! $STAGE_NAME =~ ^[a-z][a-z0-9-]*$ ]]; then
               echo "ERROR:  Your branch name, $STAGE_NAME, is not a valid Serverless Framework stage name." && exit 1
           fi
+  cache:
+    runs-on: ubuntu-20.04
+    needs:
+      - init
+    environment:
+      name: ${{ github.ref_name }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: ./.github/actions/setup
+
+      - run: run install
 
   deploy:
     runs-on: ubuntu-20.04
     needs:
-      - init
+      - cache
     environment:
       name: ${{ github.ref_name }}
       url: ${{ steps.deployment-data.outputs.APPURL }}
@@ -89,7 +102,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     needs:
-      - deploy
+      - cache
     environment:
       name: ${{ github.ref_name }}
     steps:
@@ -108,33 +121,33 @@ jobs:
       - name: Test
         run: yarn test-ci
 
-  # e2e:
-  #   timeout-minutes: 5
-  #   runs-on: ubuntu-20.04
-  #   needs:
-  #     - deploy
-  #   env:
-  #     baseurl: ${{ needs.deploy.outputs.app-url }}
-  #   if: ${{ github.ref != 'refs/heads/production' }}
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Setup
-  #       uses: ./.github/actions/setup
-  #     - name: Configure AWS credentials
-  #       uses: aws-actions/configure-aws-credentials@v2
-  #       with:
-  #         role-to-assume: ${{ secrets.AWS_OIDC_ROLE_TO_ASSUME }}
-  #         aws-region: us-east-1
-  #         role-duration-seconds: 10800
-  #     - name: Run e2e tests
-  #       run: run e2e
-  #     - uses: actions/upload-artifact@v3
-  #       if: always()
-  #       with:
-  #         name: playwright-report
-  #         path: src/services/ui/playwright-report/
-  #         retention-days: 30
+  e2e:
+    timeout-minutes: 5
+    runs-on: ubuntu-20.04
+    needs:
+      - deploy
+    env:
+      baseurl: ${{ needs.deploy.outputs.app-url }}
+    if: ${{ github.ref != 'refs/heads/production' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ secrets.AWS_OIDC_ROLE_TO_ASSUME }}
+          aws-region: us-east-1
+          role-duration-seconds: 10800
+      - name: Run e2e tests
+        run: run e2e
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-report
+          path: src/services/ui/playwright-report/
+          retention-days: 30
 
   cfn-nag:
     runs-on: ubuntu-20.04
@@ -210,6 +223,7 @@ jobs:
     needs:
       - test
       - cfn-nag
+      - e2e
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/destroy.yml

@@ -13,12 +13,12 @@ jobs:
     if: |
       (
         github.event.ref_type == 'branch' &&
-        !startsWith(github.event.ref, 'skipci') &&
-        !contains(fromJson('["master", "staging", "production"]'), github.event.ref)
+        (!startsWith(github.event.ref, 'skipci')) &&
+        (!contains(fromJson('["master", "staging", "production"]'), github.event.ref))
       ) ||
       (
         inputs.environment != '' &&
-        !contains(fromJson('["master", "staging", "production"]'), inputs.environment)
+        (!contains(fromJson('["master", "staging", "production"]'), inputs.environment))
       )
     runs-on: ubuntu-20.04
     environment:
@@ -51,7 +51,7 @@ jobs:
           SLACK_COLOR: ${{job.status}}
           SLACK_ICON: https://github.com/Enterprise-CMCS.png?size=48
           SLACK_TITLE: Failure
-          SLACK_USERNAME: ${{ github.repository }} ${{job.status}}
+          SLACK_USERNAME: ${{ github.repository }} - ${{job.status}}
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
   delete_environment:

.github/workflows/running-stage-notifier.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: ./.github/actions/setup
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_ROLE_TO_ASSUME }}
           aws-region: us-east-1

.github/workflows/security-group-cleanup.yml

@@ -17,9 +17,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
       - uses: ./.github/actions/setup # We need this largely for the PROJECT variable setting
+
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_ROLE_TO_ASSUME }}
           aws-region: us-east-1

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-  "editor.formatOnSave": true
+  "editor.formatOnSave": true,
+  "tailwindCSS.experimental.classRegex": [
+    ["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
+  ]
 }

docs/Gemfile

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 
 gem "jekyll"
 gem "jekyll-remote-theme"
+gem "jekyll-include-cache"
 gem "jekyll-seo-tag"
 gem "rake"
 gem "webrick"

docs/_deploy-metrics/package.json

@@ -18,7 +18,7 @@
     "date-fns": "^2.29.3",
     "framer-motion": "^6",
     "jszip": "^3.10.1",
-    "next": "12.3.1",
+    "next": "^13.5.4",
     "octokit": "^2.0.9",
     "react": "18.2.0",
     "react-aws-icons": "^1.2.1",

docs/_deploy-metrics/pages/_app.tsx

@@ -2,9 +2,10 @@ import type { AppProps } from "next/app";
 import { ChakraProvider } from "@chakra-ui/react";
 
 function MyApp({ Component, pageProps }: AppProps) {
+  const AnyComponent = Component as any;
   return (
     <ChakraProvider>
-      <Component {...pageProps} />
+      <AnyComponent {...pageProps} />
     </ChakraProvider>
   );
 }