Merge remote-tracking branch 'origin' into feature/GPCAPIM-397-set-up-int-test-provider-requests

Author: davidhamill1-nhs

.github/workflows/alpha-integration-env.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: ecr-login
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7
 
       - name: Compute deployment metadata
         id: meta

.github/workflows/preview-env.yml

@@ -58,7 +58,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: ecr-login
-        uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a
+        uses: aws-actions/amazon-ecr-login@19d944daaa35f0fa1d3f7f8af1d3f2e5de25c5b7
 
       - name: Compute branch metadata
         id: meta

.github/workflows/test-bruno-collection.yaml

@@ -27,7 +27,7 @@ jobs:
           python-version: ${{ env.python_version }}
 
       - name: Setup Node
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
         with:
           node-version: '20'
 

.vscode/settings.json

@@ -107,4 +107,5 @@
   "python.analysis.extraPaths": [
     "./gateway-api/stubs"
   ],
+  "python-envs.defaultEnvManager": "ms-python.python:pyenv",
 }

README.md

@@ -116,10 +116,6 @@ The dev container sits on the same network, `gateway-local`, as [the `gateway-ap
 
 - A container runtime such as [Docker](https://docs.docker.com/engine/install/) (Linux/WSL) or [Colima](https://github.com/abiosoft/colima) (macOS)
 
-### External Dependencies
-
-This project depends on the [clinical-data-common](https://github.com/NHSDigital/clinical-data-common) library for shared utilities. It is declared as a Git dependency in `gateway-api/pyproject.toml` and installed automatically by Poetry.
-
 ## Usage
 
 The project uses `make` targets to build, deploy, and manage the application. Run these from the repository root:
@@ -157,11 +153,11 @@ Environment variables control whether stubs are used in place of the real PDS, S
 | Variable | Description |
 | --- | --- |
 | `PDS_URL` | The URL for the PDS FHIR API; set as `stub` to use development stub. |
-| `PDS_API_TOKEN`| Leave unset in development environment. |
-| `PDS_API_SECRET`| Leave unset in development environment. |
-| `PDS_API_KID`| Leave unset in development environment. |
+| `PDS_API_TOKEN` | Leave unset in development environment. |
+| `PDS_API_SECRET` | Leave unset in development environment. |
+| `PDS_API_KID` | Leave unset in development environment. |
 | `SDS_URL` | The URL for the SDS FHIR API; set as `stub` to use development stub. |
-| `SDS_API_TOKEN`| Leave unset in development environment. |
+| `SDS_API_TOKEN` | Leave unset in development environment. |
 | `PROVIDER_URL` | The URL for the GP Provider; set as `stub` to use development stub. |
 | `CDG_DEBUG` | `true`, return additional debug information when the call to the GP provider returns an error. |
 

bruno/gateway-api/collections/Steel_Thread/environments/localInt.yml

@@ -0,0 +1,8 @@
+name: localInt
+variables:
+  - name: base_url
+    value: http://localhost:5000
+  - name: nhs_number
+    value: "9692140466"
+  - name: from_ods
+    value: A20047

gateway-api/README.md

@@ -114,31 +114,17 @@ gateway-api/
 Specified under `[tool.poetry.dependencies]` in `pyproject.toml`:
 
 | Package | Description |
-|---|---|
+| --- | --- |
 | `flask` | Web framework powering the Gateway API |
 | `requests` | HTTP client for calling PDS, SDS, and GP provider APIs |
 | `types-flask` | Type stubs for Flask (used by mypy) |
-| `clinical-data-common` | Shared NHSE library for common utilities ([GitHub repo](https://github.com/NHSDigital/clinical-data-common)) |
-
-The `clinical-data-common` dependency is pinned to a Git tag in `pyproject.toml`:
-
-```toml
-[tool.poetry.dependencies]
-clinical-data-common = { git = "https://github.com/NHSDigital/clinical-data-common.git", tag = "v0.1.0" }
-```
-
-To update it to a newer tag or version:
-
-```bash
-poetry update clinical-data-common
-```
 
 ### Dev Dependencies
 
 Specified under `[dependency-groups] dev` in `pyproject.toml`:
 
 | Package | Description |
-|---|---|
+| --- | --- |
 | `mypy` | Static type checker (strict mode enabled) |
 | `pytest` | Test runner |
 | `pytest-bdd` | BDD-style acceptance tests with Gherkin feature files |

gateway-api/poetry.lock

@@ -9,7 +9,6 @@ readme = "README.md"
 requires-python = ">=3.14,<4.0.0"
 
 [tool.poetry.dependencies]
-clinical-data-common = { git = "https://github.com/NHSDigital/clinical-data-common.git", tag = "v0.1.0" }
 flask = "^3.1.3"
 types-flask = "^1.1.6"
 requests = "^2.33.0"

gateway-api/pyproject.toml

@@ -37,6 +37,7 @@ def configure_app(app: Flask) -> None:
         "FLASK_PORT": get_env_var("FLASK_PORT", int),
         "PDS_URL": get_env_var("PDS_URL", str),
         "SDS_URL": get_env_var("SDS_URL", str),
+        "SDS_API_TOKEN": get_env_var("SDS_API_TOKEN", str),
     }
     app.config.update(config)
 
@@ -108,7 +109,9 @@ def get_structured_record() -> Response:
     try:
         get_structured_record_request = GetStructuredRecordRequest(request)
         controller = Controller(
-            pds_base_url=app.config["PDS_URL"], sds_base_url=app.config["SDS_URL"]
+            pds_base_url=app.config["PDS_URL"],
+            sds_base_url=app.config["SDS_URL"],
+            sds_api_key=app.config["SDS_API_TOKEN"],
         )
         provider_response = controller.run(request=get_structured_record_request)
         response.add_provider_response(provider_response)