Skip to content

Commit 223d427

Browse files
Namitha-PrabhuNamitha-Prabhu
committed
Merge branch 'main' into feature/CCM-12180-TestsOnPipeline 
2 parents 038076e + c934c3c commit 223d427

24 files changed

+571
-85
lines changed

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ jobs:
6868
# Upload the results to GitHub's code scanning dashboard (optional).
6969
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
71+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
7272
with:
7373
sarif_file: results.sarif

‎.github/workflows/stage-2-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
with:
144144
fetch-depth: 0 # Full history is needed to improving relevancy of reporting
145145
- name: "Download coverage report for SONAR"
146-
uses: actions/download-artifact@v5
146+
uses: actions/download-artifact@v6
147147
with:
148148
name: code-coverage-report
149149
- name: "Perform static analysis"

‎.github/workflows/stage-5-publish.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,56 +46,56 @@ jobs:
4646
uses: actions/checkout@v5
4747

4848
- name: "Get the artefacts 1"
49-
uses: actions/download-artifact@v5
49+
uses: actions/download-artifact@v6
5050
with:
5151
path: ./artifacts/jekyll-docs-${{ inputs.version }}
5252
name: jekyll-docs-${{ inputs.version }}
5353

5454
- name: "Get the artefacts 2"
55-
uses: actions/download-artifact@v5
55+
uses: actions/download-artifact@v6
5656
with:
5757
path: ./artifacts/sdk-html-docs-${{ inputs.version }}
5858
name: sdk-html-docs-${{ inputs.version }}
5959

6060
- name: "Get the artefacts 3"
61-
uses: actions/download-artifact@v5
61+
uses: actions/download-artifact@v6
6262
with:
6363
path: ./artifacts/sdk-swagger-docs-${{ inputs.version }}
6464
name: sdk-swagger-docs-${{ inputs.version }}
6565

6666
- name: "Get the artefacts 4"
67-
uses: actions/download-artifact@v5
67+
uses: actions/download-artifact@v6
6868
with:
6969
path: ./artifacts/sdk-html-${{ inputs.version }}
7070
name: sdk-html-${{ inputs.version }}
7171

7272
- name: "Get the artefacts 5"
73-
uses: actions/download-artifact@v5
73+
uses: actions/download-artifact@v6
7474
with:
7575
path: ./artifacts/sdk-ts-${{ inputs.version }}
7676
name: sdk-ts-${{ inputs.version }}
7777

7878
- name: "Get the artefacts 6"
79-
uses: actions/download-artifact@v5
79+
uses: actions/download-artifact@v6
8080
with:
8181
path: ./artifacts/sdk-python-${{ inputs.version }}
8282
name: sdk-python-${{ inputs.version }}
8383

8484
- name: "Get the artefacts 7"
85-
uses: actions/download-artifact@v5
85+
uses: actions/download-artifact@v6
8686
with:
8787
path: ./artifacts/sdk-csharp-${{ inputs.version }}
8888
name: sdk-csharp-${{ inputs.version }}
8989

9090
- name: "Get the artefacts 8"
91-
uses: actions/download-artifact@v5
91+
uses: actions/download-artifact@v6
9292
with:
9393
path: ./artifacts/api-oas-specification-${{ inputs.version }}
9494
name: api-oas-specification-${{ inputs.version }}
9595

9696
# Take out for now - might add again in the future
9797
# - name: "Get the artefacts 9"
98-
# uses: actions/download-artifact@v5
98+
# uses: actions/download-artifact@v6
9999
# with:
100100
# path: ./artifacts/server-csharp-${{ inputs.version }}
101101
# name: server-csharp-${{ inputs.version }}
@@ -252,12 +252,12 @@ jobs:
252252
# contents: read
253253
# steps:
254254
# - name: "Get the artefacts csharp docker"
255-
# uses: actions/download-artifact@v5
255+
# uses: actions/download-artifact@v6
256256
# with:
257257
# path: .
258258
# name: server-csharp-docker-${{ inputs.version }}
259259
# - name: "Get the artefacts csharp server"
260-
# uses: actions/download-artifact@v5
260+
# uses: actions/download-artifact@v6
261261
# with:
262262
# path: ./csharp-server
263263
# name: server-csharp-${{ inputs.version }}
@@ -279,7 +279,7 @@ jobs:
279279
contents: read
280280
steps:
281281
- name: "Get the artefacts"
282-
uses: actions/download-artifact@v5
282+
uses: actions/download-artifact@v6
283283
with:
284284
path: .
285285
name: sdk-csharp-${{ inputs.version }}
@@ -335,7 +335,7 @@ jobs:
335335
contents: read
336336
steps:
337337
- name: "Get the artefacts"
338-
uses: actions/download-artifact@v5
338+
uses: actions/download-artifact@v6
339339
with:
340340
path: .
341341
name: sdk-ts-${{ inputs.version }}
@@ -439,7 +439,7 @@ jobs:
439439
# contents: read
440440
# steps:
441441
# - name: "Get the artefacts"
442-
# uses: actions/download-artifact@v5
442+
# uses: actions/download-artifact@v6
443443
# with:
444444
# path: .
445445
# name: libs-letter-${{ inputs.version }}

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ clean:: # Clean-up project resources (main) @Operations
3030
# (cd src/server && make clean)
3131

3232
guard-%:
33-
@ if [ "${${*}}" = "" ]; then \
33+
@if [ -z "$${$*}" ]; then \
3434
echo "Variable $* not set"; \
35-
echo "Usage: make <target> APIM_ENV=<env>"
35+
echo "Usage: make <target> $*=<env>"; \
3636
exit 1; \
3737
fi
3838
serve:
@@ -59,6 +59,9 @@ set-security: guard-APIM_ENV
5959
@ SECURITY=security-$$APIM_ENV.yml \
6060
envsubst '$${SECURITY}' \
6161
< specification/api/components/security/security-template.yml > specification/api/components/security/security.yml
62+
@ SECURITY_SCHEMES=security-schemes-$$APIM_ENV.yml \
63+
envsubst '$${SECURITY_SCHEMES}' \
64+
< specification/api/components/security-schemes/security-schemes-template.yml > specification/api/components/security-schemes/security-schemes.yml
6265

6366
construct-spec: guard-APIM_ENV
6467
$(MAKE) set-target APIM_ENV=$$APIM_ENV

‎docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "",
33
"dependencies": {
4-
"nhsuk-frontend": "^8.1.1"
4+
"nhsuk-frontend": "^10.1.0"
55
},
66
"description": "",
77
"devDependencies": {},

‎internal/datastore/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"testcontainers": "^11.4.0",
2020
"ts-jest": "^29.4.0",
2121
"ts-node": "^10.9.2",
22-
"typescript": "^5.8.3",
22+
"typescript": "^5.9.3",
2323
"zod-mermaid": "^1.0.9"
2424
},
2525
"license": "MIT",

‎internal/datastore/src/cli/diagrams.ts‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,39 @@
1-
import {LetterSchema, MISchema, SupplierSchema} from '../types';
2-
import { generateMermaidDiagram } from 'zod-mermaid';
3-
import * as fs from 'node:fs';
1+
import { generateMermaidDiagram } from "zod-mermaid";
2+
import * as fs from "node:fs";
3+
import {
4+
LetterSchema,
5+
MISchema,
6+
SupplierSchema,
7+
} from "internal/datastore/src/types";
48

5-
const out = fs.openSync('src/types.md', 'w');
9+
const out = fs.openSync("src/types.md", "w");
610

7-
fs.writeSync(out, `# Data Store Schemas
11+
fs.writeSync(
12+
out,
13+
`# Data Store Schemas
814
915
This document contains the mermaid diagrams for the data store schemas used in the application.
1016
1117
The schemas are generated from Zod definitions and provide a visual representation of the data structure.
12-
`);
18+
`,
19+
);
1320

14-
for (const [name, schema] of Object.entries({ Letter: [LetterSchema], MI: [MISchema], Supplier: [SupplierSchema] })) {
21+
for (const [name, schema] of Object.entries({
22+
Letter: [LetterSchema],
23+
MI: [MISchema],
24+
Supplier: [SupplierSchema],
25+
})) {
1526
const mermaid = generateMermaidDiagram(schema);
16-
fs.writeSync(out, `
27+
fs.writeSync(
28+
out,
29+
`
1730
## ${name} schema
1831
1932
\`\`\`mermaid
2033
${mermaid}
2134
\`\`\`
22-
`);
35+
`,
36+
);
2337
}
2438

2539
fs.closeSync(out);

‎internal/events/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"jest": "^29.7.0",
1818
"ts-jest": "^29.4.0",
1919
"ts-node": "^10.9.2",
20-
"typescript": "^5.8.3"
20+
"typescript": "^5.9.3"
2121
},
2222
"license": "MIT",
2323
"main": "dist/index.js",

‎internal/helpers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"jest": "^30.1.3",
1515
"ts-jest": "^29.4.0",
1616
"ts-node": "^10.9.2",
17-
"typescript": "^5.8.3"
17+
"typescript": "^5.9.3"
1818
},
1919
"license": "MIT",
2020
"main": "src/index.ts",

‎lambdas/api-handler/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@types/jest": "^29.5.14",
1313
"jest": "^30.2.0",
1414
"jest-mock-extended": "^3.0.7",
15-
"typescript": "^5.8.3",
15+
"typescript": "^5.9.3",
1616
"zod": "^4.1.11"
1717
},
1818
"name": "nhs-notify-supplier-api-handler",

0 commit comments

Comments
 (0)