Skip to content

Commit 10e490e

Browse files
github-actions[bot]github-actions[bot]
authored
Merge dependabot/npm_and_yarn/aws-sdk/client-cognito-identity-provider-3.799.0 into dependabotCombined
2 parents 7f3e8cd + 6f003e4 commit 10e490e

File tree

464 files changed

+23645
-6347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

464 files changed

+23645
-6347
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# NHS Notify Code Owners
22

3-
* @NHSDigital/nhs-notify-web-template-management
3+
* @NHSDigital/nhs-notify-web-template-management
44

5-
/.github/ @NHSDigital/nhs-notify-web-template-management-admins
6-
*.code-workspace @NHSDigital/nhs-notify-web-template-management-admins
7-
/docs/ @NHSDigital/nhs-notify-web-template-management
8-
/docs/testing/ @NHSDigital/nhs-notify-web-template-management-testers
9-
/tests/test-team/ @NHSDigital/nhs-notify-web-template-management-testers
5+
/.github/ @NHSDigital/nhs-notify-web-template-management-admins
6+
*.code-workspace @NHSDigital/nhs-notify-web-template-management-admins
7+
/docs/ @NHSDigital/nhs-notify-web-template-management
8+
/infrastructure/terraform/ @NHSDigital/nhs-notify-platform
109

1110
# Codeowners must be final check
12-
/.github/CODEOWNERS @NHSDigital/nhs-notify-code-owners
13-
/CODEOWNERS @NHSDigital/nhs-notify-code-owners
11+
/.github/CODEOWNERS @NHSDigital/nhs-notify-code-owners
12+
/CODEOWNERS @NHSDigital/nhs-notify-code-owners
1413

1514

1615
# Each NHS Notify repository should have clear code owners set.

.github/actions/tfsec/action.yaml renamed to .github/actions/trivy/action.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
name: "TFSec Scan"
2-
description: "Scan HCL using TFSec"
1+
name: "Trivy Scan"
32
runs:
43
using: "composite"
54
steps:
6-
- name: "TFSec Scan - Components"
5+
- name: "Trivy Terraform IAC Scan"
76
shell: bash
87
run: |
98
components_exit_code=0
109
modules_exit_code=0
1110
12-
./scripts/terraform/tfsec.sh ./infrastructure/terraform/components || components_exit_code=$?
13-
./scripts/terraform/tfsec.sh ./infrastructure/terraform/modules || modules_exit_code=$?
11+
./scripts/terraform/trivy.sh ./infrastructure/terraform/components || components_exit_code=$?
12+
./scripts/terraform/trivy.sh ./infrastructure/terraform/modules || modules_exit_code=$?
1413
1514
if [ $components_exit_code -ne 0 ] || [ $modules_exit_code -ne 0 ]; then
16-
echo "One or more TFSec scans failed."
15+
echo "Trivy misconfigurations detected."
1716
exit 1
1817
fi

‎.github/workflows/stage-1-commit.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ jobs:
135135
uses: actions/checkout@v4
136136
- name: "Lint Terraform"
137137
uses: ./.github/actions/lint-terraform
138-
tfsec:
139-
name: "TFSec Scan"
138+
trivy:
139+
name: "Trivy Scan"
140140
runs-on: ubuntu-latest
141141
timeout-minutes: 5
142142
needs: detect-terraform-changes
@@ -148,8 +148,8 @@ jobs:
148148
uses: asdf-vm/actions/setup@v3
149149
- name: "Perform Setup"
150150
uses: ./.github/actions/setup
151-
- name: "TFSec Scan"
152-
uses: ./.github/actions/tfsec
151+
- name: "Trivy Scan"
152+
uses: ./.github/actions/trivy
153153
count-lines-of-code:
154154
name: "Count lines of code"
155155
runs-on: ubuntu-latest

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ node_modules
3333

3434
# production
3535
/build
36+
dist
3637

3738
# misc
3839
.DS_Store
@@ -61,6 +62,7 @@ reports
6162
tests/screenshots/*
6263
plugin-cache/
6364

65+
# terraform
6466
*.terraform*
6567
terraform.tfstate
6668
terraform.tfstate.backup
@@ -84,3 +86,6 @@ tests/test-team/playwright-report/
8486
tests/test-team/blob-report/
8587
tests/test-team/playwright/.cache/
8688
lambdas/backend-api/src/email/email-template.json
89+
90+
# vscode
91+
.vscode/settings.local.json

‎.gitleaksignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
# SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore
1+
# SEE: <https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore>
22

33
cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37
44
87312c6a627a7b0420956d49187fd15b130df170:src/__tests__/components/molecules/LoginStatus.test.tsx:jwt:23
55
37ca9f5670f4cd7d91869845ca27defbe6156bb9:src/__tests__/components/molecules/LoginStatus.test.tsx:jwt:23
66
b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:15
77
b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:25
8+
bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
9+
bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25

‎.tool-versions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
act 0.2.64
22
gitleaks 8.24.0
3+
jq 1.6
4+
nodejs 20.18.2
35
pre-commit 3.6.0
46
terraform 1.9.2
57
terraform-docs 0.19.0
8+
trivy 0.61.0
69
vale 3.6.0
7-
tfsec 1.28.10
8-
nodejs 20.18.2
9-
jq 1.6
1010

1111
# ==============================================================================
1212
# The section below is reserved for Docker image versions.

‎.vscode/settings.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
{
22
"markdownlint.config": {
33
"MD013": false,
4-
"MD024": { "siblings_only": true },
4+
"MD024": {
5+
"siblings_only": true
6+
},
57
"MD033": false
68
},
79
"editor.codeActionsOnSave": {
810
"source.fixAll.eslint": "explicit"
911
},
10-
"eslint.codeActionsOnSave.mode": "problems"
12+
"eslint.codeActionsOnSave.mode": "problems",
1113
}

‎frontend/jest.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const config: Config = {
2222
...baseJestConfig,
2323

2424
coveragePathIgnorePatterns: [
25+
...(baseJestConfig.coveragePathIgnorePatterns ?? []),
2526
'.types.ts',
2627
'layout.tsx',
2728
'container.tsx',

‎frontend/src/__tests__/app/choose-a-template-type/__snapshots__/page.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exports[`ChooseATemplateTypePage - LETTER option is hidden when feature flag is
77
>
88
<a
99
class="nhsuk-back-link__link"
10-
href="/templates/manage-templates"
10+
href="/templates/message-templates"
1111
>
1212
<svg
1313
aria-hidden="true"
@@ -165,7 +165,7 @@ exports[`ChooseATemplateTypePage 1`] = `
165165
>
166166
<a
167167
class="nhsuk-back-link__link"
168-
href="/templates/manage-templates"
168+
href="/templates/message-templates"
169169
>
170170
<svg
171171
aria-hidden="true"

‎frontend/src/__tests__/app/create-and-submit-templates/__snapshots__/page.test.tsx.snap‎

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,84 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`matches the snapshot 1`] = `
4+
<div>
5+
<main
6+
class="nhsuk-main-wrapper"
7+
id="maincontent"
8+
role="main"
9+
>
10+
<div
11+
class="nhsuk-grid-row"
12+
data-testid="page-content-wrapper"
13+
>
14+
<div
15+
class="nhsuk-grid-column-two-thirds"
16+
>
17+
<h1
18+
class="nhsuk-heading-xl"
19+
data-testid="page-heading"
20+
>
21+
Create and submit a template to NHS Notify
22+
</h1>
23+
<p>
24+
Use this tool to create and submit templates you want to send as messages using NHS Notify.
25+
</p>
26+
<p>
27+
You can create templates for:
28+
</p>
29+
<ul
30+
class="nhsuk-list nhsuk-list--bullet"
31+
>
32+
<li>
33+
NHS App messages
34+
</li>
35+
<li>
36+
emails
37+
</li>
38+
<li>
39+
text messages (SMS)
40+
</li>
41+
<li>
42+
letters
43+
</li>
44+
</ul>
45+
<p>
46+
When you submit a template, it will be used by NHS Notify to set up the messages you want to send.
47+
</p>
48+
<h2
49+
class="nhsuk-heading-l"
50+
data-testid="page-sub-heading"
51+
>
52+
Before you start
53+
</h2>
54+
<p>
55+
Only use this tool if your message content has been approved by the relevant stakeholders in your team.
56+
</p>
57+
<p>
58+
You can save a template as a draft and edit it later.
59+
</p>
60+
<p>
61+
If you want to change a submitted template, you must create a new template to replace it.
62+
</p>
63+
<p>
64+
You can access this tool by signing in with your Care Identity.
65+
</p>
66+
<a
67+
aria-disabled="false"
68+
class="nhsuk-button"
69+
draggable="false"
70+
href="/templates/message-templates"
71+
role="button"
72+
>
73+
Start now
74+
</a>
75+
</div>
76+
</div>
77+
</main>
78+
</div>
79+
`;
80+
81+
exports[`matches the snapshot with letters feature flag disabled 1`] = `
482
<div>
583
<main
684
class="nhsuk-main-wrapper"
@@ -49,7 +127,7 @@ exports[`matches the snapshot 1`] = `
49127
Before you start
50128
</h2>
51129
<p>
52-
Only use this tool if your message content has been signed off by the relevant stakeholders in your team.
130+
Only use this tool if your message content has been approved by the relevant stakeholders in your team.
53131
</p>
54132
<p>
55133
You can save a template as a draft and edit it later.
@@ -64,7 +142,7 @@ exports[`matches the snapshot 1`] = `
64142
aria-disabled="false"
65143
class="nhsuk-button"
66144
draggable="false"
67-
href="/templates/manage-templates"
145+
href="/templates/message-templates"
68146
role="button"
69147
>
70148
Start now

0 commit comments

Comments
 (0)