Skip to content

NRL-753 fix capability statement endpoint deployment #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eesa456 merged 7 commits into from
Jul 11, 2025
Merged

NRL-753 fix capability statement endpoint deployment #967

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9f353c
NRL-753 add capability to depends on
eesa456 Jul 7, 2025
a02f3e2
NRL-753 add smoke test back
eesa456 Jul 7, 2025
4eb4191
NRL-753 add depends on to make sure method is made after resource
eesa456 Jul 8, 2025
78d318e
Merge branch 'develop' of github.com:NHSDigital/NRLF into feature/eem…
eesa456 Jul 9, 2025
1a6b33a
NRL-791 add custodian suffix int test
eesa456 Jul 9, 2025
bcc6c4e
Merge branch 'develop' of github.com:NHSDigital/NRLF into feature/eem…
eesa456 Jul 11, 2025
a5848ff
NRL-753 remove test
eesa456 Jul 11, 2025
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
7 changes: 7 additions & 0 deletions terraform/infrastructure/modules/api_gateway/api_gateway.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ resource "aws_api_gateway_method" "capability" {
resource_id = aws_api_gateway_resource.capability.id
http_method = "GET"
authorization = "NONE"

depends_on = [aws_api_gateway_resource.capability]
}

resource "aws_api_gateway_integration" "capability" {
Expand Down Expand Up @@ -63,6 +65,11 @@ resource "aws_api_gateway_deployment" "api_gateway_deployment" {

depends_on = [
aws_api_gateway_rest_api.api_gateway_rest_api,
aws_api_gateway_resource.capability,
aws_api_gateway_method.capability,
aws_api_gateway_integration.capability,
aws_api_gateway_method_response.capability_200,
aws_api_gateway_integration_response.capability,
aws_api_gateway_integration_response.head_integration_response
]
}
Expand Down
37 changes: 37 additions & 0 deletions tests/features/producer/createDocumentReference-failure.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,3 +1044,40 @@ Feature: Producer - createDocumentReference - Failure Scenarios
"expression": ["DocumentReference"]
}
"""

Scenario: Custodian suffix is rejected with a .
Given the application 'DataShare' (ID 'z00z-y11y-x22x') is registered to access the API
And the organisation 'ANGY1' is authorised to access pointer types:
| system | value |
| http://snomed.info/sct | 736253002 |
When producer 'ANGY1' creates a DocumentReference with values:
| property | value |
| subject | 9999999999 |
| status | current |
| type | 736253002 |
| category | 734163000 |
| custodian | ANGY1.abcsuffix |
| author | HAR1 |
| url | https://example.org/my-doc.pdf |
Then the response status code is 422
And the response is an OperationOutcome with 1 issue
And the OperationOutcome contains the issue:
"""
{
"severity": "error",
"code": "business-rule",
"details": {
"coding": [
{
"system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
"code": "UNPROCESSABLE_ENTITY",
"display": "Unprocessable Entity"
}
]
},
"diagnostics": "The custodian of the provided DocumentReference does not match the expected ODS code for this organisation",
"expression": [
"custodian.identifier.value"
]
}
"""
3 changes: 0 additions & 3 deletions tests/smoke/scenarios/api_capability_statement_lookup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import pytest

from tests.utilities.api_clients import ConsumerTestClient, ProducerTestClient


@pytest.mark.skip(reason="Capability statements aren't working reliably at the minute")
def test_read_api_capability_statements(
consumer_client: ConsumerTestClient, producer_client: ProducerTestClient
):
Expand Down