Skip to content

Commit b72b29d

Browse files
MohammadIqbalAD-NHSMohammadIqbalAD-NHS
authored
Merge branch 'main' into PRMT-575
2 parents a6ae625 + fd4cd6f commit b72b29d

26 files changed

+284
-222
lines changed

.github/workflows/terraform-daily-healthcheck-deploy-and-destroy.yml renamed to .github/workflows/automated-daily-health-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Daily Healthcheck Deploy, Test and Destroy'
1+
name: 'Z-AUTOMATED: Daily health check'
22

33
on:
44
schedule:
@@ -187,11 +187,11 @@ jobs:
187187
if: always()
188188
name: Destroy the Sandbox Environment from previous job
189189
needs: [ 'set_workspace', 'deploy_ui', 'deploy_all_lambdas' ]
190-
uses: ./.github/workflows/terraform-destroy-environment-manual.yml
190+
uses: ./.github/workflows/tear-down-sandbox.yml
191191
with:
192192
build_branch: main
193193
environment: development
194194
sandbox_workspace: ${{ needs.set_workspace.outputs.workspace }}
195195
terraform_vars: dev.tfvars
196196
backend: backend.conf
197-
secrets: inherit
197+
secrets: inherit

.github/workflows/terraform-dev-to-main-ci.yml renamed to .github/workflows/automated-deploy-dev.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# .github/workflows/terraform-dev
2-
name: 'Development CI Feature to Main'
2+
name: 'Z-AUTOMATED: Deploy - Dev'
33

44
on:
55
push:
@@ -9,7 +9,6 @@ on:
99
branches:
1010
- main
1111

12-
1312
permissions:
1413
pull-requests: write
1514
actions: read # This is required for Plan comment
@@ -229,6 +228,3 @@ jobs:
229228
uses: nhsconnect/national-document-repository/.github/workflows/ui-dev-to-main-ci.yml@main
230229
secrets:
231230
AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
232-
233-
234-

.github/workflows/sonarcloud-analysis.yml renamed to .github/workflows/automated-sonarqube-cloud-analysis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: SonarCloud-Analysis
1+
name: 'Z-AUTOMATED: SonarQube Cloud Analysis'
2+
23
on:
34
push:
45
branches:
@@ -21,4 +22,4 @@ jobs:
2122
uses: SonarSource/sonarqube-scan-action@v5
2223
env:
2324
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
24-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
25+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/terraform-destroy-sandbox-environments-cron.yml renamed to .github/workflows/automated-tear-down-sandbox.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Destroy Sandbox Environments (CRON)'
1+
name: 'Z-AUTOMATED: Tear down - Sandbox'
22

33
on:
44
schedule:
@@ -29,7 +29,7 @@ jobs:
2929
mask-aws-account-id: true
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@v5
32+
uses: actions/setup-python@v6
3333
with:
3434
python-version: 3.11
3535

.github/workflows/terraform-destroy-test-environments-cron.yml renamed to .github/workflows/automated-tear-down-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Destroy Test (Test Account) Environment CRON'
1+
name: 'Z-AUTOMATED: Tear down - Test'
22

33
on:
44
schedule:
@@ -12,7 +12,7 @@ permissions:
1212
jobs:
1313
remove_edge_associations:
1414
name: Remove Lambda@Edge Associations
15-
uses: ./.github/workflows/cleanup-cloudfront-edge-associations.yml
15+
uses: ./.github/workflows/base-cleanup-lambda-edge.yml
1616
with:
1717
sandbox_workspace: ndr-test
1818
lambda_function_name: 'ndr-test_EdgePresignLambda'
@@ -24,7 +24,7 @@ jobs:
2424

2525
cleanup_versions_process:
2626
name: Cleanup Versions Process
27-
uses: ./.github/workflows/cleanup-appconfig-and-lambda-layer-versions.yml
27+
uses: ./.github/workflows/base-cleanup-workspace.yml
2828
with:
2929
build_branch: main
3030
sandbox: ndr-test

.github/workflows/cleanup-cloudfront-edge-associations.yml renamed to .github/workflows/base-cleanup-lambda-edge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Remove Lambda@Edge Associations'
1+
name: 'Z-BASE: Cleanup - Lambda@Edge'
22

33
on:
44
workflow_call:
@@ -53,7 +53,7 @@ jobs:
5353
fetch-depth: '0'
5454

5555
- name: Set up Python ${{ inputs.python_version }}
56-
uses: actions/setup-python@v5
56+
uses: actions/setup-python@v6
5757
with:
5858
python-version: ${{ inputs.python_version }}
5959

.github/workflows/cleanup-appconfig-and-lambda-layer-versions.yml renamed to .github/workflows/base-cleanup-workspace.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'Cleanup Untracked App Config Profiles and Lambda Layer Versions'
1+
name: 'Z-BASE: Cleanup - Workspace'
22

33
on:
44
workflow_call:
@@ -23,7 +23,6 @@ on:
2323
AWS_ASSUME_ROLE:
2424
required: true
2525

26-
2726
permissions:
2827
pull-requests: write
2928
id-token: write # This is required for requesting the JWT
@@ -55,7 +54,7 @@ jobs:
5554
fetch-depth: '0'
5655

5756
- name: Set up Python ${{ inputs.python_version }}
58-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v6
5958
with:
6059
python-version: ${{ inputs.python_version }}
6160

@@ -75,4 +74,4 @@ jobs:
7574

7675
- name: Run Version Cleanup Script
7776
run: |
78-
./venv/bin/python3 scripts/cleanup_versions.py ${{ inputs.sandbox }}
77+
./venv/bin/python3 scripts/cleanup_versions.py ${{ inputs.sandbox }}

.github/workflows/terraform-deploy-to-pre-prod-manual.yml renamed to .github/workflows/deploy-pre-prod.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Deploy to Pre-Prod"
1+
name: "Deploy - Pre-prod"
22

33
on:
44
workflow_dispatch:
@@ -80,12 +80,6 @@ jobs:
8080
working-directory: ./infrastructure
8181
shell: bash
8282

83-
- name: Lambda Layer Imports
84-
id: lambda_layer_import
85-
run: ./import_lambda_layers.sh ${{ secrets.AWS_WORKSPACE }} ${{ vars.TF_VARS_FILE }}
86-
working-directory: ./scripts
87-
shell: bash
88-
8983
- name: Terraform Format
9084
run: terraform fmt -check
9185
working-directory: ./infrastructure

.github/workflows/terraform-deploy-to-prod-manual.yml renamed to .github/workflows/deploy-prod.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# .github/workflows/terraform-dev
2-
name: "Deploy tagged version to Prod"
2+
name: "Deploy - Prod"
33

44
on:
55
workflow_dispatch:
@@ -57,12 +57,6 @@ jobs:
5757
working-directory: ./infrastructure
5858
shell: bash
5959

60-
- name: Lambda Layer Imports
61-
id: lambda_layer_import
62-
run: ./import_lambda_layers.sh ${{ secrets.AWS_WORKSPACE }} ${{ vars.TF_VARS_FILE }}
63-
working-directory: ./scripts
64-
shell: bash
65-
6660
# Checks that all Terraform configuration files adhere to a canonical format
6761
- name: Terraform Format
6862
run: terraform fmt -check

.github/workflows/terraform-deploy-feature-to-sandbox.yml renamed to .github/workflows/deploy-sandbox.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# .github/workflows/terraform-dev
2-
name: "Deploy Feature Branch to Sandbox"
2+
name: "Deploy - Sandbox"
33

44
on:
55
workflow_dispatch:
@@ -98,12 +98,6 @@ jobs:
9898
working-directory: ./infrastructure
9999
shell: bash
100100

101-
- name: Lambda Layer Imports
102-
id: lambda_layer_import
103-
run: ./import_lambda_layers.sh ${{ github.event.inputs.sandboxWorkspace }} ${{ vars.TF_VARS_FILE }}
104-
working-directory: ./scripts
105-
shell: bash
106-
107101
- name: Terraform Plan
108102
id: plan
109103
run: |

0 commit comments

Comments
 (0)