Skip to content

Commit 6a33395

Browse files
RossFaulds171RossFaulds171
authored
Merge branch 'main' into feature/CCM-12185-addGetMiEndpoint 
2 parents e0d1206 + 0abcdca commit 6a33395

33 files changed

Lines changed: 16370 additions & 16270 deletions

File tree

‎.github/workflows/cicd-1-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
deploy_proxy: ${{ steps.deploy_proxy.outputs.deploy_proxy }}
3434
steps:
3535
- name: "Checkout code"
36-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
36+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3737
- name: "Set CI/CD variables"
3838
id: variables
3939
run: |

‎.github/workflows/cicd-4-pr-title-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: "Check PR title format"
18-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@4.0.0
18+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # 4.0.1
1919
with:
2020
title: ${{ github.event.pull_request.title }}

‎.github/workflows/pr_closed.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
packages: read
5757
steps:
5858
- name: Checkout code
59-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
59+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6060
- name: Setup NodeJS
61-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
61+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
6262
with:
6363
node-version-file: ".tool-versions"
6464
registry-url: "https://npm.pkg.github.com"
@@ -92,7 +92,7 @@ jobs:
9292
packages: read
9393
steps:
9494
- name: "Checkout code"
95-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
95+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9696
- name: "Repo setup"
9797
uses: ./.github/actions/node-install
9898
with:
@@ -115,9 +115,9 @@ jobs:
115115

116116
steps:
117117
- name: Checkout code
118-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
118+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
119119
- name: Setup NodeJS
120-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
120+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
121121
with:
122122
node-version-file: ".tool-versions"
123123
registry-url: "https://npm.pkg.github.com"

‎.github/workflows/pr_destroy_dynamic_env.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121

2222
steps:
23-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
23+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424

2525
- name: Trigger dynamic environment destruction
2626
env:
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545

4646
steps:
47-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
47+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4848

4949
- name: Trigger dynamic proxy destruction
5050
env:

‎.github/workflows/scheduled-repository-template-sync.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616

1717
steps:
1818
- name: Check out the repository
19-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
- name: Sync repository template
21-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/sync-template-repo@4.0.0
21+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/sync-template-repo@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
2222
with:
2323
github_token: ${{ github.token }}
2424

2525
- name: Create Pull Request
2626
if: ${{ !env.ACT }}
27-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
27+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
2828
with:
2929
token: ${{ secrets.GITHUB_TOKEN }}
3030
commit-message: Drift from template

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
35+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.2.2
3636
with:
3737
persist-credentials: false
3838

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,33 @@ jobs:
4747
timeout-minutes: 5
4848
steps:
4949
- name: "Checkout code"
50-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
50+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5151
with:
5252
fetch-depth: 0 # Full history is needed to scan all commits
5353
- name: "Scan secrets"
54-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-secrets@4.0.0
54+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-secrets@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
5555
check-file-format:
5656
name: "Check file format"
5757
runs-on: ubuntu-latest
5858
timeout-minutes: 5
5959
steps:
6060
- name: "Checkout code"
61-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
61+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6262
with:
6363
fetch-depth: 0 # Full history is needed to compare branches
6464
- name: "Check file format"
65-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-file-format@4.0.0
65+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-file-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
6666
check-markdown-format:
6767
name: "Check Markdown format"
6868
runs-on: ubuntu-latest
6969
timeout-minutes: 5
7070
steps:
7171
- name: "Checkout code"
72-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
72+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7373
with:
7474
fetch-depth: 0 # Full history is needed to compare branches
7575
- name: "Check Markdown format"
76-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-markdown-format@4.0.0
76+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-markdown-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
7777
terraform-docs:
7878
name: "Run terraform-docs"
7979
runs-on: ubuntu-latest
@@ -83,7 +83,7 @@ jobs:
8383
contents: write
8484
steps:
8585
- name: "Checkout code"
86-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
86+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8787
with:
8888
fetch-depth: 0 # Full history is needed to compare branches
8989
- name: "Check to see if Terraform Docs are up-to-date"
@@ -104,30 +104,30 @@ jobs:
104104
timeout-minutes: 5
105105
steps:
106106
- name: "Checkout code"
107-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
107+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
108108
with:
109109
fetch-depth: 0 # Full history is needed to compare branches
110110
- name: "Check English usage"
111-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-english-usage@4.0.0
111+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-english-usage@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
112112
check-todo-usage:
113113
name: "Check TODO usage"
114114
runs-on: ubuntu-latest
115115
timeout-minutes: 5
116116
steps:
117117
- name: "Checkout code"
118-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
118+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
119119
with:
120120
fetch-depth: 0 # Full history is needed to compare branches
121121
- name: "Check TODO usage"
122-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-todo-usage@4.0.0
122+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-todo-usage@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
123123
detect-terraform-changes:
124124
name: "Detect Terraform Changes"
125125
runs-on: ubuntu-latest
126126
outputs:
127127
terraform_changed: ${{ steps.check.outputs.terraform_changed }}
128128
steps:
129129
- name: "Checkout code"
130-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
130+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
131131
- name: "Check for Terraform changes"
132132
id: check
133133
run: |
@@ -150,11 +150,11 @@ jobs:
150150
if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
151151
steps:
152152
- name: "Checkout code"
153-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
153+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
154154
- name: "Setup ASDF"
155155
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
156156
- name: "Lint Terraform"
157-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/lint-terraform@4.0.0
157+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/lint-terraform@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
158158
# TODO - Re-visit Trivy usage https://nhsd-jira.digital.nhs.uk/browse/CCM-15549
159159
# trivy-iac:
160160
# name: "Trivy IaC Scan"
@@ -198,9 +198,9 @@ jobs:
198198
timeout-minutes: 5
199199
steps:
200200
- name: "Checkout code"
201-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
201+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
202202
- name: "Count lines of code"
203-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/create-lines-of-code-report@4.0.0
203+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/create-lines-of-code-report@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
204204
with:
205205
build_datetime: "${{ inputs.build_datetime }}"
206206
build_timestamp: "${{ inputs.build_timestamp }}"
@@ -217,9 +217,9 @@ jobs:
217217
timeout-minutes: 5
218218
steps:
219219
- name: "Checkout code"
220-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
220+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
221221
- name: "Scan dependencies"
222-
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-dependencies@4.0.0
222+
uses: NHSDigital/nhs-notify-shared-modules/.github/actions/scan-dependencies@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # v4.0.1
223223
with:
224224
build_datetime: "${{ inputs.build_datetime }}"
225225
build_timestamp: "${{ inputs.build_timestamp }}"
@@ -302,9 +302,9 @@ jobs:
302302
packages: read
303303
steps:
304304
- name: Checkout code
305-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
305+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
306306
- name: Setup NodeJS
307-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
307+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
308308
with:
309309
node-version: ${{ inputs.nodejs_version }}
310310
registry-url: "https://npm.pkg.github.com"

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ jobs:
4848
timeout-minutes: 5
4949
steps:
5050
- name: "Checkout code"
51-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
51+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5252
- name: Setup NodeJS
53-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
53+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
5454
with:
5555
node-version: ${{ inputs.nodejs_version }}
5656
registry-url: "https://npm.pkg.github.com"
5757
- name: "Cache node_modules"
58-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
58+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
5959
with:
6060
path: |
6161
**/node_modules
@@ -79,14 +79,14 @@ jobs:
7979
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8080
steps:
8181
- name: "Checkout code"
82-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
82+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8383
- name: Setup NodeJS
84-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
84+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
8585
with:
8686
node-version: ${{ inputs.nodejs_version }}
8787
registry-url: "https://npm.pkg.github.com"
8888
- name: "Cache node_modules"
89-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
89+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
9090
with:
9191
path: |
9292
**/node_modules
@@ -127,9 +127,9 @@ jobs:
127127
contents: read
128128
steps:
129129
- name: "Checkout code"
130-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
130+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
131131
- name: "Cache node_modules"
132-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
132+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
133133
with:
134134
path: |
135135
**/node_modules
@@ -155,14 +155,14 @@ jobs:
155155
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
156156
steps:
157157
- name: "Checkout code"
158-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
158+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
159159
- name: Setup NodeJS
160-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
160+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
161161
with:
162162
node-version: ${{ inputs.nodejs_version }}
163163
registry-url: "https://npm.pkg.github.com"
164164
- name: "Cache node_modules"
165-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
165+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
166166
with:
167167
path: |
168168
**/node_modules
@@ -188,14 +188,14 @@ jobs:
188188
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
189189
steps:
190190
- name: "Checkout code"
191-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
191+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
192192
- name: Setup NodeJS
193-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
193+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
194194
with:
195195
node-version: ${{ inputs.nodejs_version }}
196196
registry-url: "https://npm.pkg.github.com"
197197
- name: "Cache node_modules"
198-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
198+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
199199
with:
200200
path: |
201201
**/node_modules
@@ -220,7 +220,7 @@ jobs:
220220
timeout-minutes: 5
221221
steps:
222222
- name: "Checkout code"
223-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
223+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
224224
- name: "Run test coverage check"
225225
run: |
226226
make test-coverage
@@ -237,7 +237,7 @@ jobs:
237237
timeout-minutes: 5
238238
steps:
239239
- name: "Checkout code"
240-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
240+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
241241
with:
242242
fetch-depth: 0 # Full history is needed to improving relevancy of reporting
243243
- name: "Download coverage report for SONAR"

0 commit comments

Comments
 (0)