Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- 'src/pytest_nhsd_apim/**'
- 'pyproject.toml'
- 'setup.py'
jobs:
publish:
runs-on: ubuntu-latest
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
jobs:
check_changes:
runs-on: ubuntu-latest
outputs:
src_changed: ${{ steps.filter.outputs.src }}
steps:
- name: Checkout current branch
uses: actions/checkout@v4
Expand All @@ -15,11 +17,13 @@ jobs:
filters: |
src:
- 'src/pytest_nhsd_apim/**'
- 'pyproject.toml'
- 'setup.py'


integration-tests:
needs: check_changes
if: needs.check_changes.filters.src == 'true'
if: needs.check_changes.outputs.src_changed == 'true'
runs-on: ubuntu-latest
env:
APIGEE_USERNAME: ${{ secrets.APIGEE_USERNAME }}
Expand Down Expand Up @@ -72,7 +76,7 @@ jobs:

check-version-bump:
needs: check_changes
if: needs.check_changes.filters.src == 'true'
if: needs.check_changes.outputs.src_changed == 'true'
runs-on: ubuntu-latest
steps:

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pytest-nhsd-apim"
version = "5.0.12"
version = "5.0.13"
description = "Pytest plugin accessing NHSDigital's APIM proxies"
authors = ["Adrian Ciobanita <adrian.ciobanita1@nhs.net>", "Alex Carrie <alexander.carrie1@nhs.net>", "Lucas Fantini <lucas.fantini@nhs.net>"]
maintainers = ["Alex Carrie <alexander.carrie1@nhs.net>", "Alex Hawdon <alex.hawdon1@nhs.net"]
Expand Down
3 changes: 2 additions & 1 deletion src/pytest_nhsd_apim/identity_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def keycloak_url(self):
class KeycloakUserConfig(KeycloakConfig):
client_id: str
client_secret: str
scope: str = "openid"
redirect_uri: HttpUrlString = "https://google.com"
login_form: dict

Expand Down Expand Up @@ -408,7 +409,7 @@ def get_token(self):
params={
"response_type": "code",
"client_id": self.config.client_id,
"scope": "openid",
"scope": self.config.scope,
"redirect_uri": self.config.redirect_uri,
},
)
Expand Down
Loading