From e904e7c38e759f456e4abac810e24eda3d190f48 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Fri, 13 Oct 2023 14:44:51 +0100 Subject: [PATCH 01/16] Changing GetTargetsKVM to get target paths from KVMs --- .../policies/ServiceCallout.GetTargetsKvm.xml | 13 +++++++------ .../policies/RaiseFault.404PageNotFound.xml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index 29f8bf56..be20aba4 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -4,15 +4,16 @@ GET - NHSDigital/booking-and-referral-targets/master/targets/{{ APIGEE_ENVIRONMENT }}/targets.json + false private.config_raw - - true - - https://raw.githubusercontent.com - + + true + + https://api.enterprise.apigee.com/v1/organizations/{{APIGEE_ORG_NAME}}/environments/{{APIGEE_ENVIRONMENT}}/key-value-maps/booking-and-referrals-targets/entries/Targets + + diff --git a/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml b/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml index a8251faa..6f628b0f 100644 --- a/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml +++ b/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml @@ -1,5 +1,5 @@ - + RaiseFault.404PageNotFound From 634a82894da8adeca71b571d742723ccb5b0e776 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Fri, 13 Oct 2023 17:00:55 +0100 Subject: [PATCH 02/16] Adding response handling for getting taregt url from KVM --- openapitools.json | 7 ++++ .../policies/ServiceCallout.GetTargetsKvm.xml | 42 +++++++++++-------- .../jsc/TargetsKVMResponseHandling.js | 7 ++++ 3 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 openapitools.json create mode 100644 proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js diff --git a/openapitools.json b/openapitools.json new file mode 100644 index 00000000..4053ae89 --- /dev/null +++ b/openapitools.json @@ -0,0 +1,7 @@ +{ + "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", + "spaces": 2, + "generator-cli": { + "version": "7.0.1" + } +} diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index be20aba4..b74f769b 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -1,19 +1,27 @@ - - 55000 - - - GET - - - false - - private.config_raw - - - true - - https://api.enterprise.apigee.com/v1/organizations/{{APIGEE_ORG_NAME}}/environments/{{APIGEE_ENVIRONMENT}}/key-value-maps/booking-and-referrals-targets/entries/Targets - - + + 55000 + + + GET + https://api.enterprise.apigee.com/v1/organizations/nhsd-nonprod/environments/{{APIGEE_ENVIRONMENT}}/key-value-maps/booking-and-referrals-targets/entries/Targets + + false + + + + TargetsKVMResponseHandling.js + + + + url + myExtractedURL + + private.config_raw + + + true + + + diff --git a/proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js b/proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js new file mode 100644 index 00000000..337d28bd --- /dev/null +++ b/proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js @@ -0,0 +1,7 @@ +var responseBody = response.body.asJson; + +if (responseBody && responseBody.targets) { + var extractedTarget = responseBody.targets; + + context.setVariable("myExtractedURL", extractedTarget); +} \ No newline at end of file From 97317124ef4b9e437511dbece5dacc3eb36e75de Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Sun, 15 Oct 2023 22:06:34 +0100 Subject: [PATCH 03/16] Hardcoding url and adding Javascript policy for extarcting terget --- .../policies/Javascript.TargetsKVMResponseHandling.xml | 6 ++++++ .../live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml diff --git a/proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml b/proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml new file mode 100644 index 00000000..83e49e9a --- /dev/null +++ b/proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml @@ -0,0 +1,6 @@ + + + Javascript.TargetsKVMResponseHandling + + jsc://TargetsKVMResponseHandling.xml.js + diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index b74f769b..1e3fe85b 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -4,7 +4,7 @@ GET - https://api.enterprise.apigee.com/v1/organizations/nhsd-nonprod/environments/{{APIGEE_ENVIRONMENT}}/key-value-maps/booking-and-referrals-targets/entries/Targets + https://api.enterprise.apigee.com/v1/organizations/nhsd-nonprod/environments/internal-dev/key-value-maps/booking-and-referrals-targets/entries/Targets false From 40fddbc6361069c074901b87fb8f19dac5a321db Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Mon, 16 Oct 2023 09:43:03 +0100 Subject: [PATCH 04/16] Adding refs so TargetURL can be piped dynamically --- .../apiproxy/policies/ServiceCallout.GetTargetsKvm.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index 1e3fe85b..c805b2fd 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -4,7 +4,7 @@ GET - https://api.enterprise.apigee.com/v1/organizations/nhsd-nonprod/environments/internal-dev/key-value-maps/booking-and-referrals-targets/entries/Targets + https://api.enterprise.apigee.com/v1/organizations/nhsd-nonprod/environments/internal-dev/keyvaluemaps/booking-and-referrals-targets false @@ -15,13 +15,12 @@ url - myExtractedURL + myExtractedURL - private.config_raw true - + myExtractedURL From 12fe1278ac9cb2283bb26c36866e6175004f755b Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Mon, 16 Oct 2023 12:50:18 +0100 Subject: [PATCH 05/16] removing unsused JS plicies, updating assignMessage policy and GetTargetsKVM --- .../apiproxy/policies/AssignMessage.Targets.xml | 14 ++++++++------ .../Javascript.TargetsKVMResponseHandling.xml | 6 ------ .../policies/ServiceCallout.GetTargetsKvm.xml | 13 ++----------- .../resources/jsc/TargetsKVMResponseHandling.js | 7 ------- proxies/live/apiproxy/targets/bref-target.xml | 4 ++++ 5 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml delete mode 100644 proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml index 022d2d6c..b522061d 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml @@ -1,7 +1,9 @@ - - false - - targets - private.config_raw.content - + + booking-and-referrals-target-url + + + booking-and-referrals-targets.targets + + + diff --git a/proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml b/proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml deleted file mode 100644 index 83e49e9a..00000000 --- a/proxies/live/apiproxy/policies/Javascript.TargetsKVMResponseHandling.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Javascript.TargetsKVMResponseHandling - - jsc://TargetsKVMResponseHandling.xml.js - diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index c805b2fd..e85c46a7 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -4,23 +4,14 @@ GET - https://api.enterprise.apigee.com/v1/organizations/nhsd-nonprod/environments/internal-dev/keyvaluemaps/booking-and-referrals-targets + booking-and-referrals-target-url false - - - TargetsKVMResponseHandling.js - - - - url - myExtractedURL - true - myExtractedURL + booking-and-referrals-target-url diff --git a/proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js b/proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js deleted file mode 100644 index 337d28bd..00000000 --- a/proxies/live/apiproxy/resources/jsc/TargetsKVMResponseHandling.js +++ /dev/null @@ -1,7 +0,0 @@ -var responseBody = response.body.asJson; - -if (responseBody && responseBody.targets) { - var extractedTarget = responseBody.targets; - - context.setVariable("myExtractedURL", extractedTarget); -} \ No newline at end of file diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml index 7e684ad8..aaa03ea0 100644 --- a/proxies/live/apiproxy/targets/bref-target.xml +++ b/proxies/live/apiproxy/targets/bref-target.xml @@ -20,6 +20,10 @@ ServiceCallout.GetTargetsKvm targets = null + + ServiceCallout.GetTargetsKvm + targets = null + PopulateCache.Targets targets = null From 4f8efc447d38a38791bfc67bd2689ede3028a052 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Mon, 16 Oct 2023 13:23:46 +0100 Subject: [PATCH 06/16] Altering policies to use a KVM policy to get the target URL iinstead of assignnmessage --- .../live/apiproxy/policies/AssignMessage.Targets.xml | 10 +++++++++- proxies/live/apiproxy/policies/KVM.GetTargets.xml | 11 +++++++++++ .../policies/ServiceCallout.GetTargetsKvm.xml | 8 ++++++-- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 proxies/live/apiproxy/policies/KVM.GetTargets.xml diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml index b522061d..627e3d90 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml @@ -2,7 +2,15 @@ booking-and-referrals-target-url - booking-and-referrals-targets.targets + + request.queryparam.targets != null + + request.queryparam.targets + + + booking-and-referrals-targets.targets + + diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml new file mode 100644 index 00000000..c1126763 --- /dev/null +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -0,0 +1,11 @@ + + + KVM.GetNrlfConfig + false + 300 + + + targets + + + \ No newline at end of file diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index e85c46a7..c159f218 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -1,10 +1,13 @@ + 55000 GET - booking-and-referrals-target-url + + request.queryparam.targets + false @@ -12,6 +15,7 @@ true - booking-and-referrals-target-url + request.queryparam.url + From 00b30cf63fa7c072497ae89fe823aa92ef5e8d66 Mon Sep 17 00:00:00 2001 From: ewan-IW <113019175+ewan-IW@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:49:03 +0100 Subject: [PATCH 07/16] Delete openapitools.json --- openapitools.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 openapitools.json diff --git a/openapitools.json b/openapitools.json deleted file mode 100644 index 4053ae89..00000000 --- a/openapitools.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", - "spaces": 2, - "generator-cli": { - "version": "7.0.1" - } -} From e48e844a2282dbad5562c66f7ea084e866eabfff Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Mon, 16 Oct 2023 18:48:41 +0100 Subject: [PATCH 08/16] Puttin KVM.GetTargets policy into proxy targetflow --- proxies/live/apiproxy/policies/KVM.GetTargets.xml | 2 +- proxies/live/apiproxy/targets/bref-target.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml index c1126763..e6ac4514 100644 --- a/proxies/live/apiproxy/policies/KVM.GetTargets.xml +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -1,6 +1,6 @@ - KVM.GetNrlfConfig + KVM.GetTaregts false 300 diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml index aaa03ea0..ff10b00d 100644 --- a/proxies/live/apiproxy/targets/bref-target.xml +++ b/proxies/live/apiproxy/targets/bref-target.xml @@ -16,6 +16,10 @@ Javascript.CheckTargets targets != null + + KVM.GetTargets + targets = null + ServiceCallout.GetTargetsKvm targets = null From e3b15ead868360ff28e04a69d4949a41f1271b9f Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Mon, 16 Oct 2023 23:49:32 +0100 Subject: [PATCH 09/16] Adding target url variable and completing url input --- proxies/live/apiproxy/policies/KVM.GetTargets.xml | 2 +- .../apiproxy/policies/ServiceCallout.GetTargetsKvm.xml | 8 ++------ proxies/live/apiproxy/targets/bref-target.xml | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml index e6ac4514..083250bb 100644 --- a/proxies/live/apiproxy/policies/KVM.GetTargets.xml +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -3,7 +3,7 @@ KVM.GetTaregts false 300 - + targets diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index c159f218..5af48ce3 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -1,21 +1,17 @@ - 55000 GET - - request.queryparam.targets - + false - false true - request.queryparam.url + https://target-url diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml index ff10b00d..2182d947 100644 --- a/proxies/live/apiproxy/targets/bref-target.xml +++ b/proxies/live/apiproxy/targets/bref-target.xml @@ -18,7 +18,6 @@ KVM.GetTargets - targets = null ServiceCallout.GetTargetsKvm From 50af66657e18e343ff41d44f507949c344f6def8 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Tue, 17 Oct 2023 00:04:37 +0100 Subject: [PATCH 10/16] Piping in url dynamically with variable instead of ref --- proxies/live/apiproxy/policies/KVM.GetTargets.xml | 2 +- .../live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml index 083250bb..2e9f3962 100644 --- a/proxies/live/apiproxy/policies/KVM.GetTargets.xml +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -1,6 +1,6 @@ - KVM.GetTaregts + KVM.GetTargets false 300 diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index 5af48ce3..fb9ec514 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -8,10 +8,7 @@ - - true - - https://target-url + https://{target-url} From ee1ed3bb05b61e775134739706a9d18fad50b786 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Tue, 17 Oct 2023 09:32:11 +0100 Subject: [PATCH 11/16] Restructuring proxy flow to assign dynamic url to targets --- .../policies/AssignMessage.Targets.xml | 23 +++++-------------- .../live/apiproxy/policies/KVM.GetTargets.xml | 2 +- .../policies/ServiceCallout.GetTargetsKvm.xml | 3 ++- proxies/live/apiproxy/targets/bref-target.xml | 4 ---- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml index 627e3d90..7be33db5 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml @@ -1,17 +1,6 @@ - - booking-and-referrals-target-url - - - - request.queryparam.targets != null - - request.queryparam.targets - - - booking-and-referrals-targets.targets - - - - - - + + false + + targets + private.config_raw.content + \ No newline at end of file diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml index 2e9f3962..47c18383 100644 --- a/proxies/live/apiproxy/policies/KVM.GetTargets.xml +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -3,7 +3,7 @@ KVM.GetTargets false 300 - + targets diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index fb9ec514..5d56ef21 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -7,8 +7,9 @@ false + private.config_raw - https://{target-url} + https://{targets} diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml index 2182d947..b786a932 100644 --- a/proxies/live/apiproxy/targets/bref-target.xml +++ b/proxies/live/apiproxy/targets/bref-target.xml @@ -18,14 +18,10 @@ KVM.GetTargets - - - ServiceCallout.GetTargetsKvm targets = null ServiceCallout.GetTargetsKvm - targets = null PopulateCache.Targets From b07ecce25c938f51671d053c1df3d6eeae4fa26d Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Tue, 17 Oct 2023 09:42:51 +0100 Subject: [PATCH 12/16] Adding missed closing tag for xml file --- proxies/live/apiproxy/policies/AssignMessage.Targets.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml index 7be33db5..7dab3f41 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml @@ -3,4 +3,5 @@ targets private.config_raw.content - \ No newline at end of file + + \ No newline at end of file From db45d6ac3f2aad60ba5288721e0208128a3304a3 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Wed, 18 Oct 2023 09:13:27 +0100 Subject: [PATCH 13/16] Aligning code with BaRS before PR --- openapitools.json | 7 +++++++ package.json | 2 +- proxies/live/apiproxy/policies/AssignMessage.Targets.xml | 1 + proxies/live/apiproxy/policies/KVM.GetTargets.xml | 2 +- .../apiproxy/policies/ServiceCallout.GetTargetsKvm.xml | 7 +++---- proxies/live/apiproxy/resources/jsc/UnpackVars.js | 2 +- proxies/live/apiproxy/targets/bref-target.xml | 3 +-- tests/test_process_message.py | 1 + 8 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 openapitools.json diff --git a/openapitools.json b/openapitools.json new file mode 100644 index 00000000..4053ae89 --- /dev/null +++ b/openapitools.json @@ -0,0 +1,7 @@ +{ + "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", + "spaces": 2, + "generator-cli": { + "version": "7.0.1" + } +} diff --git a/package.json b/package.json index ef4b3481..8ff70ab0 100644 --- a/package.json +++ b/package.json @@ -17,4 +17,4 @@ "license-checker": "^25.0.1", "minimist": "^1.2.2" } -} +} \ No newline at end of file diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml index 7dab3f41..5a421079 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml @@ -1,3 +1,4 @@ + false diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml index 47c18383..405a78a4 100644 --- a/proxies/live/apiproxy/policies/KVM.GetTargets.xml +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -3,7 +3,7 @@ KVM.GetTargets false 300 - + targets diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index 5d56ef21..be79d52d 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -7,9 +7,8 @@ false - private.config_raw + calloutResponse - https://{targets} + https://{github_target_url} - - + \ No newline at end of file diff --git a/proxies/live/apiproxy/resources/jsc/UnpackVars.js b/proxies/live/apiproxy/resources/jsc/UnpackVars.js index 046cc9e0..009bbe80 100644 --- a/proxies/live/apiproxy/resources/jsc/UnpackVars.js +++ b/proxies/live/apiproxy/resources/jsc/UnpackVars.js @@ -1,3 +1,3 @@ var bookingReferralConfig = JSON.parse(context.getVariable("targets")); -set_variables("booking-and-referral-config", bookingReferralConfig) +set_variables("booking-and-referral-config", bookingReferralConfig); diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml index b786a932..9229c15c 100644 --- a/proxies/live/apiproxy/targets/bref-target.xml +++ b/proxies/live/apiproxy/targets/bref-target.xml @@ -22,14 +22,13 @@ ServiceCallout.GetTargetsKvm + targets = null PopulateCache.Targets - targets = null AssignMessage.Targets - targets = null Javascript.UnpackVars diff --git a/tests/test_process_message.py b/tests/test_process_message.py index f818ee8d..af1621dc 100644 --- a/tests/test_process_message.py +++ b/tests/test_process_message.py @@ -43,6 +43,7 @@ def test_create_process_message(self, get_token_client_credentials): @pytest.mark.process_message @pytest.mark.integration @pytest.mark.sandbox + @pytest.mark.debug def test_process_message_method_not_allowed(self, get_token_client_credentials): """ test to check to ensure only the post method is allowed From 91e14fafbd29a3ceb372ab69dfee1229e74335a5 Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Wed, 18 Oct 2023 11:56:12 +0100 Subject: [PATCH 14/16] Splitting path and domain parts of URL when making service callout --- .../policies/AssignMessage.Targets.xml | 12 +- .../live/apiproxy/policies/KVM.GetTargets.xml | 21 ++- .../policies/ServiceCallout.GetTargetsKvm.xml | 8 +- .../live/apiproxy/resources/jsc/UnpackVars.js | 2 +- proxies/live/apiproxy/targets/bref-target.xml | 139 +++++++++--------- 5 files changed, 97 insertions(+), 85 deletions(-) diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml index 5a421079..a500ec82 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml @@ -1,8 +1,8 @@ - - false - - targets - private.config_raw.content - + + false + + targets + private.config_raw.content + \ No newline at end of file diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml index 405a78a4..77bf349a 100644 --- a/proxies/live/apiproxy/policies/KVM.GetTargets.xml +++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml @@ -1,11 +1,16 @@ - KVM.GetTargets - false - 300 - - - targets - - + KVM.GetTargets + false + 300 + + + target-domain + + + + + target-path + + \ No newline at end of file diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml index be79d52d..776ccb2f 100644 --- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml +++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml @@ -4,11 +4,15 @@ GET + {target_path} false - calloutResponse + private.config_raw - https://{github_target_url} + + true + + https://{target_domain} \ No newline at end of file diff --git a/proxies/live/apiproxy/resources/jsc/UnpackVars.js b/proxies/live/apiproxy/resources/jsc/UnpackVars.js index 009bbe80..5751c79a 100644 --- a/proxies/live/apiproxy/resources/jsc/UnpackVars.js +++ b/proxies/live/apiproxy/resources/jsc/UnpackVars.js @@ -1,3 +1,3 @@ var bookingReferralConfig = JSON.parse(context.getVariable("targets")); -set_variables("booking-and-referral-config", bookingReferralConfig); +set_variables("booking-and-referral-config", bookingReferralConfig); \ No newline at end of file diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml index 9229c15c..a31332c7 100644 --- a/proxies/live/apiproxy/targets/bref-target.xml +++ b/proxies/live/apiproxy/targets/bref-target.xml @@ -1,72 +1,75 @@ + - - - - LookupCache.Targets - - - Python.DecodeBase64 - request.header.NHSD-Target-Identifier != null - - - Javascript.UnpackVars - targets != null - - - Javascript.CheckTargets - targets != null - - - KVM.GetTargets - targets = null - - - ServiceCallout.GetTargetsKvm - targets = null - - - PopulateCache.Targets - - - AssignMessage.Targets - - - Javascript.UnpackVars - - - Javascript.SetTargetUrl - - - RaiseFault.400MalformedTargetIdentifier - idMalformed = true - - - RaiseFault.404ProxyNotFound - isError = true - - - - - - ExtractVariables.OperationOutcomeCode - - - Javascript.HandleErrors - - - AssignMessage.SetErrorResponse - - - + + + + LookupCache.Targets + + + Python.DecodeBase64 + request.header.NHSD-Target-Identifier != null + + + Javascript.UnpackVars + targets != null + + + Javascript.CheckTargets + targets != null + + + KVM.GetTargets + targets = null + + + ServiceCallout.GetTargetsKvm + targets = null + + + PopulateCache.Targets + targets = null + + + AssignMessage.Targets + targets = null + + + Javascript.UnpackVars + + + Javascript.SetTargetUrl + + + RaiseFault.400MalformedTargetIdentifier + idMalformed = true + + + RaiseFault.404ProxyNotFound + isError = true + + + + + + ExtractVariables.OperationOutcomeCode + + + Javascript.HandleErrors + + + AssignMessage.SetErrorResponse + + + 32000 - https://mocktarget.apigee.net - - true - true - ref://bars-client - cert - - - + https://mocktarget.apigee.net + + true + true + ref://bars-client + cert + + + \ No newline at end of file From 2128409448c974e5dad8b69fe0a6fb3f51fb605b Mon Sep 17 00:00:00 2001 From: ewan-IW Date: Wed, 18 Oct 2023 12:15:34 +0100 Subject: [PATCH 15/16] Fixing raise fault name for sandbox --- .../sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml b/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml index 6f628b0f..a8251faa 100644 --- a/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml +++ b/proxies/sandbox/apiproxy/policies/RaiseFault.404PageNotFound.xml @@ -1,5 +1,5 @@ - + RaiseFault.404PageNotFound From de052258384196dbb3d3efe6d6a0e7ca49e2dee6 Mon Sep 17 00:00:00 2001 From: ewan-IW <113019175+ewan-IW@users.noreply.github.com> Date: Wed, 18 Oct 2023 12:17:38 +0100 Subject: [PATCH 16/16] Update test_process_message.py removing debug comment --- tests/test_process_message.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_process_message.py b/tests/test_process_message.py index af1621dc..f818ee8d 100644 --- a/tests/test_process_message.py +++ b/tests/test_process_message.py @@ -43,7 +43,6 @@ def test_create_process_message(self, get_token_client_credentials): @pytest.mark.process_message @pytest.mark.integration @pytest.mark.sandbox - @pytest.mark.debug def test_process_message_method_not_allowed(self, get_token_client_credentials): """ test to check to ensure only the post method is allowed