Skip to content

Commit 3321105

Browse files
axelkrastek1-nhsaxelkrastek1-nhs
authored
Merge pull request #1044 from NHSDigital/feature/axkr1-NRL-1594-sonarcloudorama
NRL-1594 sonarcloudorama
2 parents ef1435f + 70efcd1 commit 3321105

File tree

7 files changed

+37
-27
lines changed

7 files changed

+37
-27
lines changed

‎.github/workflows/activate-stack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
poetry install --no-root
3939
4040
- name: Configure Management Credentials
41-
uses: aws-actions/configure-aws-credentials@v4
41+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
4242
with:
4343
aws-region: eu-west-2
4444
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}

‎.github/workflows/daily-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: make build
4343

4444
- name: Configure Management Credentials
45-
uses: aws-actions/configure-aws-credentials@v4
45+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
4646
with:
4747
aws-region: eu-west-2
4848
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}

‎.github/workflows/persistent-environment.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: make build
4646

4747
- name: Configure Management Credentials
48-
uses: aws-actions/configure-aws-credentials@v4
48+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
4949
with:
5050
aws-region: eu-west-2
5151
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -89,7 +89,7 @@ jobs:
8989
poetry install --no-root
9090
9191
- name: Configure Management Credentials
92-
uses: aws-actions/configure-aws-credentials@v4
92+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
9393
with:
9494
aws-region: eu-west-2
9595
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -121,11 +121,13 @@ jobs:
121121
terraform -chdir=terraform/infrastructure workspace select ${inactive_stack}
122122
123123
- name: Terraform Plan
124+
env:
125+
DEPLOY_ROLE_ARN: ${{ secrets.DEPLOY_ROLE_ARN }}
124126
run: |
125127
inactive_stack=$(poetry run python ./scripts/get_env_config.py inactive-stack ${{ inputs.environment }})
126128
terraform -chdir=terraform/infrastructure plan \
127129
--var-file=etc/${{ vars.ACCOUNT_NAME }}.tfvars \
128-
--var assume_role_arn=${{ secrets.DEPLOY_ROLE_ARN }} \
130+
--var assume_role_arn=${DEPLOY_ROLE_ARN} \
129131
--var use_shared_resources=$(poetry run python scripts/are_resources_shared_for_stack.py ${inactive_stack}) \
130132
-out tfplan
131133
@@ -166,7 +168,7 @@ jobs:
166168
fail-on-cache-miss: true
167169

168170
- name: Configure Management Credentials
169-
uses: aws-actions/configure-aws-credentials@v4
171+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
170172
with:
171173
aws-region: eu-west-2
172174
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -219,7 +221,7 @@ jobs:
219221
poetry install --no-root
220222
221223
- name: Configure Management Credentials
222-
uses: aws-actions/configure-aws-credentials@v4
224+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
223225
with:
224226
aws-region: eu-west-2
225227
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -248,7 +250,7 @@ jobs:
248250
poetry install --no-root
249251
250252
- name: Configure Management Credentials
251-
uses: aws-actions/configure-aws-credentials@v4
253+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
252254
with:
253255
aws-region: eu-west-2
254256
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -277,7 +279,7 @@ jobs:
277279
poetry install --no-root
278280
279281
- name: Configure Management Credentials
280-
uses: aws-actions/configure-aws-credentials@v4
282+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
281283
with:
282284
aws-region: eu-west-2
283285
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}

‎.github/workflows/pr-env-deploy.yml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
run: make build
6868

6969
- name: Configure Management Credentials
70-
uses: aws-actions/configure-aws-credentials@v4
70+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
7171
with:
7272
aws-region: eu-west-2
7373
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -121,7 +121,7 @@ jobs:
121121
poetry install --no-root
122122
123123
- name: Configure Management Credentials
124-
uses: aws-actions/configure-aws-credentials@v4
124+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
125125
with:
126126
aws-region: eu-west-2
127127
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -150,10 +150,12 @@ jobs:
150150
terraform -chdir=terraform/infrastructure workspace select ${{ needs.set-environment-id.outputs.environment_id }}
151151
152152
- name: Terraform Plan
153+
env:
154+
DEPLOY_ROLE_ARN: ${{ secrets.DEPLOY_ROLE_ARN }}
153155
run: |
154156
terraform -chdir=terraform/infrastructure plan \
155157
--var-file=etc/dev.tfvars \
156-
--var assume_role_arn=${{ secrets.DEPLOY_ROLE_ARN }} \
158+
--var assume_role_arn=${DEPLOY_ROLE_ARN} \
157159
--var use_shared_resources=$(poetry run python scripts/are_resources_shared_for_stack.py ${{ needs.set-environment-id.outputs.environment_id }}) \
158160
-out tfplan
159161
@@ -203,7 +205,7 @@ jobs:
203205
poetry install --no-root
204206
205207
- name: Configure Management Credentials
206-
uses: aws-actions/configure-aws-credentials@v4
208+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
207209
with:
208210
aws-region: eu-west-2
209211
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -213,7 +215,7 @@ jobs:
213215
run: make truststore-pull-client ENV=dev
214216

215217
- name: Configure Dev Account Credentials
216-
uses: aws-actions/configure-aws-credentials@v4
218+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
217219
with:
218220
aws-region: eu-west-2
219221
role-chaining: true
@@ -240,7 +242,7 @@ jobs:
240242
poetry install --no-root
241243
242244
- name: Configure Management Credentials
243-
uses: aws-actions/configure-aws-credentials@v4
245+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
244246
with:
245247
aws-region: eu-west-2
246248
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -275,7 +277,7 @@ jobs:
275277
poetry install --no-root
276278
277279
- name: Configure AWS Credentials
278-
uses: aws-actions/configure-aws-credentials@v4
280+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
279281
with:
280282
aws-region: eu-west-2
281283
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -285,7 +287,9 @@ jobs:
285287
run: make truststore-pull-client ENV=dev
286288

287289
- name: Configure Dev Account Credentials
288-
uses: aws-actions/configure-aws-credentials@v4
290+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
291+
env:
292+
DEPLOY_ROLE_ARN: ${{ secrets.DEPLOY_ROLE_ARN }}
289293
with:
290294
aws-region: eu-west-2
291295
role-chaining: true

‎.github/workflows/pr-env-destroy.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
poetry install --no-root
6262
6363
- name: Configure AWS Credentials
64-
uses: aws-actions/configure-aws-credentials@v4
64+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
6565
with:
6666
aws-region: eu-west-2
6767
role-to-assume: ${{ secrets.CI_ROLE_NAME }}
@@ -80,10 +80,12 @@ jobs:
8080
run: make build get-s3-perms
8181

8282
- name: Terraform Destroy
83+
env:
84+
DEPLOY_ROLE_ARN: ${{ secrets.DEPLOY_ROLE_ARN }}
8385
run: |
8486
terraform -chdir=terraform/infrastructure destroy \
8587
--var-file=etc/dev.tfvars \
86-
--var assume_role_arn=${{ secrets.DEPLOY_ROLE_ARN }} \
88+
--var assume_role_arn=${DEPLOY_ROLE_ARN} \
8789
-auto-approve
8890
8991
- name: Cleanup Terraform Workspace

‎.github/workflows/rollback-stack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
poetry install --no-root
3434
3535
- name: Configure Management Credentials
36-
uses: aws-actions/configure-aws-credentials@v4
36+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
3737
with:
3838
aws-region: eu-west-2
3939
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}

‎.github/workflows/update-lambda-permissions.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
poetry install --no-root
4444
4545
- name: Configure Management Credentials
46-
uses: aws-actions/configure-aws-credentials@v4
46+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
4747
with:
4848
aws-region: eu-west-2
4949
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -91,7 +91,7 @@ jobs:
9191
poetry install --no-root
9292
9393
- name: Configure Management Credentials
94-
uses: aws-actions/configure-aws-credentials@v4
94+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
9595
with:
9696
aws-region: eu-west-2
9797
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -122,14 +122,14 @@ jobs:
122122
ref: ${{ github.ref }}
123123

124124
- name: Configure Management Credentials
125-
uses: aws-actions/configure-aws-credentials@v4
125+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
126126
with:
127127
aws-region: eu-west-2
128128
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
129129
role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id }}
130130

131131
- name: Configure Account Role
132-
uses: aws-actions/configure-aws-credentials@v4
132+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
133133
with:
134134
aws-region: eu-west-2
135135
role-chaining: true
@@ -180,7 +180,7 @@ jobs:
180180
fail-on-cache-miss: true
181181

182182
- name: Configure Management Credentials
183-
uses: aws-actions/configure-aws-credentials@v4
183+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
184184
with:
185185
aws-region: eu-west-2
186186
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
@@ -193,10 +193,12 @@ jobs:
193193
terraform -chdir=terraform/infrastructure workspace select ${{ inputs.stack_name }}
194194
195195
- name: Terraform Plan
196+
env:
197+
DEPLOY_ROLE_ARN: ${{ secrets.DEPLOY_ROLE_ARN }}
196198
run: |
197199
terraform -chdir=terraform/infrastructure plan \
198200
--var-file=etc/${{ vars.ACCOUNT_NAME }}.tfvars \
199-
--var assume_role_arn=${{ secrets.DEPLOY_ROLE_ARN }} \
201+
--var assume_role_arn=${DEPLOY_ROLE_ARN} \
200202
--var use_shared_resources=$(poetry run python scripts/are_resources_shared_for_stack.py ${{ inputs.stack_name }}) \
201203
--out tfplan
202204
@@ -239,7 +241,7 @@ jobs:
239241
fail-on-cache-miss: true
240242

241243
- name: Configure Management Credentials
242-
uses: aws-actions/configure-aws-credentials@v4
244+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a #v4.3.1
243245
with:
244246
aws-region: eu-west-2
245247
role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}

0 commit comments

Comments
 (0)