CCM-7465: implement backend api PT.2 #260

bhansell1 · 2025-01-13T15:32:27Z

Description

I closed the previous PR since it had over 200 items in the conversation. I've copied over the questions.

replaces amplify backend with our own backend-api

PT.3 will remove amplify entirely.

Context

Type of changes

Refactoring (non-breaking change)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would change existing functionality)
Bug fix (non-breaking change which fixes an issue)

Checklist

I am familiar with the contributing guidelines
I have followed the code style of the project
I have added tests to cover my changes
I have updated the documentation accordingly
This PR is a result of pair or mob programming

Sensitive Information Declaration

To ensure the utmost confidentiality and protect your and others privacy, we kindly ask you to NOT including PII (Personal Identifiable Information) / PID (Personal Identifiable Data) or any other sensitive data in this PR (Pull Request) and the codebase changes. We will remove any PR that do contain any sensitive information. We really appreciate your cooperation in this matter.

I confirm that neither PII/PID nor sensitive data are included in this PR and the codebase changes.

… need for some reason? Revert "CCM-7465: remove undefined from API response" This reverts commit 33bd151. CCM-7465: move undefined back

debug add outputs debug debug debug debug debug debug CCM-7465: create amplify_ouputs..json file instread of using process.env CCM-7465: move .env debug debug debug debug debug debug debug debug debug debug debug debug

…Digital/nhs-notify-web-template-management into feature/CCM-7465_use_backend-api

…ck links

bhansell1 · 2025-01-13T15:36:03Z

tests/test-team/config/auth.setup.ts

@@ -0,0 +1,18 @@
+/*


See Conversation.

#240 (comment)

bhansell1 · 2025-01-13T15:36:52Z

frontend/src/middleware.ts

+    return NextResponse.next();
+  }
+
+  const token = await getAccessTokenServer();


See conversation

#240 (comment)

bhansell1 · 2025-01-13T16:07:22Z

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -333,7 +333,7 @@
          "authorizerUri": "arn:aws:apigateway:${AWS_REGION}:lambda:path/2015-03-31/functions/${AUTHORIZER_LAMBDA_ARN}/invocations",
          "authorizerCredentials": "${APIG_EXECUTION_ROLE_ARN}",
          "identitySource": "method.request.header.authorization,context.resourceId,context.httpMethod",
-          "authorizerResultTtlInSeconds": 300
+          "authorizerResultTtlInSeconds": 0


@harrim91 - This is where I'm disabling the caching for now.

It was causing me issues and for the sake of getting this PR in I'll leave it disabled. It sounds like you've potentially got a fix for it in your upcoming PR?

bhansell1 · 2025-01-13T16:12:38Z

tests/test-team/config/local.config.ts

@@ -4,9 +4,21 @@ import baseConfig from './playwright.config';
 export default defineConfig({
  ...baseConfig,

-  timeout: 10_000,
-
+  timeout: 30_000, // 30 seconds in the playwright default


I've increased these timeouts because creating a new sandbox the lambdas have a cold start which cause the pages to load slowly.

In some cases I've seen a page load take up to 8 seconds (this can be seen on a failed run via the traces). This seems to be combination of factors

Page load (next SSR'd the page on first load takes ~2-3s)

API call on a cold start takes ~3-4s

After initial loads the app seems okay but still somewhat sluggish.

bhansell1 · 2025-01-13T16:14:39Z

...eam/template-mgmt-component-tests/email/template-mgmt-view-submitted-email-page.component.ts

@@ -84,7 +84,7 @@ test.describe('View submitted Email message template Page', () => {

      await assertSkipToMainContent(props);
      await assertNotifyBannerLink(props);
-      await assertLoginLink(props);
+      await assertLogoutLink(props);


I've replaced all of the assertLoginLink tests in favor of adding in the assertLogoutLink. We have a ticket for negative testing CCM-7467

bhansell1 · 2025-01-13T16:17:34Z

.github/actions/create-lines-of-code-report/action.yaml

@@ -32,7 +32,7 @@ runs:
      run: zip lines-of-code-report.json.zip lines-of-code-report.json
    - name: "Upload CLOC report as an artefact"
      if: ${{ !env.ACT }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4


GitHub was failing due to V3 being depreciated.

bhansell1 · 2025-01-13T16:17:56Z

.github/workflows/stage-4-acceptance.yaml

  sandbox-set-up:
    name: "Sandbox set up"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04


Once the above PR is merged into main I'll revert this change.

linting

bhansell1 added 30 commits December 19, 2024 16:09

CCM-7465: use JWT sub as owner field in ddb

8fd1458

CCM-7465: use subject for owner

1e04f87

CCM-7465: remove undefined from API response

33bd151

CCM-7465: implement backend api and update automated tests

583b521

CCM-7465: add dynamoDB to tf outputs and allow SRP auth flow. Which I…

e5252c3

… need for some reason? Revert "CCM-7465: remove undefined from API response" This reverts commit 33bd151. CCM-7465: move undefined back

CCM-7465: update automated tests to check for logout link

d99ed4f

CCM-7465: add the auth pages when in CI for automated tests

9cb6154

CCM-7465: don't build the backend

8ce2733

CCM-7465: don't deploy backend resources

0c9b889

CCM-7465: don't deploy backend resources

6b8eeb2

CCM-7465: don't deploy backend resources

73544b6

CCM-7465: don't deploy backend resources

6be7690

CCM-7465: don't deploy backend resources

223bc6a

CCM-7465: don't deploy backend resources

c4c5cf3

CCM-7465: add protected routes

861937c

CCM-7465: add middleware

cab3b5b

CCM-7465: temporarily redirect back home

428cb83

CCM-7465: temporarily redirect back home

bbedfe9

CCM-7465: set env vars required for amplify and next app

620f193

CCM-7465: disable route protection

04cf3e6

debug add outputs debug debug debug debug debug debug CCM-7465: create amplify_ouputs..json file instread of using process.env CCM-7465: move .env debug debug debug debug debug debug debug debug debug debug debug debug

CCM-7465: change from bash to JS version of creating amplify outputs

7cb6bb9

CCM-7465: create a .env file for the CI tests

3fb681c

CCM-7465: clean up unused files

340e3ad

Merge branch 'feature/CCM-7465_use-jwt-sub' of https://github.com/NHS…

5b57282

…Digital/nhs-notify-web-template-management into feature/CCM-7465_use_backend-api

CCM-7465: re-add protected routes

5362455

CCM-7465: add stdout logs to paywright for debugging

86eb40f

CCM-7465: add a 2 minute timeout for webserver load while debugging

050dfe2

CCM-7465: remove authorization caching. Which is causing tests to fail

49927ff

CCM-7465: set retries to 3 to see if a retry helps with the tests.

4c5abd4

CCM-7465: fix automated test by creating a new page when asserting ba…

61bd097

…ck links

bhansell1 commented Jan 13, 2025

View reviewed changes

tests/test-team/config/auth.setup.ts

@@ -0,0 +1,18 @@

/*

Copy link

Contributor Author

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See Conversation.

#240 (comment)

bhansell1 commented Jan 13, 2025

View reviewed changes

bhansell1 temporarily deployed to dev January 13, 2025 15:37 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 13, 2025 15:39 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 13, 2025 15:40 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 13, 2025 15:45 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 13, 2025 15:47 — with GitHub Actions Inactive

bhansell1 commented Jan 13, 2025

View reviewed changes

CCM-7465: update comment about forcing dynamically rendered page

f81c1dd

bhansell1 temporarily deployed to dev January 13, 2025 16:40 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 13, 2025 16:43 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 13, 2025 16:49 — with GitHub Actions Inactive

chris-elliott-nhsd previously approved these changes Jan 14, 2025

View reviewed changes

bhansell1 dismissed chris-elliott-nhsd’s stale review via da0c4ae January 14, 2025 16:31

gparry333 previously approved these changes Jan 14, 2025

View reviewed changes

CCM-7465: update logout link to redirect back to ~templates

cbf9d1c

linting

bhansell1 dismissed gparry333’s stale review via cbf9d1c January 14, 2025 16:40

bhansell1 force-pushed the feature/CCM-7465_backend-api branch from da0c4ae to cbf9d1c Compare January 14, 2025 16:40

bhansell1 temporarily deployed to dev January 14, 2025 16:45 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 14, 2025 16:49 — with GitHub Actions Inactive

bhansell1 temporarily deployed to dev January 14, 2025 16:55 — with GitHub Actions Inactive

gparry333 approved these changes Jan 14, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CCM-7465: implement backend api PT.2 #260

CCM-7465: implement backend api PT.2 #260

bhansell1 commented Jan 13, 2025 •

edited

Loading

bhansell1 Jan 13, 2025

bhansell1 Jan 13, 2025

bhansell1 Jan 13, 2025

bhansell1 Jan 13, 2025 •

edited

Loading

bhansell1 Jan 13, 2025

bhansell1 Jan 13, 2025

bhansell1 Jan 13, 2025

bhansell1 Jan 14, 2025

CCM-7465: implement backend api PT.2 #260

Are you sure you want to change the base?

CCM-7465: implement backend api PT.2 #260

Conversation

bhansell1 commented Jan 13, 2025 • edited Loading

Description

Context

Type of changes

Checklist

Sensitive Information Declaration

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

bhansell1 Jan 13, 2025 • edited Loading

Choose a reason for hiding this comment

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

bhansell1 Jan 13, 2025

Choose a reason for hiding this comment

bhansell1 Jan 14, 2025

Choose a reason for hiding this comment

bhansell1 commented Jan 13, 2025 •

edited

Loading

bhansell1 Jan 13, 2025 •

edited

Loading