diff --git a/Makefile b/Makefile index dacd22f5e..d137fbdc5 100644 --- a/Makefile +++ b/Makefile @@ -45,11 +45,6 @@ publish-oas: $(MAKE) copy-examples npm run publish-oas -set-authorization: guard-APIM_ENV - @ AUTHORIZATION=authorization-$$APIM_ENV.yml \ - envsubst '$${AUTHORIZATION}' \ - < specification/api/components/parameters/authorization/authorization-template.yml > specification/api/components/parameters/authorization/authorization.yml - set-target: guard-APIM_ENV @ TARGET=target-$$APIM_ENV.yml \ envsubst '$${TARGET}' \ @@ -69,7 +64,6 @@ set-security: guard-APIM_ENV < specification/api/components/security-schemes/security-schemes-template.yml > specification/api/components/security-schemes/security-schemes.yml construct-spec: guard-APIM_ENV - $(MAKE) set-authorization APIM_ENV=$$APIM_ENV $(MAKE) set-target APIM_ENV=$$APIM_ENV $(MAKE) set-access APIM_ENV=$$APIM_ENV $(MAKE) set-security APIM_ENV=$$APIM_ENV diff --git a/VERSION b/VERSION index ed1dc8919..0e6bc07b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash} +1.0.0-${yyyy}${mm}${dd}.${HH}${MM}${SS}+${hash} diff --git a/sdk/Makefile b/sdk/Makefile index ba052471e..760924815 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -3,7 +3,7 @@ VERSION ?= "" SHELL = /bin/bash build: version # Build the project artefact @Pipeline - VER=$$(cat .version) && cd .. && make build-yml-oas-spec APIM_ENV=prod && npm run generate --buildver=$$VER && cd sdk + VER=$$(cat .version) && cd .. && npm run build --buildver=$$VER && cd sdk ./swagger-static.sh clean: # Clean-up project resources (main) @Operations diff --git a/sdk/_config.version.yml b/sdk/_config.version.yml index 3941841c6..9e5d8273f 100644 --- a/sdk/_config.version.yml +++ b/sdk/_config.version.yml @@ -1 +1 @@ -version: 1.0.1-20251125.131623+3d60875 +version: 0.2.0-20251120.121539+0c18993 diff --git a/specification/api/components/parameters/authorization/authorization-int.yml b/specification/api/components/parameters/authorization/authorization-int.yml deleted file mode 100644 index c4e9225de..000000000 --- a/specification/api/components/parameters/authorization/authorization-int.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: Authorization -in: header -description: |- - An OAuth 2.0 bearer token. Required in integration and production environments. -required: true -schema: - type: string - pattern: ^Bearer [[:ascii:]]+$ - example: Bearer g1112R_ccQ1Ebbb4gtHBP1aaaNM diff --git a/specification/api/components/parameters/authorization/authorization-internal-dev-pr.yml b/specification/api/components/parameters/authorization/authorization-internal-dev-pr.yml deleted file mode 100644 index e62b20673..000000000 --- a/specification/api/components/parameters/authorization/authorization-internal-dev-pr.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: apikey -in: header -description: |- - API Key to authorize in dynamic environments only. -required: false -schema: - type: string diff --git a/specification/api/components/parameters/authorization/authorization-internal-dev.yml b/specification/api/components/parameters/authorization/authorization-internal-dev.yml deleted file mode 100644 index de566bd12..000000000 --- a/specification/api/components/parameters/authorization/authorization-internal-dev.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: Authorization -in: header -description: |- - An OAuth 2.0 bearer token. Required in integration and production environments. -required: false -schema: - type: string - pattern: ^Bearer [[:ascii:]]+$ - example: Bearer g1112R_ccQ1Ebbb4gtHBP1aaaNM diff --git a/specification/api/components/parameters/authorization/authorization-prod.yml b/specification/api/components/parameters/authorization/authorization-prod.yml deleted file mode 100644 index c4e9225de..000000000 --- a/specification/api/components/parameters/authorization/authorization-prod.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: Authorization -in: header -description: |- - An OAuth 2.0 bearer token. Required in integration and production environments. -required: true -schema: - type: string - pattern: ^Bearer [[:ascii:]]+$ - example: Bearer g1112R_ccQ1Ebbb4gtHBP1aaaNM diff --git a/specification/api/components/parameters/authorization/authorization-ref.yml b/specification/api/components/parameters/authorization/authorization-ref.yml deleted file mode 100644 index c4e9225de..000000000 --- a/specification/api/components/parameters/authorization/authorization-ref.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: Authorization -in: header -description: |- - An OAuth 2.0 bearer token. Required in integration and production environments. -required: true -schema: - type: string - pattern: ^Bearer [[:ascii:]]+$ - example: Bearer g1112R_ccQ1Ebbb4gtHBP1aaaNM diff --git a/specification/api/components/parameters/authorization/authorization-sandbox.yml b/specification/api/components/parameters/authorization/authorization-sandbox.yml deleted file mode 100644 index de566bd12..000000000 --- a/specification/api/components/parameters/authorization/authorization-sandbox.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: Authorization -in: header -description: |- - An OAuth 2.0 bearer token. Required in integration and production environments. -required: false -schema: - type: string - pattern: ^Bearer [[:ascii:]]+$ - example: Bearer g1112R_ccQ1Ebbb4gtHBP1aaaNM diff --git a/specification/api/components/parameters/authorization/authorization-template.yml b/specification/api/components/parameters/authorization/authorization-template.yml deleted file mode 100644 index dcb94c5fe..000000000 --- a/specification/api/components/parameters/authorization/authorization-template.yml +++ /dev/null @@ -1 +0,0 @@ -$ref: $AUTHORIZATION diff --git a/specification/api/components/parameters/authorization/authorization.yml b/specification/api/components/parameters/authorization/authorization.yml deleted file mode 100644 index 1dd82fdc6..000000000 --- a/specification/api/components/parameters/authorization/authorization.yml +++ /dev/null @@ -1 +0,0 @@ -$ref: authorization-prod.yml diff --git a/specification/api/components/security-schemes/security-schemes.yml b/specification/api/components/security-schemes/security-schemes.yml index 78a3ea0e7..33c6527db 100644 --- a/specification/api/components/security-schemes/security-schemes.yml +++ b/specification/api/components/security-schemes/security-schemes.yml @@ -1 +1 @@ -$ref: security-schemes-prod.yml +$ref: security-schemes-internal-dev-pr.yml diff --git a/specification/api/components/security/security.yml b/specification/api/components/security/security.yml index 393524ce3..53a356678 100644 --- a/specification/api/components/security/security.yml +++ b/specification/api/components/security/security.yml @@ -1 +1 @@ -$ref: security-prod.yml +$ref: security-internal-dev-pr.yml diff --git a/specification/api/components/x-nhsd-apim/access.yml b/specification/api/components/x-nhsd-apim/access.yml index c69c222d1..b0ce60643 100644 --- a/specification/api/components/x-nhsd-apim/access.yml +++ b/specification/api/components/x-nhsd-apim/access.yml @@ -1 +1 @@ -$ref: access-prod.yml +$ref: access-internal-dev-pr.yml diff --git a/specification/api/components/x-nhsd-apim/target.yml b/specification/api/components/x-nhsd-apim/target.yml index a0f578ca7..37ed07210 100644 --- a/specification/api/components/x-nhsd-apim/target.yml +++ b/specification/api/components/x-nhsd-apim/target.yml @@ -1 +1 @@ -$ref: target-prod.yml +$ref: target-internal-dev-pr.yml diff --git a/specification/api/notify-supplier-phase1.yml b/specification/api/notify-supplier-phase1.yml index 9588b8201..589c18afa 100644 --- a/specification/api/notify-supplier-phase1.yml +++ b/specification/api/notify-supplier-phase1.yml @@ -9,7 +9,6 @@ security: paths: /letters: parameters: - - $ref: 'components/parameters/authorization/authorization.yml' - $ref: 'components/parameters/requestId.yml' - $ref: 'components/parameters/correlationId.yml' post: @@ -18,7 +17,6 @@ paths: $ref: 'components/endpoints/listLetters.yml' '/letters/{id}': parameters: - - $ref: 'components/parameters/authorization/authorization.yml' - $ref: 'components/parameters/requestId.yml' - $ref: 'components/parameters/correlationId.yml' - $ref: 'components/parameters/resourceId.yml' @@ -28,7 +26,6 @@ paths: $ref: 'components/endpoints/patchLetter.yml' '/letters/{id}/data': parameters: - - $ref: 'components/parameters/authorization/authorization.yml' - $ref: 'components/parameters/resourceId.yml' - $ref: 'components/parameters/requestId.yml' - $ref: 'components/parameters/correlationId.yml' @@ -38,7 +35,6 @@ paths: # $ref: 'components/endpoints/headDataId.yml' /mi: parameters: - - $ref: 'components/parameters/authorization/authorization.yml' - $ref: 'components/parameters/requestId.yml' - $ref: 'components/parameters/correlationId.yml' post: