Skip to content

Commit c8bab76

Browse files
jimaspjimasp
committed
MESH-2092 merge from develop
2 parents 8245d1d + 316b909 commit c8bab76

16 files changed

+419
-133
lines changed

‎.gitallowed‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

22
token: \$\{\{ secrets.GITHUB_TOKEN \}\}
3-
"token": response.get\("SessionToken"\)
3+
"token": response\["SessionToken"\]
44
token=credentials\["token"\]
5-
5+
:123456789012:
6+
\"123456789012\"
7+
pytokens
68
.*(GITHUB|SONAR)_TOKEN: \$\{\{ secrets.(GITHUB|SONAR)_TOKEN \}\}
79
.*asttokens = ">=2.1.0"

‎.github/dependabot.yml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
2+
73
updates:
84
- package-ecosystem: "pip"
9-
directory: "/" # Location of package manifests
5+
directory: "/"
6+
schedule:
7+
interval: "monthly"
8+
groups:
9+
dependencies:
10+
patterns:
11+
- "*"
12+
13+
- package-ecosystem: "github-actions"
14+
directory: "/"
1015
schedule:
11-
interval: "monthly"
16+
interval: "monthly"
17+
groups:
18+
dependencies:
19+
patterns:
20+
- "*"

‎.github/workflows/merge-develop.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ jobs:
1111
if: github.repository == 'NHSDigital/nhs-aws-helpers' && !contains(github.event.head_commit.message, 'tag release version:')
1212
steps:
1313
- name: checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
1717

1818
- name: setup python
19-
uses: actions/setup-python@v4
19+
uses: actions/setup-python@v5
2020
with:
2121
python-version-file: "pyproject.toml"
2222

2323
- name: setup poetry
24-
uses: abatilo/actions-poetry@v2
24+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
2525
with:
26-
poetry-version: 1.5.1
26+
poetry-version: 2.1.4
2727

2828
- name: add poetry plugins
2929
run: |
3030
poetry self add "poetry-dynamic-versioning[plugin]"
3131
3232
- name: cache virtualenv
33-
uses: actions/cache@v3
33+
uses: actions/cache@v4
3434
with:
3535
path: |
3636
.venv
@@ -50,15 +50,15 @@ jobs:
5050

5151
- name: code coverage report
5252
if: ${{ github.event_name == 'pull_request' }}
53-
uses: orgoro/coverage@c65003f41276ea33fe3a3a5d53df8b340462e8fa
53+
uses: orgoro/coverage@7dbd48c7f7ed09df337ff40058340c85bc93cb3d
5454
with:
5555
coverageFile: reports/coverage.xml
5656
token: ${{ secrets.GITHUB_TOKEN }}
5757
thresholdAll: 0.65
5858

5959
- name: setup java
6060
if: github.actor != 'dependabot[bot]' && (success() || failure())
61-
uses: actions/setup-java@v3
61+
uses: actions/setup-java@v5
6262
with:
6363
distribution: "corretto"
6464
java-version: "17"
@@ -83,7 +83,7 @@ jobs:
8383

8484
- name: publish junit reports
8585
if: success() || failure()
86-
uses: mikepenz/action-junit-report@v2
86+
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3
8787
with:
8888
check_name: junit reports
8989
report_paths: reports/junit/*.xml
@@ -98,7 +98,7 @@ jobs:
9898
if: github.repository == 'NHSDigital/nhs-aws-helpers' && github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
9999
steps:
100100
- name: checkout
101-
uses: actions/checkout@v3
101+
uses: actions/checkout@v5
102102
with:
103103
fetch-depth: 0
104104

@@ -108,14 +108,14 @@ jobs:
108108
find . -type f | xargs chmod g+w
109109
110110
- name: setup python
111-
uses: actions/setup-python@v4
111+
uses: actions/setup-python@v5
112112
with:
113113
python-version-file: "pyproject.toml"
114114

115115
- name: setup poetry
116-
uses: abatilo/actions-poetry@v2
116+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
117117
with:
118-
poetry-version: 1.5.1
118+
poetry-version: 2.1.4
119119

120120
- name: add poetry plugins
121121
run: |

‎.github/workflows/pull-request.yml‎

Lines changed: 53 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ permissions:
88
pull-requests: write
99

1010
jobs:
11-
1211
tox:
1312
strategy:
1413
matrix:
15-
python-version: ["3.9", "3.10", "3.11"]
14+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1615

1716
runs-on: ubuntu-latest
1817
if: github.repository == 'NHSDigital/nhs-aws-helpers'
1918
steps:
2019
- name: checkout
21-
uses: actions/checkout@v3
20+
uses: actions/checkout@v5
2221
with:
2322
fetch-depth: 0
2423

@@ -37,14 +36,17 @@ jobs:
3736
- name: merge into base_branch
3837
if: ${{ github.event_name == 'pull_request' }}
3938
run: |
40-
echo base branch "${{ github.base_ref }}"
41-
echo pr branch "${{ github.head_ref }}"
42-
git checkout "${{ github.base_ref }}"
39+
echo base branch "$BASE_BRANCH"
40+
echo pr branch "$PR_BRANCH"
41+
git checkout "$BASE_BRANCH"
4342
git checkout -b "merging-${{ github.event.number }}"
4443
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
44+
env:
45+
BASE_BRANCH: ${{ github.base_ref }}
46+
PR_BRANCH: ${{ github.head_ref }}
4547

4648
- name: setup python
47-
uses: actions/setup-python@v4
49+
uses: actions/setup-python@v5
4850
with:
4951
python-version: ${{ matrix.python-version }}
5052

@@ -61,13 +63,12 @@ jobs:
6163
if: success() || failure()
6264
run: make down
6365

64-
6566
coverage:
6667
runs-on: ubuntu-latest
6768
if: github.repository == 'NHSDigital/nhs-aws-helpers'
6869
steps:
6970
- name: checkout
70-
uses: actions/checkout@v3
71+
uses: actions/checkout@v5
7172
with:
7273
fetch-depth: 0
7374

@@ -89,28 +90,31 @@ jobs:
8990
- name: merge into base_branch
9091
if: ${{ github.event_name == 'pull_request' }}
9192
run: |
92-
echo base branch "${{ github.base_ref }}"
93-
echo pr branch "${{ github.head_ref }}"
94-
git checkout "${{ github.base_ref }}"
93+
echo base branch "$BASE_BRANCH"
94+
echo pr branch "$PR_BRANCH"
95+
git checkout "$BASE_BRANCH"
9596
git checkout -b "merging-${{ github.event.number }}"
9697
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
98+
env:
99+
BASE_BRANCH: ${{ github.base_ref }}
100+
PR_BRANCH: ${{ github.head_ref }}
97101

98102
- name: setup python
99-
uses: actions/setup-python@v4
103+
uses: actions/setup-python@v5
100104
with:
101105
python-version-file: "pyproject.toml"
102106

103107
- name: setup poetry
104-
uses: abatilo/actions-poetry@v2
108+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
105109
with:
106-
poetry-version: 1.5.1
110+
poetry-version: 2.1.4
107111

108112
- name: add poetry plugins
109113
run: |
110114
poetry self add "poetry-dynamic-versioning[plugin]"
111115
112116
- name: cache virtualenv
113-
uses: actions/cache@v3
117+
uses: actions/cache@v4
114118
with:
115119
path: |
116120
.venv
@@ -133,15 +137,15 @@ jobs:
133137

134138
- name: code coverage report
135139
if: ${{ github.event_name == 'pull_request' }}
136-
uses: orgoro/coverage@c65003f41276ea33fe3a3a5d53df8b340462e8fa
140+
uses: orgoro/coverage@7dbd48c7f7ed09df337ff40058340c85bc93cb3d
137141
with:
138142
coverageFile: reports/coverage.xml
139143
token: ${{ secrets.GITHUB_TOKEN }}
140144
thresholdAll: 0.65
141145

142146
- name: setup java
143147
if: success() || failure()
144-
uses: actions/setup-java@v3
148+
uses: actions/setup-java@v5
145149
with:
146150
distribution: "corretto"
147151
java-version: "17"
@@ -158,16 +162,16 @@ jobs:
158162
- name: run sonar scan
159163
if: success() || failure()
160164
run: |
161-
PATH="$PWD/sonar-scanner/bin:$PATH"
162-
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
163-
git checkout "${GITHUB_HEAD_REF}"
164-
sonar-scanner -Dsonar.pullrequest.branch="{{ github.event.pull_request.head.sha }}" -Dsonar.pullrequest.base="{{ github.event.pull_request.base.sha }}" -Dsonar.pullrequest.key="${{ github.event.number }}"
165-
else
166-
sonar-scanner
167-
fi
165+
PATH="$PWD/sonar-scanner/bin:$PATH"
166+
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
167+
git checkout "${GITHUB_HEAD_REF}"
168+
sonar-scanner -Dsonar.pullrequest.branch="{{ github.event.pull_request.head.sha }}" -Dsonar.pullrequest.base="{{ github.event.pull_request.base.sha }}" -Dsonar.pullrequest.key="${{ github.event.number }}"
169+
else
170+
sonar-scanner
171+
fi
168172
env:
169-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
173+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
171175

172176
- name: archive reports
173177
if: success() || failure()
@@ -178,7 +182,7 @@ jobs:
178182

179183
- name: publish junit reports
180184
if: success() || failure()
181-
uses: mikepenz/action-junit-report@v3
185+
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3
182186
with:
183187
check_name: junit reports
184188
report_paths: reports/junit/*.xml
@@ -192,7 +196,7 @@ jobs:
192196
if: github.repository == 'NHSDigital/nhs-aws-helpers'
193197
steps:
194198
- name: checkout
195-
uses: actions/checkout@v3
199+
uses: actions/checkout@v5
196200
with:
197201
fetch-depth: 0
198202

@@ -206,28 +210,31 @@ jobs:
206210
- name: merge into base_branch
207211
if: ${{ github.event_name == 'pull_request' }}
208212
run: |
209-
echo base branch "${{ github.base_ref }}"
210-
echo pr branch "${{ github.head_ref }}"
211-
git checkout "${{ github.base_ref }}"
213+
echo base branch "$BASE_BRANCH"
214+
echo pr branch "$PR_BRANCH"
215+
git checkout "$BASE_BRANCH"
212216
git checkout -b "merging-${{ github.event.number }}"
213217
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
218+
env:
219+
BASE_BRANCH: ${{ github.base_ref }}
220+
PR_BRANCH: ${{ github.head_ref }}
214221

215222
- name: setup python
216-
uses: actions/setup-python@v4
223+
uses: actions/setup-python@v5
217224
with:
218225
python-version-file: "pyproject.toml"
219226

220227
- name: setup poetry
221-
uses: abatilo/actions-poetry@v2
228+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
222229
with:
223-
poetry-version: 1.5.1
230+
poetry-version: 2.1.4
224231

225232
- name: add poetry plugins
226233
run: |
227234
poetry self add "poetry-dynamic-versioning[plugin]"
228235
229236
- name: cache virtualenv
230-
uses: actions/cache@v3
237+
uses: actions/cache@v4
231238
with:
232239
path: |
233240
.venv
@@ -262,7 +269,6 @@ jobs:
262269
echo "RELEASE_VERSION=$version" >> $GITHUB_ENV
263270
echo "${version}"
264271
265-
266272
publish:
267273
runs-on: ubuntu-latest
268274
if: github.repository == 'NHSDigital/nhs-aws-helpers' && github.actor != 'dependabot[bot]'
@@ -272,7 +278,7 @@ jobs:
272278
- tox
273279
steps:
274280
- name: checkout
275-
uses: actions/checkout@v3
281+
uses: actions/checkout@v5
276282
with:
277283
fetch-depth: 0
278284

@@ -291,21 +297,24 @@ jobs:
291297
- name: merge into base_branch
292298
if: ${{ github.event_name == 'pull_request' }}
293299
run: |
294-
echo base branch "${{ github.base_ref }}"
295-
echo pr branch "${{ github.head_ref }}"
296-
git checkout "${{ github.base_ref }}"
300+
echo base branch "$BASE_BRANCH"
301+
echo pr branch "$PR_BRANCH"
302+
git checkout "$BASE_BRANCH"
297303
git checkout -b "merging-${{ github.event.number }}"
298304
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
305+
env:
306+
BASE_BRANCH: ${{ github.base_ref }}
307+
PR_BRANCH: ${{ github.head_ref }}
299308

300309
- name: setup python
301-
uses: actions/setup-python@v4
310+
uses: actions/setup-python@v5
302311
with:
303312
python-version-file: "pyproject.toml"
304313

305314
- name: setup poetry
306-
uses: abatilo/actions-poetry@v2
315+
uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1
307316
with:
308-
poetry-version: 1.5.1
317+
poetry-version: 2.1.4
309318

310319
- name: add poetry plugins
311320
run: |

‎.github/workflows/scheduled-combine-dependabot-prs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- name: combine-prs
2727
id: combine-prs
28-
uses: github/combine-prs@v5.0.0
28+
uses: github/combine-prs@v5.2.0
2929
with:
3030
ci_required: ${{ inputs.ci_required == 'YES' }}
3131
labels: dependencies

‎.tool-versions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
poetry 1.8.5
2-
python 3.10.12 3.9.12 3.11.5
1+
poetry 2.1.4
2+
python 3.13.5 3.12.11 3.11.13 3.10.18 3.9.23

‎docker-compose.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.9'
2-
31
services:
42

53
localstack:

0 commit comments

Comments
 (0)