From f60b84c2c57102cb695c6e1252b7632b1e727a22 Mon Sep 17 00:00:00 2001 From: Edd Almond <102675624+eddalmond1@users.noreply.github.com> Date: Thu, 18 Dec 2025 13:32:16 +0000 Subject: [PATCH 1/2] bugfix for access --- .../components/security/security-internal-dev.yaml | 4 ++++ specification/components/security/security-sandbox.yaml | 3 +++ specification/x-nhsd-apim/access-internal-dev.yaml | 6 ++++++ specification/x-nhsd-apim/access-preprod.yaml | 2 ++ .../{ratelimit-dev.yaml => ratelimit-internal-dev.yaml} | 0 .../{target-dev.yaml => target-internal-dev.yaml} | 0 specification/x-nhsd-apim/target-preprod.yaml | 2 +- specification/x-nhsd-apim/target-prod.yaml | 2 +- specification/x-nhsd-apim/target-test.yaml | 2 +- 9 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 specification/components/security/security-internal-dev.yaml create mode 100644 specification/x-nhsd-apim/access-internal-dev.yaml rename specification/x-nhsd-apim/{ratelimit-dev.yaml => ratelimit-internal-dev.yaml} (100%) rename specification/x-nhsd-apim/{target-dev.yaml => target-internal-dev.yaml} (100%) diff --git a/specification/components/security/security-internal-dev.yaml b/specification/components/security/security-internal-dev.yaml new file mode 100644 index 0000000..a427260 --- /dev/null +++ b/specification/components/security/security-internal-dev.yaml @@ -0,0 +1,4 @@ +nhs-login-p9: + $ref: https://proxygen.prod.api.platform.nhs.uk/components/securitySchemes/nhs-login-p9 +app-level3: + $ref: https://proxygen.prod.api.platform.nhs.uk/components/securitySchemes/app-level3 diff --git a/specification/components/security/security-sandbox.yaml b/specification/components/security/security-sandbox.yaml index 8305a64..3a15f55 100644 --- a/specification/components/security/security-sandbox.yaml +++ b/specification/components/security/security-sandbox.yaml @@ -1,2 +1,5 @@ app-level0: $ref: https://proxygen.prod.api.platform.nhs.uk/components/securitySchemes/app-level0 +app-level3: + $ref: https://proxygen.prod.api.platform.nhs.uk/components/securitySchemes/app-level3 + diff --git a/specification/x-nhsd-apim/access-internal-dev.yaml b/specification/x-nhsd-apim/access-internal-dev.yaml new file mode 100644 index 0000000..a5d92a5 --- /dev/null +++ b/specification/x-nhsd-apim/access-internal-dev.yaml @@ -0,0 +1,6 @@ +- title: Eligibility Signposting API (Dev Environment) + grants: + nhs-login-p9: [] +- title: Eligibility Signposting API (Dev Environment) app Level 3 Access + grants: + app-level3: [] diff --git a/specification/x-nhsd-apim/access-preprod.yaml b/specification/x-nhsd-apim/access-preprod.yaml index 3a049c2..6c33f5a 100644 --- a/specification/x-nhsd-apim/access-preprod.yaml +++ b/specification/x-nhsd-apim/access-preprod.yaml @@ -1,4 +1,6 @@ - title: Eligibility Signposting API (Pre Production Environment) grants: nhs-login-p9: [] +- title: Eligibility Signposting API (Pre Production Environment) app Level 3 Access + grants: app-level3: [] diff --git a/specification/x-nhsd-apim/ratelimit-dev.yaml b/specification/x-nhsd-apim/ratelimit-internal-dev.yaml similarity index 100% rename from specification/x-nhsd-apim/ratelimit-dev.yaml rename to specification/x-nhsd-apim/ratelimit-internal-dev.yaml diff --git a/specification/x-nhsd-apim/target-dev.yaml b/specification/x-nhsd-apim/target-internal-dev.yaml similarity index 100% rename from specification/x-nhsd-apim/target-dev.yaml rename to specification/x-nhsd-apim/target-internal-dev.yaml diff --git a/specification/x-nhsd-apim/target-preprod.yaml b/specification/x-nhsd-apim/target-preprod.yaml index cabb590..4c441ba 100644 --- a/specification/x-nhsd-apim/target-preprod.yaml +++ b/specification/x-nhsd-apim/target-preprod.yaml @@ -1,5 +1,5 @@ type: external -url: "preprod.eligibility-signposting-api.nhs.uk" +url: "https://preprod.eligibility-signposting-api.nhs.uk" healthcheck: /patient-check/_status security: type: mtls diff --git a/specification/x-nhsd-apim/target-prod.yaml b/specification/x-nhsd-apim/target-prod.yaml index a889c96..a779e58 100644 --- a/specification/x-nhsd-apim/target-prod.yaml +++ b/specification/x-nhsd-apim/target-prod.yaml @@ -1,5 +1,5 @@ type: external -url: "prod.eligibility-signposting-api.national.nhs.uk" +url: "https://prod.eligibility-signposting-api.national.nhs.uk" healthcheck: /patient-check/_status security: type: mtls diff --git a/specification/x-nhsd-apim/target-test.yaml b/specification/x-nhsd-apim/target-test.yaml index baed574..2451246 100644 --- a/specification/x-nhsd-apim/target-test.yaml +++ b/specification/x-nhsd-apim/target-test.yaml @@ -1,5 +1,5 @@ type: external -url: "test.eligibility-signposting-api.nhs.uk" +url: "https://test.eligibility-signposting-api.nhs.uk" healthcheck: /patient-check/_status security: type: mtls From 96f64f92adf9626f378ba96cfeac3060ea2dfb01 Mon Sep 17 00:00:00 2001 From: Edd Almond <102675624+eddalmond1@users.noreply.github.com> Date: Mon, 22 Dec 2025 11:49:01 +0000 Subject: [PATCH 2/2] adding dev to make commands --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eb55436..a66c5f8 100644 --- a/Makefile +++ b/Makefile @@ -114,13 +114,13 @@ set-ratelimit: guard-APIM_ENV < specification/x-nhsd-apim/ratelimit-template.yaml > specification/x-nhsd-apim/ratelimit.yaml update-spec-template: guard-APIM_ENV -ifeq ($(APIM_ENV), $(filter $(APIM_ENV), sandbox internal-dev test int ref preprod prod )) +ifeq ($(APIM_ENV), $(filter $(APIM_ENV), sandbox internal-dev test int ref preprod prod dev )) @ $(MAKE) set-target APIM_ENV=$$APIM_ENV @ $(MAKE) set-access APIM_ENV=$$APIM_ENV @ $(MAKE) set-security APIM_ENV=$$APIM_ENV @ $(MAKE) set-ratelimit APIM_ENV=$$APIM_ENV else - @ echo ERROR: $$APIM_ENV is not a valid environment. Please use one of [sandbox, internal-dev, int, ref, prod] + @ echo ERROR: $$APIM_ENV is not a valid environment. Please use one of [dev, sandbox, internal-dev, int, ref, prod] @ exit 1; endif