Skip to content

Commit 16a0505

Browse files
thomasleesethomasleese
authored
Merge pull request #4528 from nhsuk/next
Version 3.4.0
2 parents 20fe030 + ca74c7e commit 16a0505

File tree

516 files changed

+8671
-8091
lines changed

Some content is hidden

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

516 files changed

+8671
-8091
lines changed

‎.github/workflows/build-and-push-image.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
build-needed: ${{ steps.check-dev-image.outputs.build-needed || steps.check-prod-image.outputs.build-needed }}
3131
steps:
3232
- name: Configure AWS Dev Credentials
33-
uses: aws-actions/configure-aws-credentials@v4
33+
uses: aws-actions/configure-aws-credentials@v5
3434
with:
3535
role-to-assume: arn:aws:iam::393416225559:role/GithubDeployMavisAndInfrastructure
3636
aws-region: eu-west-2
@@ -45,7 +45,7 @@ jobs:
4545
fi
4646
- name: Configure AWS Production credentials
4747
if: env.PUSH_IMAGE_TO_PRODUCTION == 'true'
48-
uses: aws-actions/configure-aws-credentials@v4
48+
uses: aws-actions/configure-aws-credentials@v5
4949
with:
5050
role-to-assume: arn:aws:iam::820242920762:role/GithubDeployMavisAndInfrastructure
5151
aws-region: eu-west-2
@@ -109,7 +109,7 @@ jobs:
109109
with:
110110
name: image
111111
- name: Configure AWS Credentials
112-
uses: aws-actions/configure-aws-credentials@v4
112+
uses: aws-actions/configure-aws-credentials@v5
113113
with:
114114
role-to-assume: ${{ matrix.aws-role }}
115115
aws-region: eu-west-2

‎.github/workflows/data-replication-pipeline.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
uses: actions/checkout@v5
6868
- name: Assume DB Snapshot role
6969
if: inputs.take_db_snapshot
70-
uses: aws-actions/configure-aws-credentials@v4
70+
uses: aws-actions/configure-aws-credentials@v5
7171
with:
7272
role-to-assume: ${{ env.db_snapshot_role }}
7373
aws-region: eu-west-2
@@ -81,7 +81,7 @@ jobs:
8181
aws rds wait db-cluster-snapshot-available --db-cluster-snapshot-identifier $snapshot_identifier
8282
echo "New snapshot is now available"
8383
- name: Configure AWS Credentials
84-
uses: aws-actions/configure-aws-credentials@v4
84+
uses: aws-actions/configure-aws-credentials@v5
8585
with:
8686
role-to-assume: ${{ env.aws_role }}
8787
aws-region: eu-west-2
@@ -121,7 +121,7 @@ jobs:
121121
- name: Checkout code
122122
uses: actions/checkout@v5
123123
- name: Configure AWS Credentials
124-
uses: aws-actions/configure-aws-credentials@v4
124+
uses: aws-actions/configure-aws-credentials@v5
125125
with:
126126
role-to-assume: ${{ env.aws_role }}
127127
aws-region: eu-west-2
@@ -160,7 +160,7 @@ jobs:
160160
- name: Checkout code
161161
uses: actions/checkout@v5
162162
- name: Configure AWS Credentials
163-
uses: aws-actions/configure-aws-credentials@v4
163+
uses: aws-actions/configure-aws-credentials@v5
164164
with:
165165
role-to-assume: ${{ env.aws_role }}
166166
aws-region: eu-west-2
@@ -214,7 +214,7 @@ jobs:
214214
- name: Checkout code
215215
uses: actions/checkout@v5
216216
- name: Configure AWS Credentials
217-
uses: aws-actions/configure-aws-credentials@v4
217+
uses: aws-actions/configure-aws-credentials@v5
218218
with:
219219
role-to-assume: ${{ env.aws_role }}
220220
aws-region: eu-west-2

‎.github/workflows/deploy-application.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
ref: ${{ inputs.git_sha_to_deploy || github.sha }}
6464
- name: Configure AWS Credentials
65-
uses: aws-actions/configure-aws-credentials@v4
65+
uses: aws-actions/configure-aws-credentials@v5
6666
with:
6767
role-to-assume: ${{ env.aws-role }}
6868
aws-region: eu-west-2
@@ -107,7 +107,7 @@ jobs:
107107
name: DEPLOYMENT_ENVS-${{ inputs.environment }}
108108
path: ${{ runner.temp }}
109109
- name: Configure AWS Credentials
110-
uses: aws-actions/configure-aws-credentials@v4
110+
uses: aws-actions/configure-aws-credentials@v5
111111
with:
112112
role-to-assume: ${{ env.aws-role }}
113113
aws-region: eu-west-2
@@ -140,7 +140,7 @@ jobs:
140140
name: DEPLOYMENT_ENVS-${{ inputs.environment }}
141141
path: ${{ runner.temp }}
142142
- name: Configure AWS Credentials
143-
uses: aws-actions/configure-aws-credentials@v4
143+
uses: aws-actions/configure-aws-credentials@v5
144144
with:
145145
role-to-assume: ${{ env.aws-role }}
146146
aws-region: eu-west-2
@@ -184,7 +184,7 @@ jobs:
184184
name: DEPLOYMENT_ENVS-${{ inputs.environment }}
185185
path: ${{ runner.temp }}
186186
- name: Configure AWS Credentials
187-
uses: aws-actions/configure-aws-credentials@v4
187+
uses: aws-actions/configure-aws-credentials@v5
188188
with:
189189
role-to-assume: ${{ env.aws-role }}
190190
aws-region: eu-west-2

‎.github/workflows/deploy-backup-infrastructure.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Checkout code
3737
uses: actions/checkout@v5
3838
- name: Configure AWS Credentials
39-
uses: aws-actions/configure-aws-credentials@v4
39+
uses: aws-actions/configure-aws-credentials@v5
4040
with:
4141
role-to-assume: ${{ env.aws_role }}
4242
aws-region: eu-west-2
@@ -75,7 +75,7 @@ jobs:
7575
- name: Checkout code
7676
uses: actions/checkout@v5
7777
- name: Configure AWS Credentials
78-
uses: aws-actions/configure-aws-credentials@v4
78+
uses: aws-actions/configure-aws-credentials@v5
7979
with:
8080
role-to-assume: ${{ env.aws_role }}
8181
aws-region: eu-west-2

‎.github/workflows/deploy-infrastructure.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
ref: ${{ env.git_ref_to_deploy }}
4646
- name: Configure AWS Credentials
47-
uses: aws-actions/configure-aws-credentials@v4
47+
uses: aws-actions/configure-aws-credentials@v5
4848
with:
4949
role-to-assume: ${{ env.aws_role }}
5050
aws-region: eu-west-2
@@ -106,7 +106,7 @@ jobs:
106106
with:
107107
ref: ${{ env.git_ref_to_deploy }}
108108
- name: Configure AWS Credentials
109-
uses: aws-actions/configure-aws-credentials@v4
109+
uses: aws-actions/configure-aws-credentials@v5
110110
with:
111111
role-to-assume: ${{ env.aws_role }}
112112
aws-region: eu-west-2

‎.github/workflows/deploy-monitoring.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
ref: ${{ env.git_ref_to_deploy }}
4848
- name: Configure AWS Credentials
49-
uses: aws-actions/configure-aws-credentials@v4
49+
uses: aws-actions/configure-aws-credentials@v5
5050
with:
5151
role-to-assume: ${{ env.aws_role }}
5252
aws-region: eu-west-2
@@ -98,7 +98,7 @@ jobs:
9898
with:
9999
ref: ${{ env.git_ref_to_deploy }}
100100
- name: Configure AWS Credentials
101-
uses: aws-actions/configure-aws-credentials@v4
101+
uses: aws-actions/configure-aws-credentials@v5
102102
with:
103103
role-to-assume: ${{ env.aws_role }}
104104
aws-region: eu-west-2
@@ -133,7 +133,7 @@ jobs:
133133
with:
134134
ref: ${{ env.git_ref_to_deploy }}
135135
- name: Configure AWS Credentials
136-
uses: aws-actions/configure-aws-credentials@v4
136+
uses: aws-actions/configure-aws-credentials@v5
137137
with:
138138
role-to-assume: ${{ env.aws_role }}
139139
aws-region: eu-west-2

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
ref: ${{ github.ref_name }}
9898
- name: Configure AWS Credentials
99-
uses: aws-actions/configure-aws-credentials@v4
99+
uses: aws-actions/configure-aws-credentials@v5
100100
with:
101101
role-to-assume: arn:aws:iam::${{ env.account_id }}:role/GithubDeployMavisAndInfrastructure
102102
aws-region: eu-west-2
@@ -122,7 +122,7 @@ jobs:
122122
with:
123123
ref: ${{ github.ref_name }}
124124
- name: Configure AWS Credentials
125-
uses: aws-actions/configure-aws-credentials@v4
125+
uses: aws-actions/configure-aws-credentials@v5
126126
with:
127127
role-to-assume: arn:aws:iam::${{ env.account_id }}:role/GithubDeployMavisAndInfrastructure
128128
aws-region: eu-west-2

‎.github/workflows/destroy-infrastructure.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Checkout code
3636
uses: actions/checkout@v5
3737
- name: Configure AWS Credentials
38-
uses: aws-actions/configure-aws-credentials@v4
38+
uses: aws-actions/configure-aws-credentials@v5
3939
with:
4040
role-to-assume: ${{ env.aws_role }}
4141
aws-region: eu-west-2
@@ -70,7 +70,7 @@ jobs:
7070
environment: ${{ inputs.environment }}
7171
steps:
7272
- name: Configure AWS Credentials
73-
uses: aws-actions/configure-aws-credentials@v4
73+
uses: aws-actions/configure-aws-credentials@v5
7474
with:
7575
role-to-assume: ${{ env.aws_role }}
7676
aws-region: eu-west-2

‎.prettierignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ terraform/.terraform
3939
*.tfstate
4040
*.tfstate.backup
4141
scratchpad
42-
spec/fixtures/fhir/immunisation-create.json
43-
spec/fixtures/fhir/immunisation-update.json
42+
spec/fixtures/files/fhir/immunisation-create.json
43+
spec/fixtures/files/fhir/immunisation-update.json

‎.rubocop.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Layout/LineLength:
2323
Exclude:
2424
- db/schema.rb
2525

26+
Lint/MissingSuper:
27+
Exclude:
28+
- app/components/*.rb
29+
2630
Lint/PercentStringArray:
2731
Exclude:
2832
- spec/models/dps_export_spec.rb

0 commit comments

Comments
 (0)