Skip to content

Commit f84ed81

Browse files
ankur-jain-nhsankur-jain-nhs
committed
VIA-598 AJ Fix indentation that is failing PR builds
1 parent 777c050 commit f84ed81

10 files changed

+104
-104
lines changed

‎.github/dependabot.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ updates:
1313
interval: "daily"
1414
groups:
1515
artifact:
16-
patterns: ["actions/*artifact"]
16+
patterns: [ "actions/*artifact" ]
1717

1818
- package-ecosystem: "npm"
1919
directory: "/"
2020
schedule:
2121
interval: "daily"
2222
groups:
2323
next:
24-
patterns: ["next", "next*", "*next", "*next*"]
24+
patterns: [ "next", "next*", "*next", "*next*" ]
2525
react:
26-
patterns: ["react", "react*", "*react", "*react*"]
26+
patterns: [ "react", "react*", "*react", "*react*" ]
2727
aws-sdk:
28-
patterns: ["@aws-sdk/*"]
28+
patterns: [ "@aws-sdk/*" ]
2929
jest:
30-
patterns: ["jest", "jest*", "*jest", "*jest*"]
30+
patterns: [ "jest", "jest*", "*jest", "*jest*" ]
3131
testing-library:
32-
patterns: ["@testing-library/*"]
32+
patterns: [ "@testing-library/*" ]
3333
eslint:
34-
patterns: ["eslint", "eslint*", "*eslint", "*eslint*"]
34+
patterns: [ "eslint", "eslint*", "*eslint", "*eslint*" ]
3535
prettier:
36-
patterns: ["prettier", "prettier*", "*prettier", "*prettier*"]
36+
patterns: [ "prettier", "prettier*", "*prettier", "*prettier*" ]
3737
ignore:
3838
- dependency-name: "next"
3939
versions: [ ">=16.0.0" ]

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- "**"
99
pull_request:
10-
types: [opened, reopened]
10+
types: [ opened, reopened ]
1111

1212
env:
1313
AWS_REGION: eu-west-2
@@ -71,7 +71,7 @@ jobs:
7171
make list-variables
7272
commit-stage: # Recommended maximum execution time is 2 minutes
7373
name: "Commit stage"
74-
needs: [metadata]
74+
needs: [ metadata ]
7575
uses: ./.github/workflows/stage-1-commit.yaml
7676
with:
7777
build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
@@ -84,7 +84,7 @@ jobs:
8484
secrets: inherit
8585
test-stage: # Recommended maximum execution time is 5 minutes
8686
name: "Test stage"
87-
needs: [metadata, commit-stage]
87+
needs: [ metadata, commit-stage ]
8888
uses: ./.github/workflows/stage-2-test.yaml
8989
with:
9090
build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
@@ -97,7 +97,7 @@ jobs:
9797
secrets: inherit
9898
build-stage: # Recommended maximum execution time is 3 minutes
9999
name: "Build stage"
100-
needs: [metadata, test-stage]
100+
needs: [ metadata, test-stage ]
101101
uses: ./.github/workflows/stage-3-build.yaml
102102
# if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
103103
with:
@@ -111,7 +111,7 @@ jobs:
111111
secrets: inherit
112112
deploy-stage:
113113
name: "Deploy stage"
114-
needs: [metadata, build-stage]
114+
needs: [ metadata, build-stage ]
115115
if: github.ref == 'refs/heads/main'
116116
runs-on: ubuntu-latest
117117
environment: dev
@@ -144,7 +144,7 @@ jobs:
144144

145145
acceptance-stage: # Recommended maximum execution time is 10 minutes
146146
name: "Acceptance stage"
147-
needs: [metadata, deploy-stage]
147+
needs: [ metadata, deploy-stage ]
148148
if: github.ref == 'refs/heads/main'
149149
uses: ./.github/workflows/stage-5-acceptance.yaml
150150
with:

‎.github/workflows/cicd-2-publish.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-latest
5454
environment:
5555
name: dev
56-
needs: [metadata]
56+
needs: [ metadata ]
5757
timeout-minutes: 3
5858
permissions:
5959
id-token: write

‎.github/workflows/cicd-3-deploy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
make list-variables
6767
deploy-stage:
6868
name: "Deploy ${{ needs.metadata.outputs.tag }} to ${{ github.event.inputs.environment }}"
69-
needs: [metadata]
69+
needs: [ metadata ]
7070
runs-on: ubuntu-latest
7171
environment:
7272
name: ${{ github.event.inputs.environment }}
@@ -98,7 +98,7 @@ jobs:
9898
acceptance-stage:
9999
name: "Acceptance stage"
100100
if: ${{ contains(fromJSON('["dev","preprod"]'), github.event.inputs.environment) }}
101-
needs: [metadata, deploy-stage]
101+
needs: [ metadata, deploy-stage ]
102102
uses: ./.github/workflows/stage-5-acceptance.yaml
103103
with:
104104
environment: ${{ github.event.inputs.environment}}

‎.github/workflows/cicd-4-promote.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
make list-variables
5454
promote-stage:
5555
name: "Promote stage"
56-
needs: [metadata]
56+
needs: [ metadata ]
5757
uses: ./.github/workflows/stage-6-promote.yaml
5858
with:
5959
environment: ${{ inputs.environment }}

‎.github/workflows/cicd-9-scheduled-assurance.yaml‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -33,84 +33,84 @@ jobs:
3333

3434
if: ${{ !cancelled() && (github.event_name=='schedule' || (github.event_name=='workflow_dispatch' && (inputs.release=='All' || inputs.release=='Latest R1 tag'))) }}
3535
steps:
36-
- name: "Checkout release/v1.0 branch"
37-
uses: actions/checkout@v5
38-
with:
39-
fetch-depth: 0
40-
ref: "release/v1.0"
41-
42-
- name: "Get latest tag name on release/v1.0 branch"
43-
id: get-latest-tag-name
44-
run: |
45-
echo "value=$(git describe --tags --abbrev=0 --first-parent)" | tee -a $GITHUB_OUTPUT
46-
47-
- name: "Checkout code"
48-
uses: actions/checkout@v5
49-
50-
- name: "Deploy ${{ steps.get-latest-tag-name.outputs.value }} to AWS (preprod)"
51-
timeout-minutes: 10
52-
uses: ./.github/actions/deploy
53-
with:
54-
environment: "preprod"
55-
tag_or_sha_to_deploy: ${{ steps.get-latest-tag-name.outputs.value }}
56-
secret_aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
57-
secret_aws_iam_role: ${{ secrets.IAM_ROLE }}
58-
secret_aws_slack_channel_id: ${{ secrets.ALARMS_SLACK_CHANNEL_ID }}
59-
60-
- name: "Run contract tests (sandpit+mocked)"
61-
timeout-minutes: 3
62-
uses: ./.github/actions/run-contract-tests
63-
with:
64-
target_ref: ${{ steps.get-latest-tag-name.outputs.value }}
65-
env:
66-
CONTENT_API_ENDPOINT: ${{ secrets.CONTENT_API_ENDPOINT }}
67-
CONTENT_API_KEY: ${{ secrets.CONTENT_API_KEY }}
68-
ELIGIBILITY_API_ENDPOINT: ${{ secrets.ELIGIBILITY_API_ENDPOINT }}
69-
ELIGIBILITY_API_KEY: ${{ secrets.ELIGIBILITY_API_KEY }}
70-
SSM_PREFIX: ${{ secrets.SSM_PREFIX }}
71-
IS_APIM_AUTH_ENABLED: ${{ vars.IS_APIM_AUTH_ENABLED }}
72-
CONTENT_CACHE_IS_CHANGE_APPROVAL_ENABLED: "false"
73-
NHS_APP_REDIRECT_LOGIN_URL: "dummy"
74-
CONTENT_CACHE_PATH: "dummy"
75-
NHS_LOGIN_URL: "dummy"
76-
NHS_LOGIN_CLIENT_ID: "dummy"
77-
NHS_LOGIN_SCOPE: "dummy"
78-
NHS_LOGIN_PRIVATE_KEY: "dummy"
79-
NBS_URL: "dummy"
80-
NBS_BOOKING_PATH: "dummy"
81-
MAX_SESSION_AGE_MINUTES: 0
82-
AUTH_SECRET: "dummy"
83-
84-
- name: "Run E2E tests on ${{ steps.get-latest-tag-name.outputs.value }} (preprod)"
85-
timeout-minutes: 10
86-
uses: ./.github/actions/run-e2e-tests
87-
with:
88-
checkout_ref: ${{ steps.get-latest-tag-name.outputs.value }}
89-
cross_browser: true
90-
env:
91-
TEST_NHS_APP_URL: ${{ secrets.TEST_NHS_APP_URL }}
92-
TEST_NHS_LOGIN_PASSWORD: ${{ secrets.TEST_NHS_LOGIN_PASSWORD }}
93-
TEST_NHS_LOGIN_OTP: ${{ secrets.TEST_NHS_LOGIN_OTP }}
94-
TEST_NBS_APP_USERNAME: ${{ secrets.TEST_NBS_APP_USERNAME }}
95-
TEST_NBS_APP_PASSWORD: ${{ secrets.TEST_NBS_APP_PASSWORD }}
96-
TEST_APP_URL: ${{ vars.TEST_APP_URL_R1 }}
97-
NHS_APP_REDIRECT_LOGIN_URL: ${{ secrets.NHS_APP_REDIRECT_LOGIN_URL }}
98-
VITA_TEST_USER_PATTERN: ${{ secrets.VITA_TEST_USER_PATTERN }}
99-
DEPLOY_ENVIRONMENT: "preprod"
100-
101-
- name: "Run snapshot tests on ${{ steps.get-latest-tag-name.outputs.value }} (preprod)"
102-
uses: ./.github/actions/run-snapshot-tests
103-
with:
104-
checkout_ref: ${{ steps.get-latest-tag-name.outputs.value }}
105-
release_name: "release1"
106-
env:
107-
SECRET_IAM_ROLE: ${{ secrets.IAM_ROLE }}
108-
TEST_NHS_APP_URL: ${{ secrets.TEST_NHS_APP_URL }}
109-
TEST_NHS_LOGIN_PASSWORD: ${{ secrets.TEST_NHS_LOGIN_PASSWORD }}
110-
TEST_NHS_LOGIN_OTP: ${{ secrets.TEST_NHS_LOGIN_OTP }}
111-
TEST_APP_URL: ${{ vars.TEST_APP_URL_R1 }}
112-
VITA_TEST_USER_PATTERN: ${{ secrets.VITA_TEST_USER_PATTERN }}
113-
AWS_S3_ARTEFACTS_BUCKET: vita-${{ secrets.AWS_ACCOUNT_ID }}-artefacts-preprod
36+
- name: "Checkout release/v1.0 branch"
37+
uses: actions/checkout@v5
38+
with:
39+
fetch-depth: 0
40+
ref: "release/v1.0"
41+
42+
- name: "Get latest tag name on release/v1.0 branch"
43+
id: get-latest-tag-name
44+
run: |
45+
echo "value=$(git describe --tags --abbrev=0 --first-parent)" | tee -a $GITHUB_OUTPUT
46+
47+
- name: "Checkout code"
48+
uses: actions/checkout@v5
49+
50+
- name: "Deploy ${{ steps.get-latest-tag-name.outputs.value }} to AWS (preprod)"
51+
timeout-minutes: 10
52+
uses: ./.github/actions/deploy
53+
with:
54+
environment: "preprod"
55+
tag_or_sha_to_deploy: ${{ steps.get-latest-tag-name.outputs.value }}
56+
secret_aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
57+
secret_aws_iam_role: ${{ secrets.IAM_ROLE }}
58+
secret_aws_slack_channel_id: ${{ secrets.ALARMS_SLACK_CHANNEL_ID }}
59+
60+
- name: "Run contract tests (sandpit+mocked)"
61+
timeout-minutes: 3
62+
uses: ./.github/actions/run-contract-tests
63+
with:
64+
target_ref: ${{ steps.get-latest-tag-name.outputs.value }}
65+
env:
66+
CONTENT_API_ENDPOINT: ${{ secrets.CONTENT_API_ENDPOINT }}
67+
CONTENT_API_KEY: ${{ secrets.CONTENT_API_KEY }}
68+
ELIGIBILITY_API_ENDPOINT: ${{ secrets.ELIGIBILITY_API_ENDPOINT }}
69+
ELIGIBILITY_API_KEY: ${{ secrets.ELIGIBILITY_API_KEY }}
70+
SSM_PREFIX: ${{ secrets.SSM_PREFIX }}
71+
IS_APIM_AUTH_ENABLED: ${{ vars.IS_APIM_AUTH_ENABLED }}
72+
CONTENT_CACHE_IS_CHANGE_APPROVAL_ENABLED: "false"
73+
NHS_APP_REDIRECT_LOGIN_URL: "dummy"
74+
CONTENT_CACHE_PATH: "dummy"
75+
NHS_LOGIN_URL: "dummy"
76+
NHS_LOGIN_CLIENT_ID: "dummy"
77+
NHS_LOGIN_SCOPE: "dummy"
78+
NHS_LOGIN_PRIVATE_KEY: "dummy"
79+
NBS_URL: "dummy"
80+
NBS_BOOKING_PATH: "dummy"
81+
MAX_SESSION_AGE_MINUTES: 0
82+
AUTH_SECRET: "dummy"
83+
84+
- name: "Run E2E tests on ${{ steps.get-latest-tag-name.outputs.value }} (preprod)"
85+
timeout-minutes: 10
86+
uses: ./.github/actions/run-e2e-tests
87+
with:
88+
checkout_ref: ${{ steps.get-latest-tag-name.outputs.value }}
89+
cross_browser: true
90+
env:
91+
TEST_NHS_APP_URL: ${{ secrets.TEST_NHS_APP_URL }}
92+
TEST_NHS_LOGIN_PASSWORD: ${{ secrets.TEST_NHS_LOGIN_PASSWORD }}
93+
TEST_NHS_LOGIN_OTP: ${{ secrets.TEST_NHS_LOGIN_OTP }}
94+
TEST_NBS_APP_USERNAME: ${{ secrets.TEST_NBS_APP_USERNAME }}
95+
TEST_NBS_APP_PASSWORD: ${{ secrets.TEST_NBS_APP_PASSWORD }}
96+
TEST_APP_URL: ${{ vars.TEST_APP_URL_R1 }}
97+
NHS_APP_REDIRECT_LOGIN_URL: ${{ secrets.NHS_APP_REDIRECT_LOGIN_URL }}
98+
VITA_TEST_USER_PATTERN: ${{ secrets.VITA_TEST_USER_PATTERN }}
99+
DEPLOY_ENVIRONMENT: "preprod"
100+
101+
- name: "Run snapshot tests on ${{ steps.get-latest-tag-name.outputs.value }} (preprod)"
102+
uses: ./.github/actions/run-snapshot-tests
103+
with:
104+
checkout_ref: ${{ steps.get-latest-tag-name.outputs.value }}
105+
release_name: "release1"
106+
env:
107+
SECRET_IAM_ROLE: ${{ secrets.IAM_ROLE }}
108+
TEST_NHS_APP_URL: ${{ secrets.TEST_NHS_APP_URL }}
109+
TEST_NHS_LOGIN_PASSWORD: ${{ secrets.TEST_NHS_LOGIN_PASSWORD }}
110+
TEST_NHS_LOGIN_OTP: ${{ secrets.TEST_NHS_LOGIN_OTP }}
111+
TEST_APP_URL: ${{ vars.TEST_APP_URL_R1 }}
112+
VITA_TEST_USER_PATTERN: ${{ secrets.VITA_TEST_USER_PATTERN }}
113+
AWS_S3_ARTEFACTS_BUCKET: vita-${{ secrets.AWS_ACCOUNT_ID }}-artefacts-preprod
114114

115115
#################################################################
116116
# Main branch deployment and assurance (e2e+snapshots+contract)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
if: always()
6464
perform-static-analysis:
6565
name: "Static analysis"
66-
needs: [test-unit]
66+
needs: [ test-unit ]
6767
runs-on: ubuntu-latest
6868
permissions:
6969
id-token: write

‎.github/workflows/stage-4-deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: "Tag or SHA"
3232
id: tag-or-sha
3333
run: |
34-
echo "value=${{ inputs.tag_or_sha_to_deploy }}" >> $GITHUB_OUTPUT
34+
echo "value=${{ inputs.tag_or_sha_to_deploy }}" >> $GITHUB_OUTPUT
3535
- name: "Checkout code"
3636
uses: actions/checkout@v5
3737
with:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ jobs:
5252
- name: "Configure AWS credentials for env"
5353
uses: aws-actions/configure-aws-credentials@v5
5454
with:
55-
role-session-name: GitHubActionsSession
56-
role-to-assume: ${{ secrets.IAM_ROLE }}
57-
aws-region: eu-west-2
55+
role-session-name: GitHubActionsSession
56+
role-to-assume: ${{ secrets.IAM_ROLE }}
57+
aws-region: eu-west-2
5858

5959
- name: "Check expected version is running in ${{inputs.environment}}"
6060
timeout-minutes: 20

‎.github/workflows/stage-6-promote.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
download:
3333
name: "Download package from ${{ needs.prepare.outputs.PROMOTE_SOURCE_ENVIRONMENT }} env"
3434
runs-on: ubuntu-latest
35-
needs: [prepare]
35+
needs: [ prepare ]
3636
environment:
3737
name: ${{ needs.prepare.outputs.PROMOTE_SOURCE_ENVIRONMENT }}
3838
timeout-minutes: 5
@@ -75,7 +75,7 @@ jobs:
7575
promote:
7676
name: "Promote to ${{ inputs.environment}} environment"
7777
runs-on: ubuntu-latest
78-
needs: [download]
78+
needs: [ download ]
7979
environment:
8080
name: ${{ inputs.environment }}
8181
timeout-minutes: 20
@@ -115,7 +115,7 @@ jobs:
115115
cleanup:
116116
name: "Cleanup release package from artifact"
117117
runs-on: ubuntu-latest
118-
needs: [promote]
118+
needs: [ promote ]
119119
steps:
120120
- name: "Delete workflow artifact"
121121
uses: geekyeggo/delete-artifact@v5

0 commit comments

Comments
 (0)