From bacc77180876584d65502f7e57c93c3e80ba93e6 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 14:17:56 +0000 Subject: [PATCH 01/17] Release/2025-12-17 --- CHANGELOG.md | 3 +++ VERSION | 2 +- changelog/2025-12-17.md | 1 + pyproject.toml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelog/2025-12-17.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e882ba3e3..20fa82042 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 2025-12-17 +- [PI-889] Dependabot updates + ## 2025-07-21 - Create new tag diff --git a/VERSION b/VERSION index 7da1e54ee..bd125777b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2025.07.21 +2025.12.17 diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md new file mode 100644 index 000000000..40979147e --- /dev/null +++ b/changelog/2025-12-17.md @@ -0,0 +1 @@ +- [PI-889] Dependabot updates diff --git a/pyproject.toml b/pyproject.toml index 0352366ad..9253dbc0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "connecting-party-manager" -version = "2025.07.21" +version = "2025.12.17" description = "Repository for the Connecting Party Manager API and related services" authors = ["NHS England"] license = "LICENSE.md" From cc86c8ed92272beae03b67109dccbaabccd0a660 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 15:55:47 +0000 Subject: [PATCH 02/17] Fix local feature tests --- src/api/tests/feature_tests/steps/steps.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/tests/feature_tests/steps/steps.py b/src/api/tests/feature_tests/steps/steps.py index 3a826c60c..a9cfe3bbb 100644 --- a/src/api/tests/feature_tests/steps/steps.py +++ b/src/api/tests/feature_tests/steps/steps.py @@ -29,14 +29,14 @@ sort_keys = {"product": "name"} -@given('"{header_name}" request headers') +@given('"{header_name}" request headers:') def given_request_headers(context: Context, header_name: str): table_headers = parse_table(table=context.table, context=context) context.headers[header_name] = dict(**table_headers, apikey=context.api_key) @given( - 'I have already made a "{http_method}" request with "{header_name}" headers to "{endpoint}" with body' + 'I have already made a "{http_method}" request with "{header_name}" headers to "{endpoint}" with body:' ) def given_made_request( context: Context, http_method: str, header_name: str, endpoint: str @@ -93,7 +93,7 @@ def given_made_request( @when( - 'I make a "{http_method}" request with "{header_name}" headers to "{endpoint}" with body' + 'I make a "{http_method}" request with "{header_name}" headers to "{endpoint}" with body:' ) def when_make_request( context: Context, http_method: str, header_name: str, endpoint: str @@ -293,7 +293,7 @@ def then_response(context: Context, status_code: str): ) -@then("the response headers contain") +@then("the response headers contain:") def then_response(context: Context): expected_response_headers = parse_table(table=context.table, context=context) assert_is_subset( From 6132075a63145bac559acedfb22808680467b215 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 16:17:17 +0000 Subject: [PATCH 03/17] Update nodejs --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 64ecaee68..213447ba9 100644 --- a/.tool-versions +++ b/.tool-versions @@ -4,5 +4,5 @@ python 3.12.3 terraform 1.5.7 jq 1.7 yq 4.34.2 -nodejs 20.9.0 +nodejs 20.19.0 java zulu-jre-17.42.19 From 86d4af13ecb08544395ea9f2fb5f5ad840e0a7fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Dec 2025 19:07:29 +0000 Subject: [PATCH 04/17] poetry: update pytest requirement from ^8.2.0 to ^9.0.2 Updates the requirements on [pytest](https://github.com/pytest-dev/pytest) to permit the latest version. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.2.0...9.0.2) --- updated-dependencies: - dependency-name: pytest dependency-version: 9.0.2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9253dbc0a..93e9c792c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ pre-commit = "^4.0.0" black = "^25.1.0" flake8 = "^7.0.0" behave = "^1.2.6" -pytest = "^8.2.0" +pytest = "^9.0.2" pytest-cov = "^6.0.0" pytest-custom-exit-code = "^0.3.0" sh = "^2.0.6" From 5757f9b0f41f5456277e5eef385fb9ef52c20615 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 16:20:02 +0000 Subject: [PATCH 05/17] Update changelog --- CHANGELOG.md | 3 ++- changelog/2025-12-17.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20fa82042..21e32f878 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog ## 2025-12-17 -- [PI-889] Dependabot updates +- [PI-889] redocly hotfix +- [PI-889] Dependabot pytest update ## 2025-07-21 - Create new tag diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index 40979147e..206f0224d 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -1 +1,2 @@ -- [PI-889] Dependabot updates +- [PI-889] redocly hotfix +- [PI-889] Dependabot pytest update From 878e557059f459782a6c287c137c3300de45d58b Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 16:42:08 +0000 Subject: [PATCH 06/17] Update changelog --- CHANGELOG.md | 1 + changelog/2025-12-17.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21e32f878..9b95193e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 2025-12-17 - [PI-889] redocly hotfix +- [PI-889] nodejs update - [PI-889] Dependabot pytest update ## 2025-07-21 diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index 206f0224d..23403d473 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -1,2 +1,3 @@ - [PI-889] redocly hotfix +- [PI-889] nodejs update - [PI-889] Dependabot pytest update From f5c023c7eca9e7efd2987f61f43e33583522201e Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 16:53:16 +0000 Subject: [PATCH 07/17] pytest v8.4.2 restricted --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 93e9c792c..91a3e083e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ pre-commit = "^4.0.0" black = "^25.1.0" flake8 = "^7.0.0" behave = "^1.2.6" -pytest = "^9.0.2" +pytest = "^8.4.2" pytest-cov = "^6.0.0" pytest-custom-exit-code = "^0.3.0" sh = "^2.0.6" From 0e3c233df95d0f8c7711977eb1a6c7f7a9014d35 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 16:53:51 +0000 Subject: [PATCH 08/17] nodejs needs to be 20.9.0 for swagger --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 213447ba9..64ecaee68 100644 --- a/.tool-versions +++ b/.tool-versions @@ -4,5 +4,5 @@ python 3.12.3 terraform 1.5.7 jq 1.7 yq 4.34.2 -nodejs 20.19.0 +nodejs 20.9.0 java zulu-jre-17.42.19 From defc518b8c0ee92a28588ace42e8d9ae037111b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 19:56:15 +0000 Subject: [PATCH 09/17] github-actions: bump actions/checkout from 4 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/_deploy.yml | 14 +++---- .github/workflows/_deploy_backups.yml | 8 ++-- .../workflows/destroy-expired-workspaces.yml | 4 +- .../workflows/destroy-nonprod-workspace.yml | 4 +- .github/workflows/merge.yml | 4 +- .github/workflows/on-pr-close.yml | 8 ++-- .github/workflows/pull-requests.yml | 38 +++++++++---------- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml index ba4d43045..8e428b371 100644 --- a/.github/workflows/_deploy.yml +++ b/.github/workflows/_deploy.yml @@ -52,7 +52,7 @@ jobs: runs-on: [self-hosted, ci] needs: get-branch-from-workflow-file steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.SCOPE == 'per_workspace'}} @@ -81,7 +81,7 @@ jobs: needs: [get-branch-from-workflow-file, build] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -98,7 +98,7 @@ jobs: needs: [get-branch-from-workflow-file, terraform--init] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -116,7 +116,7 @@ jobs: environment: ${{ inputs.account }} runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -133,7 +133,7 @@ jobs: needs: [get-branch-from-workflow-file, terraform--apply] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/make/ @@ -157,7 +157,7 @@ jobs: needs: [get-branch-from-workflow-file, apigee--deploy] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.SCOPE == 'per_workspace' && (env.ACCOUNT == 'int' || env.ACCOUNT == 'prod') }} @@ -172,7 +172,7 @@ jobs: needs: [get-branch-from-workflow-file, apigee--deploy] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.ACCOUNT != 'mgmt' && env.ACCOUNT != 'backups' }} diff --git a/.github/workflows/_deploy_backups.yml b/.github/workflows/_deploy_backups.yml index 44f8258ef..7f7423cdc 100644 --- a/.github/workflows/_deploy_backups.yml +++ b/.github/workflows/_deploy_backups.yml @@ -51,7 +51,7 @@ jobs: runs-on: [self-hosted, ci] needs: get-branch-from-workflow-file steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.SCOPE == 'per_workspace'}} @@ -73,7 +73,7 @@ jobs: needs: [get-branch-from-workflow-file, build] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -90,7 +90,7 @@ jobs: needs: [get-branch-from-workflow-file, terraform--init] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -108,7 +108,7 @@ jobs: environment: ${{ inputs.account }} runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ diff --git a/.github/workflows/destroy-expired-workspaces.yml b/.github/workflows/destroy-expired-workspaces.yml index 57c804dd8..2cd104915 100644 --- a/.github/workflows/destroy-expired-workspaces.yml +++ b/.github/workflows/destroy-expired-workspaces.yml @@ -28,7 +28,7 @@ jobs: runs-on: [self-hosted, ci] needs: [parse-secrets] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -42,7 +42,7 @@ jobs: needs: [build-base] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} diff --git a/.github/workflows/destroy-nonprod-workspace.yml b/.github/workflows/destroy-nonprod-workspace.yml index 8820a431f..8d907ff33 100644 --- a/.github/workflows/destroy-nonprod-workspace.yml +++ b/.github/workflows/destroy-nonprod-workspace.yml @@ -41,7 +41,7 @@ jobs: runs-on: [self-hosted, ci] needs: [get-branch-from-workflow-file] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/make/ @@ -55,7 +55,7 @@ jobs: needs: [build-base] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - name: Destroy workspace diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f1f9761d1..eb948a2aa 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -17,7 +17,7 @@ jobs: name: Create a tag from main steps: - name: Checkout the repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create 'env.tag' from the latest release run: | TAG=$(make changelog--get-latest-release) @@ -51,7 +51,7 @@ jobs: runs-on: [self-hosted, ci] needs: [create-coverage-name, make-tag] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: main - name: Download artifact diff --git a/.github/workflows/on-pr-close.yml b/.github/workflows/on-pr-close.yml index 0122748c0..409a6336e 100644 --- a/.github/workflows/on-pr-close.yml +++ b/.github/workflows/on-pr-close.yml @@ -28,13 +28,13 @@ jobs: steps: - name: Checkout Branch id: checkout-build-branch - uses: actions/checkout@v4 + uses: actions/checkout@v6 continue-on-error: true with: ref: ${{ env.BRANCH_NAME }} - name: Fallback to main if: steps.checkout-build-branch.outcome == 'failure' - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: main - uses: ./.github/actions/make/ @@ -49,13 +49,13 @@ jobs: steps: - name: Checkout Branch for destroy id: checkout-destroy-branch - uses: actions/checkout@v4 + uses: actions/checkout@v6 continue-on-error: true with: ref: ${{ env.BRANCH_NAME }} - name: Fallback to main for destroy if: steps.checkout-destroy-branch.outcome == 'failure' - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: main fetch-depth: 0 diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 1a3a88888..5b27445ee 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -20,7 +20,7 @@ jobs: workflow--check--branch-name: runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -30,7 +30,7 @@ jobs: workflow--check--rebased-on-main: runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - uses: ./.github/actions/make/ @@ -40,7 +40,7 @@ jobs: workflow--check--release-branch-name: runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ github.event.pull_request.head.ref }} - uses: ./.github/actions/make/ @@ -76,7 +76,7 @@ jobs: runs-on: [self-hosted, ci] needs: [parse-secrets] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -89,7 +89,7 @@ jobs: runs-on: [self-hosted, ci] needs: [workflow--check--branch-name] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BASE_BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -103,7 +103,7 @@ jobs: runs-on: [self-hosted, ci] needs: [build-head] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -117,7 +117,7 @@ jobs: matrix: test-type: [unit, slow] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/pytest-with-rerun/ @@ -128,7 +128,7 @@ jobs: needs: [build-head] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -139,7 +139,7 @@ jobs: needs: [create-workspace-name, build-base, parse-secrets] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BASE_BRANCH_NAME }} - uses: ./.github/actions/terraform/ @@ -168,7 +168,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/terraform/ @@ -186,7 +186,7 @@ jobs: needs: [build-head, terraform-head-build] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -200,7 +200,7 @@ jobs: needs: [build-head, apigee--deploy] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - run: | @@ -227,7 +227,7 @@ jobs: matrix: test-type: [integration] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/pytest-with-rerun/ @@ -247,7 +247,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -270,7 +270,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -305,7 +305,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -335,7 +335,7 @@ jobs: runs-on: [self-hosted, ci] if: ${{ needs.apigee--attach-product.result == 'success' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - run: | @@ -352,7 +352,7 @@ jobs: runs-on: [self-hosted, ci] if: ${{ needs.apigee--deploy.result == 'success' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -366,7 +366,7 @@ jobs: runs-on: [self-hosted, ci] needs: [build-head] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} fetch-depth: 0 From ddacdd4f6954b98cfa2502d6d3a340bbb22a715f Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 17:16:22 +0000 Subject: [PATCH 10/17] Merge github actions upgrade --- CHANGELOG.md | 3 +-- changelog/2025-12-17.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b95193e9..2732c561e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,7 @@ ## 2025-12-17 - [PI-889] redocly hotfix -- [PI-889] nodejs update -- [PI-889] Dependabot pytest update +- [PI-889] Pytest update ## 2025-07-21 - Create new tag diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index 23403d473..d24d25d26 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -1,3 +1,2 @@ - [PI-889] redocly hotfix -- [PI-889] nodejs update -- [PI-889] Dependabot pytest update +- [PI-889] Pytest update From 5a6e7ecd684c0861ba8c55d909ab7b80b4fcce54 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 17:27:34 +0000 Subject: [PATCH 11/17] More Dependabot --- CHANGELOG.md | 2 ++ changelog/2025-12-17.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2732c561e..b51676fd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## 2025-12-17 - [PI-889] redocly hotfix - [PI-889] Pytest update +- [PI-889] Dependabot - Github actions update +- [PI-889] Dependabot - Sonarqube update ## 2025-07-21 - Create new tag diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index d24d25d26..bb5da45c3 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -1,2 +1,4 @@ - [PI-889] redocly hotfix - [PI-889] Pytest update +- [PI-889] Dependabot - Github actions update +- [PI-889] Dependabot - Sonarqube update From 870474ee935f79bd7913de9fc8203f85ad81c21a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 19:06:23 +0000 Subject: [PATCH 12/17] github-actions: bump SonarSource/sonarqube-scan-action from 5 to 7 Bumps [SonarSource/sonarqube-scan-action](https://github.com/sonarsource/sonarqube-scan-action) from 5 to 7. - [Release notes](https://github.com/sonarsource/sonarqube-scan-action/releases) - [Commits](https://github.com/sonarsource/sonarqube-scan-action/compare/v5...v7) --- updated-dependencies: - dependency-name: SonarSource/sonarqube-scan-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/merge.yml | 2 +- .github/workflows/pull-requests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index eb948a2aa..1524bad3c 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -62,7 +62,7 @@ jobs: workflow: pull-requests.yml workflow_conclusion: success - name: SonarQube Scan - uses: SonarSource/sonarqube-scan-action@v5 + uses: SonarSource/sonarqube-scan-action@v7 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_HOST_URL: https://sonarcloud.io diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 5b27445ee..3b3988445 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -319,7 +319,7 @@ jobs: name: "${{ needs.create-coverage-name.outputs.coverage-name }}-coverage" path: "sonarcloud-coverage.xml" - name: SonarQube Scan - uses: SonarSource/sonarqube-scan-action@v5 + uses: SonarSource/sonarqube-scan-action@v7 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_HOST_URL: https://sonarcloud.io From 7349d3bc5116c02af084aaff0de9d20439d6fec6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 19:06:18 +0000 Subject: [PATCH 13/17] github-actions: bump actions/upload-artifact from 4 to 6 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/_deploy.yml | 2 +- .github/workflows/pull-requests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml index 8e428b371..4c237558c 100644 --- a/.github/workflows/_deploy.yml +++ b/.github/workflows/_deploy.yml @@ -144,7 +144,7 @@ jobs: restore-from-cache: "true" cache-suffix: ${{ env.CACHE_NAME }} - name: Archive swagger - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: swagger path: | diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 3b3988445..02518fcac 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -314,7 +314,7 @@ jobs: requires-aws: true save-to-cache: "true" - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: "${{ needs.create-coverage-name.outputs.coverage-name }}-coverage" path: "sonarcloud-coverage.xml" From 25cdaa47a685ce54bf3193181609a2edbda4ca81 Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Wed, 17 Dec 2025 17:52:02 +0000 Subject: [PATCH 14/17] Update upload artifact on github workflows --- CHANGELOG.md | 1 + changelog/2025-12-17.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b51676fd3..8ed2a03b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [PI-889] Pytest update - [PI-889] Dependabot - Github actions update - [PI-889] Dependabot - Sonarqube update +- [PI-889] Dependabot - upload artifact update ## 2025-07-21 - Create new tag diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index bb5da45c3..da9149dfb 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -2,3 +2,4 @@ - [PI-889] Pytest update - [PI-889] Dependabot - Github actions update - [PI-889] Dependabot - Sonarqube update +- [PI-889] Dependabot - upload artifact update From 16b42876adf953f2a7c7df17bbf5bb071c10c319 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 19:07:05 +0000 Subject: [PATCH 15/17] poetry: update datamodel-code-generator requirement Updates the requirements on [datamodel-code-generator](https://github.com/koxudaxi/datamodel-code-generator) to permit the latest version. - [Release notes](https://github.com/koxudaxi/datamodel-code-generator/releases) - [Commits](https://github.com/koxudaxi/datamodel-code-generator/compare/0.31.2...0.43.1) --- updated-dependencies: - dependency-name: datamodel-code-generator dependency-version: 0.43.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 91a3e083e..f26ce3f45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ hypothesis = "^6.87.3" aws-lambda-powertools = { extras = ["aws-sdk"], version = "^2.26.0" } parse = "^1.19.1" pytest-mock = "^3.12.0" -datamodel-code-generator = "^0.31.2" +datamodel-code-generator = "^0.43.1" pyyaml = "^6.0.1" proxygen-cli = "^2.1.14" moto = "^5.0.1" From 2c29ecff89a31f02959e398c01aac72c10e4873b Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Thu, 18 Dec 2025 08:53:48 +0000 Subject: [PATCH 16/17] Update Datamodel-code-generator --- CHANGELOG.md | 1 + changelog/2025-12-17.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ed2a03b3..0990e368f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [PI-889] Dependabot - Github actions update - [PI-889] Dependabot - Sonarqube update - [PI-889] Dependabot - upload artifact update +- [PI-889] Dependabot - Datamodel code generator update ## 2025-07-21 - Create new tag diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index da9149dfb..8aa0812c9 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -3,3 +3,4 @@ - [PI-889] Dependabot - Github actions update - [PI-889] Dependabot - Sonarqube update - [PI-889] Dependabot - upload artifact update +- [PI-889] Dependabot - Datamodel code generator update From 0d0116bd76a37e9eee085fea6dac806990b9bb9b Mon Sep 17 00:00:00 2001 From: jameslinnell Date: Thu, 18 Dec 2025 10:36:01 +0000 Subject: [PATCH 17/17] Update changelog --- CHANGELOG.md | 8 ++++---- changelog/2025-12-17.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0990e368f..dff73581b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,10 @@ ## 2025-12-17 - [PI-889] redocly hotfix - [PI-889] Pytest update -- [PI-889] Dependabot - Github actions update -- [PI-889] Dependabot - Sonarqube update -- [PI-889] Dependabot - upload artifact update -- [PI-889] Dependabot - Datamodel code generator update +- Dependabot - Github actions update +- Dependabot - Sonarqube update +- Dependabot - upload artifact update +- Dependabot - Datamodel code generator update ## 2025-07-21 - Create new tag diff --git a/changelog/2025-12-17.md b/changelog/2025-12-17.md index 8aa0812c9..c37b2c3d8 100644 --- a/changelog/2025-12-17.md +++ b/changelog/2025-12-17.md @@ -1,6 +1,6 @@ - [PI-889] redocly hotfix - [PI-889] Pytest update -- [PI-889] Dependabot - Github actions update -- [PI-889] Dependabot - Sonarqube update -- [PI-889] Dependabot - upload artifact update -- [PI-889] Dependabot - Datamodel code generator update +- Dependabot - Github actions update +- Dependabot - Sonarqube update +- Dependabot - upload artifact update +- Dependabot - Datamodel code generator update