Skip to content

Commit b9f9fad

Browse files
committed
Just formatting
1 parent abb7d22 commit b9f9fad

File tree

8 files changed

+87
-93
lines changed

8 files changed

+87
-93
lines changed

.github/workflows/automated-sbom-repo-scan.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: 'Z-AUTOMATED: SBOM Repo Scan'
1+
name: "Z-AUTOMATED: SBOM Repo Scan"
22

33
on:
44
pull_request:
55
types: [opened, synchronize, reopened]
66

77
permissions:
8-
actions: read # Required for anchore/sbom-action
8+
actions: read # Required for anchore/sbom-action
99
contents: write # Required for anchore/sbom-action
1010
id-token: write # Required for requesting the JWT
1111
pull-requests: write
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v5
1919
with:
20-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
20+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2121

2222
- uses: anchore/sbom-action@v0
2323
with:
@@ -51,14 +51,14 @@ jobs:
5151
repo: context.repo.repo,
5252
issue_number: context.issue.number,
5353
})
54-
54+
5555
const botComment = comments.find(comment => {
5656
return comment.user.type === 'Bot' && comment.body.includes('Code security issues found')
5757
})
5858
5959
// 2. Prepare format of the comment
6060
const output = `### Code security issues found
61-
61+
6262
View full details [here](https://github.com/${{ github.repository }}/security/code-scanning?query=is%3Aopen+pr%3A${{ github.event.pull_request.number }}).`;
6363
6464
// 3. If we have a comment, update it, otherwise create a new one
@@ -70,7 +70,7 @@ jobs:
7070
body: output
7171
})
7272
}
73-
73+
7474
github.rest.issues.createComment({
7575
issue_number: context.issue.number,
7676
owner: context.repo.owner,
@@ -89,7 +89,7 @@ jobs:
8989
repo: context.repo.repo,
9090
issue_number: context.issue.number,
9191
})
92-
92+
9393
const botComment = comments.find(comment => {
9494
return comment.user.type === 'Bot' && comment.body.includes('Code security issues found')
9595
})

.github/workflows/base-java-service-jobs.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
default: false
2020
java_version:
2121
type: string
22-
default: '21'
22+
default: "21"
2323
required: false
2424

2525
permissions:
@@ -32,17 +32,17 @@ jobs:
3232
name: Run Tests
3333
runs-on: ubuntu-latest
3434
defaults:
35-
run:
36-
working-directory: './services/${{ inputs.service }}'
35+
run:
36+
working-directory: "./services/${{ inputs.service }}"
3737
steps:
3838
- name: Checkout
3939
uses: actions/checkout@v5
40-
40+
4141
- name: Set up JDK ${{ inputs.java_version }}
4242
uses: actions/setup-java@v3
4343
with:
44-
distribution: 'temurin'
45-
java-version: '${{ inputs.java_version }}'
44+
distribution: "temurin"
45+
java-version: "${{ inputs.java_version }}"
4646
cache: gradle
4747

4848
- name: Run Localstack on Docker
@@ -62,16 +62,16 @@ jobs:
6262
environment: ${{ inputs.environment }}
6363
defaults:
6464
run:
65-
working-directory: './services/${{ inputs.service }}'
65+
working-directory: "./services/${{ inputs.service }}"
6666
steps:
6767
- name: Checkout
6868
uses: actions/checkout@v5
6969

7070
- name: Set up JDK ${{ inputs.java_version }}
7171
uses: actions/setup-java@v3
7272
with:
73-
distribution: 'temurin'
74-
java-version: '${{ inputs.java_version }}'
73+
distribution: "temurin"
74+
java-version: "${{ inputs.java_version }}"
7575
cache: gradle
7676

7777
- name: Configure AWS Credentials (Read/Write)
@@ -124,7 +124,7 @@ jobs:
124124
if [ -n "${REF_NAME:-}" ]; then
125125
REF_TAG="${REF_NAME//\//-}"
126126
docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
127-
fi
127+
fi
128128
129129
deploy_infra:
130130
name: Deploy Infrastructure
@@ -134,4 +134,4 @@ jobs:
134134
stack: ${{ inputs.service }}
135135
environment: ${{ inputs.environment }}
136136
is_deployment: ${{ inputs.is_deployment }}
137-
secrets: inherit
137+
secrets: inherit

.github/workflows/base-node-service-jobs.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Start LocalStack
5555
uses: LocalStack/setup-localstack@v0.2.4
5656
with:
57-
install-awslocal: 'true'
57+
install-awslocal: "true"
5858

5959
# https://docs.aws.amazon.com/cli/latest/reference/dynamodb/create-table.html
6060
- name: Create AWS resources
@@ -99,7 +99,7 @@ jobs:
9999
environment: ${{ inputs.environment }}
100100
defaults:
101101
run:
102-
working-directory: './services/${{ inputs.service }}'
102+
working-directory: "./services/${{ inputs.service }}"
103103
steps:
104104
- name: Checkout
105105
uses: actions/checkout@v5
@@ -123,8 +123,8 @@ jobs:
123123
uses: aws-actions/amazon-ecr-login@v2
124124

125125
- name: NPM Build
126-
run: npm run build
127-
126+
run: npm run build
127+
128128
- name: Docker Build and Tag
129129
env:
130130
REF_NAME: ${{ github.ref_name }}
@@ -160,8 +160,7 @@ jobs:
160160
if [ -n "${REF_NAME:-}" ]; then
161161
REF_TAG="${REF_NAME//\//-}"
162162
docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
163-
fi
164-
163+
fi
165164
166165
deploy_infra:
167166
name: Deploy Infrastructure

.github/workflows/base-python-service-jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
defaults:
3131
run:
32-
working-directory: './services/${{ inputs.service }}'
32+
working-directory: "./services/${{ inputs.service }}"
3333
steps:
3434
- name: Checkout
3535
uses: actions/checkout@v5
@@ -45,7 +45,7 @@ jobs:
4545
build-and-publish-service:
4646
environment: ${{ inputs.environment }}
4747
runs-on: ubuntu-latest
48-
needs: [ run_tests ]
48+
needs: [run_tests]
4949
defaults:
5050
run:
5151
working-directory: ./services/${{ inputs.service }}
@@ -109,7 +109,7 @@ jobs:
109109
deploy_infra:
110110
if: ${{ inputs.deploy_infra && inputs.is_deployment }}
111111
name: Deploy Infrastructure
112-
needs: [ build-and-publish-service ]
112+
needs: [build-and-publish-service]
113113
uses: nhsconnect/orphaned-record-continuity-infrastructure/.github/workflows/base-deploy-stack.yml@r0.1.1
114114
with:
115115
stack: ${{ inputs.service }}

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414
with:
15-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
15+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1616

1717
- name: Use Node.js 22.x
1818
uses: actions/setup-node@v3
@@ -27,6 +27,5 @@ jobs:
2727
- name: SonarCloud Scan
2828
uses: SonarSource/sonarqube-scan-action@v4
2929
env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
3131
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
32-

.github/workflows/e2e.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: End to End Test
22

33
permissions:
4-
contents: read # Required for actions/checkout
4+
contents: read # Required for actions/checkout
55
id-token: write # Required for requesting the JWT
66
pull-requests: write # Required to write comments
77

@@ -10,7 +10,6 @@ on:
1010

1111
workflow_dispatch:
1212

13-
1413
jobs:
1514
e2e:
1615
environment: dev
@@ -21,13 +20,13 @@ jobs:
2120
- name: Checkout End to End
2221
uses: actions/checkout@v5
2322
with:
24-
repository: 'nhsconnect/prm-repo-e2e-tests'
23+
repository: "nhsconnect/prm-repo-e2e-tests"
2524

2625
- name: Setup Java
2726
uses: actions/setup-java@v4
2827
with:
29-
distribution: 'adopt'
30-
java-version: '21'
28+
distribution: "adopt"
29+
java-version: "21"
3130

3231
- name: Build
3332
run: |
@@ -40,4 +39,4 @@ jobs:
4039
AWS_REGION: ${{ vars.AWS_REGION }}
4140
AWS_DEFAULT_REGION: ${{ vars.AWS_REGION }}
4241
run: |
43-
./gradlew test --tests "uk.nhs.prm.e2etests.test.repositorye2etest.RepositoryE2ETest"
42+
./gradlew test --tests "uk.nhs.prm.e2etests.test.repositorye2etest.RepositoryE2ETest"

.github/workflows/full-deployment.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
environment:
77
description: "Which environment would you like to deploy to?"
88
type: choice
9-
options:
9+
options:
1010
- dev
1111
- pre-prod
1212
- prod
@@ -26,25 +26,24 @@ jobs:
2626
ehr-repo:
2727
name: EHR Repo CI
2828
secrets: inherit
29-
uses: './.github/workflows/base-node-service-jobs.yml'
29+
uses: "./.github/workflows/base-node-service-jobs.yml"
3030
with:
3131
service: ehr-repo
3232
environment: ${{ inputs.environment }}
3333
is_deployment: ${{ inputs.is_deployment }}
3434

35-
3635
ehr-out-service:
3736
name: EHR Out Service CI
3837
secrets: inherit
39-
uses: './.github/workflows/base-node-service-jobs.yml'
38+
uses: "./.github/workflows/base-node-service-jobs.yml"
4039
with:
4140
service: ehr-out-service
4241
environment: ${{ inputs.environment }}
4342
is_deployment: ${{ inputs.is_deployment }}
4443

4544
mesh-inbox-s3-forwarder:
4645
name: MESH Inbox S3 Forwarder Ci
47-
uses: './.github/workflows/base-python-service-jobs.yml'
46+
uses: "./.github/workflows/base-python-service-jobs.yml"
4847
with:
4948
service: mesh-inbox-s3-forwarder
5049
environment: ${{ inputs.environment }}
@@ -54,8 +53,8 @@ jobs:
5453

5554
mesh-forwarder:
5655
name: MESH Forwarder CI
57-
needs: [ mesh-inbox-s3-forwarder ]
58-
uses: './.github/workflows/base-python-service-jobs.yml'
56+
needs: [mesh-inbox-s3-forwarder]
57+
uses: "./.github/workflows/base-python-service-jobs.yml"
5958
with:
6059
service: mesh-forwarder
6160
environment: ${{ inputs.environment }}
@@ -64,7 +63,7 @@ jobs:
6463

6564
gp2gp-messenger:
6665
name: GP2GP Messenger CI
67-
uses: './.github/workflows/base-node-service-jobs.yml'
66+
uses: "./.github/workflows/base-node-service-jobs.yml"
6867
with:
6968
service: gp2gp-messenger
7069
environment: ${{ inputs.environment }}
@@ -73,7 +72,7 @@ jobs:
7372

7473
nems-event-processor:
7574
name: NEMs Event Processor CI
76-
uses: './.github/workflows/base-java-service-jobs.yml'
75+
uses: "./.github/workflows/base-java-service-jobs.yml"
7776
with:
7877
service: nems-event-processor
7978
environment: ${{ inputs.environment }}
@@ -83,7 +82,7 @@ jobs:
8382

8483
ehr-transfer-service:
8584
name: EHR Transfer Service CI
86-
uses: './.github/workflows/base-java-service-jobs.yml'
85+
uses: "./.github/workflows/base-java-service-jobs.yml"
8786
with:
8887
service: ehr-transfer-service
8988
environment: ${{ inputs.environment }}
@@ -93,17 +92,17 @@ jobs:
9392

9493
pds-adaptor:
9594
name: PDS Adaptor CI
96-
uses: './.github/workflows/base-java-service-jobs.yml'
95+
uses: "./.github/workflows/base-java-service-jobs.yml"
9796
with:
9897
service: pds-adaptor
9998
environment: ${{ inputs.environment }}
10099
is_deployment: ${{ inputs.is_deployment }}
101-
java_version: '11'
100+
java_version: "11"
102101
secrets: inherit
103102

104103
re-registration-service:
105104
name: Re-registration Service CI
106-
uses: './.github/workflows/base-java-service-jobs.yml'
105+
uses: "./.github/workflows/base-java-service-jobs.yml"
107106
with:
108107
service: ehr-transfer-service
109108
environment: ${{ inputs.environment }}
@@ -113,7 +112,7 @@ jobs:
113112

114113
suspension-service:
115114
name: Suspension Service CI
116-
uses: './.github/workflows/base-java-service-jobs.yml'
115+
uses: "./.github/workflows/base-java-service-jobs.yml"
117116
with:
118117
service: suspension-service
119118
environment: ${{ inputs.environment }}

0 commit comments

Comments
 (0)