Skip to content

Commit 95002c6

Browse files
tstephen-nhststephen-nhs
authored
Merge branch 'main' into aea-5803-cli
2 parents ea4d23c + 542a5cc commit 95002c6

File tree

31 files changed

+1503
-2265
lines changed

31 files changed

+1503
-2265
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
18+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
1919

2020
- name: Get asdf version
2121
id: asdf-version
@@ -27,7 +27,7 @@ jobs:
2727
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2828
2929
quality_checks:
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a7daff06de7b695f601d9b1723ca184daca7d898
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
3131
needs: [get_asdf_version]
3232
with:
3333
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -46,7 +46,7 @@ jobs:
4646
4747
tag_release:
4848
needs: [quality_checks, get_commit_id, get_asdf_version]
49-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/delete_old_cloudformation_stacks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout local code
20-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
20+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2121
with:
2222
ref: ${{ env.BRANCH_NAME }}
2323
fetch-depth: 0
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout local code
47-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
47+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
4848
with:
4949
ref: ${{ env.BRANCH_NAME }}
5050
fetch-depth: 0

‎.github/workflows/pull_request.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
dependabot-auto-approve-and-merge:
1212
needs: quality_checks
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@a7daff06de7b695f601d9b1723ca184daca7d898
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@3cba6a3733673bafc95526503478674332c26007
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -21,7 +21,7 @@ jobs:
2121
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2525

2626
- name: Get asdf version
2727
id: asdf-version
@@ -32,15 +32,15 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a7daff06de7b695f601d9b1723ca184daca7d898
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
3636
needs: [get_asdf_version]
3737
with:
3838
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3939
secrets:
4040
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4141

4242
pr_title_format_check:
43-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@a7daff06de7b695f601d9b1723ca184daca7d898
43+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@3cba6a3733673bafc95526503478674332c26007
4444

4545
get_issue_number:
4646
runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
7171

7272
tag_release:
7373
needs: [get_asdf_version]
74-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
74+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
7575
with:
7676
dry_run: true
7777
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
17+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
1818

1919
- name: Get asdf version
2020
id: asdf-version
@@ -25,7 +25,7 @@ jobs:
2525
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/settings.yml)
2626
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2727
quality_checks:
28-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a7daff06de7b695f601d9b1723ca184daca7d898
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
2929
needs: [get_asdf_version]
3030
with:
3131
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -44,7 +44,7 @@ jobs:
4444
4545
tag_release:
4646
needs: [quality_checks, get_commit_id, get_asdf_version]
47-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
4848
with:
4949
dry_run: false
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/run_package_code_and_api.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
packages: read
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
15+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
1616
with:
1717
ref: ${{ env.BRANCH_NAME }}
1818

@@ -23,7 +23,7 @@ jobs:
2323

2424
# using git commit sha for version of action to ensure we have stable version
2525
- name: Install asdf
26-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
26+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
2727
with:
2828
asdf_version: ${{ steps.asdf-version.outputs.version }}
2929

@@ -37,7 +37,7 @@ jobs:
3737
${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
3838
3939
- name: Install asdf dependencies in .tool-versions
40-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
40+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
4141
with:
4242
asdf_version: ${{ steps.asdf-version.outputs.version }}
4343
env:

‎.github/workflows/run_regression_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout local github actions
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2929
with:
3030
ref: ${{ env.BRANCH_NAME }}
3131
fetch-depth: 0
@@ -46,7 +46,7 @@ jobs:
4646

4747
# using git commit sha for version of action to ensure we have stable version
4848
- name: Install asdf
49-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
49+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
5050
with:
5151
asdf_version: ${{ steps.asdf-version.outputs.version }}
5252

@@ -60,7 +60,7 @@ jobs:
6060
${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
6161
6262
- name: Install asdf dependencies in .tool-versions
63-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
63+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
6464
with:
6565
asdf_version: ${{ steps.asdf-version.outputs.version }}
6666
env:

‎.github/workflows/run_release_code_and_api.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146

147147
steps:
148148
- name: Checkout local github actions
149-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
149+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
150150
with:
151151
ref: ${{ env.BRANCH_NAME }}
152152
fetch-depth: 0
@@ -318,7 +318,7 @@ jobs:
318318
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
319319

320320
- name: Checkout gh-pages
321-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
321+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
322322
with:
323323
ref: gh-pages
324324
path: gh-pages

‎SAMtemplates/functions/main.yaml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,9 @@ Resources:
431431
LOG_LEVEL: !Ref LogLevel
432432
NHS_NOTIFY_PRESCRIPTIONS_SQS_QUEUE_URL: !Ref NHSNotifyPrescriptionsSQSQueueUrl
433433
TABLE_NAME: !Ref PrescriptionNotificationStatesTableName
434-
API_KEY_SECRET:
435-
Fn::ImportValue: !Sub ${StackName}-PSU-Notify-API-Key
436-
PRIVATE_KEY_SECRET:
437-
Fn::ImportValue: !Sub ${StackName}-PSU-Notify-PrivateKey
438-
KID_SECRET:
439-
Fn::ImportValue: !Sub ${StackName}-PSU-Notify-KID
434+
API_KEY_SECRET: secrets-PSU-Notify-API-Key
435+
PRIVATE_KEY_SECRET: secrets-PSU-Notify-PrivateKey
436+
KID_SECRET: secrets-PSU-Notify-Application-KID
440437
NHS_NOTIFY_ROUTING_ID_PARAM: !Ref NotifyRoutingPlanIDParam
441438
NOTIFY_API_BASE_URL_PARAM: !Ref NotifyAPIBaseURLParam
442439
MAKE_REAL_NOTIFY_REQUESTS_PARAM: !Ref EnableNotificationsExternalParam
@@ -500,10 +497,8 @@ Resources:
500497
Variables:
501498
LOG_LEVEL: !Ref LogLevel
502499
TABLE_NAME: !Ref PrescriptionNotificationStatesTableName
503-
APP_ID_SECRET:
504-
Fn::ImportValue: !Sub ${StackName}-PSU-Notify-Application-ID
505-
API_KEY_SECRET:
506-
Fn::ImportValue: !Sub ${StackName}-PSU-Notify-API-Key
500+
APP_ID_SECRET: secrets-PSU-Notify-Application-ID
501+
API_KEY_SECRET: secrets-PSU-Notify-API-Key
507502
Metadata:
508503
BuildMethod: esbuild
509504
guard:

0 commit comments

Comments
 (0)