Skip to content

Commit 81e651f

Browse files
tstephen-nhststephen-nhs
authored
Merge branch 'main' into aea-6254-cdk-api-gateway
2 parents 493164c + cc10f07 commit 81e651f

21 files changed

Lines changed: 2551 additions & 2030 deletions

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Ubuntu",
2+
"name": "eps-cdk-utils",
33
"build": {
44
"dockerfile": "Dockerfile",
55
"context": "..",
@@ -32,7 +32,9 @@
3232
"github.vscode-pull-request-github",
3333
"streetsidesoftware.code-spell-checker",
3434
"timonwong.shellcheck",
35-
"github.vscode-github-actions"
35+
"github.vscode-github-actions",
36+
"dbaeumer.vscode-eslint",
37+
"vitest.explorer"
3638
],
3739
"settings": {
3840
"cSpell.words": [

‎.github/dependabot.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ updates:
1010
directory: "/"
1111
schedule:
1212
interval: "weekly"
13-
day: "friday"
13+
day: "thursday"
1414
time: "18:00" #UTC
1515
commit-message:
1616
prefix: "Upgrade: [dependabot] - "
1717

1818
###################################
19-
# NPM workspace ##################
19+
# Poetry #########################
2020
###################################
21-
- package-ecosystem: "npm"
21+
- package-ecosystem: "pip"
2222
directory: "/"
2323
schedule:
2424
interval: "weekly"
25-
day: "friday"
26-
time: "18:00" #UTC
25+
day: "thursday"
26+
time: "20:00" #UTC
2727
versioning-strategy: increase
28-
open-pull-requests-limit: 20
2928
commit-message:
3029
prefix: "Upgrade: [dependabot] - "
3130

3231
###################################
33-
# Poetry #########################
32+
# NPM workspace ##################
3433
###################################
35-
- package-ecosystem: "pip"
34+
- package-ecosystem: "npm"
3635
directory: "/"
3736
schedule:
3837
interval: "weekly"
39-
day: "friday"
40-
time: "18:00" #UTC
38+
day: "thursday"
39+
time: "22:00" #UTC
4140
versioning-strategy: increase
41+
open-pull-requests-limit: 20
4242
commit-message:
4343
prefix: "Upgrade: [dependabot] - "

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
2828
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
2929
get_config_values:
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
3131
with:
3232
verify_published_from_main_image: true
3333
quality_checks:
34-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
34+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
3535
needs: [get_config_values, get_commit_id]
3636
with:
3737
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -42,7 +42,7 @@ jobs:
4242

4343
tag_release:
4444
needs: [quality_checks, get_commit_id, get_config_values]
45-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
4646
with:
4747
dry_run: true
4848
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.github/workflows/docker_image_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
docker build -t "cdk-utils-build:${VERSION_NUMBER}" -f docker/Dockerfile --build-arg VERSION="${VERSION_NUMBER}" .
4444
docker save "cdk-utils-build:${VERSION_NUMBER}" -o cdk-utils-build.img
4545
46-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
46+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
4747
name: Upload docker images
4848
with:
4949
name: docker_artifact

‎.github/workflows/docker_image_upload.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
role-session-name: upload-cdk-utils-build
6060

6161
- name: docker_artifact download
62-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
62+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
6363
with:
6464
name: docker_artifact
6565
path: .

‎.github/workflows/package_npm_code.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
make package
3535
36-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
36+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
3737
name: Upload packaged code
3838
with:
3939
name: nhsdigital-eps-cdk-constructs-1.0.0.tgz

‎.github/workflows/pull_request.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ env:
99

1010
jobs:
1111
get_config_values:
12-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
12+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
1313
with:
1414
verify_published_from_main_image: false
1515
dependabot-auto-approve-and-merge:
1616
needs: quality_checks
17-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
17+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
1818
secrets:
1919
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
2020
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
2121
pr_title_format_check:
22-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
22+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
2323
quality_checks:
24-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
24+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
2525
needs: [get_config_values, get_commit_id]
2626
with:
2727
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -104,7 +104,7 @@ jobs:
104104

105105
tag_release:
106106
needs: [get_commit_id, get_config_values]
107-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
107+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
108108
with:
109109
dry_run: true
110110
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010

1111
jobs:
1212
get_config_values:
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
1414
with:
1515
verify_published_from_main_image: true
1616
get_commit_id:
@@ -32,7 +32,7 @@ jobs:
3232
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
3333
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
3636
needs: [get_config_values, get_commit_id]
3737
with:
3838
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -43,7 +43,7 @@ jobs:
4343

4444
tag_release:
4545
needs: [quality_checks, get_commit_id, get_config_values]
46-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
46+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
4747
with:
4848
dry_run: false
4949
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ _site/
2525
.sass-cache
2626
.jekyll-cache
2727
.jekyll-metadata
28-
vendor
28+
vendor
29+
.trivy_out/

‎.trivy_out/license_scan.txt‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)