Skip to content

Changing GetTargetsKVM to get target paths from KVMs #228

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

Open
ewan-IW wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Changing GetTargetsKVM to get target paths from KVMs #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e904e7c
Changing GetTargetsKVM to get target paths from KVMs
Oct 13, 2023
634a828
Adding response handling for getting taregt url from KVM
Oct 13, 2023
9731712
Hardcoding url and adding Javascript policy for extarcting terget
Oct 15, 2023
40fddbc
Adding refs so TargetURL can be piped dynamically
Oct 16, 2023
12fe127
removing unsused JS plicies, updating assignMessage policy and GetTar…
Oct 16, 2023
4f8efc4
Altering policies to use a KVM policy to get the target URL iinstead …
Oct 16, 2023
00b30cf
Delete openapitools.json
ewan-IW Oct 16, 2023
e48e844
Puttin KVM.GetTargets policy into proxy targetflow
Oct 16, 2023
e3b15ea
Adding target url variable and completing url input
Oct 16, 2023
50af666
Piping in url dynamically with variable instead of ref
Oct 16, 2023
ee1ed3b
Restructuring proxy flow to assign dynamic url to targets
Oct 17, 2023
b07ecce
Adding missed closing tag for xml file
Oct 17, 2023
db45d6a
Aligning code with BaRS before PR
Oct 18, 2023
91e14fa
Splitting path and domain parts of URL when making service callout
Oct 18, 2023
2128409
Fixing raise fault name for sandbox
Oct 18, 2023
de05225
Update test_process_message.py removing debug comment
ewan-IW Oct 18, 2023
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 openapitools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
"spaces": 2,
"generator-cli": {
"version": "7.0.1"
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
"license-checker": "^25.0.1",
"minimist": "^1.2.2"
}
}
}
15 changes: 8 additions & 7 deletions proxies/live/apiproxy/policies/AssignMessage.Targets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<AssignMessage name='AssignMessage.Targets'>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignVariable>
<Name>targets</Name>
<Ref>private.config_raw.content</Ref>
</AssignVariable>
</AssignMessage>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<AssignMessage name="AssignMessage.Targets">
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
<AssignVariable>
<Name>targets</Name>
<Ref>private.config_raw.content</Ref>
</AssignVariable>
</AssignMessage>
16 changes: 16 additions & 0 deletions proxies/live/apiproxy/policies/KVM.GetTargets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<KeyValueMapOperations async="false" continueOnError="false" enabled="true" name="KVM.GetTargets" mapIdentifier="booking-and-referrals-targets">
<DisplayName>KVM.GetTargets</DisplayName>
<ExclusiveCache>false</ExclusiveCache>
<ExpiryTimeInSecs>300</ExpiryTimeInSecs>
<Get assignTo="target_domain">
<Key>
<Parameter>target-domain</Parameter>
</Key>
</Get>
<Get assignTo="target_path">
<Key>
<Parameter>target-path</Parameter>
</Key>
</Get>
</KeyValueMapOperations>
34 changes: 17 additions & 17 deletions proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<ServiceCallout async="false" continueOnError="false" enabled="true" name="ServiceCallout.GetTargetsKvm">
<!-- This is the default (55 seconds). Including it to make explicit. -->
<Timeout>55000</Timeout>
<Request>
<Set>
<Verb>GET</Verb>
<Path>NHSDigital/booking-and-referral-targets/master/targets/{{ APIGEE_ENVIRONMENT }}/targets.json</Path>
</Set>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
</Request>
<Response>private.config_raw</Response>
<HTTPTargetConnection>
<SSLInfo>
<Enabled>true</Enabled>
</SSLInfo>
<URL>https://raw.githubusercontent.com</URL>
</HTTPTargetConnection>
</ServiceCallout>
<Timeout>55000</Timeout>
<Request>
<Set>
<Verb>GET</Verb>
<Path>{target_path}</Path>
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
</Set>
</Request>
<Response>private.config_raw</Response>
<HTTPTargetConnection>
<SSLInfo>
<Enabled>true</Enabled>
</SSLInfo>
<URL>https://{target_domain}</URL>
</HTTPTargetConnection>
</ServiceCallout>
2 changes: 1 addition & 1 deletion proxies/live/apiproxy/resources/jsc/UnpackVars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
137 changes: 71 additions & 66 deletions proxies/live/apiproxy/targets/bref-target.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,75 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<TargetEndpoint name="booking-and-referral-target">
<PreFlow>
<Request>
<Step>
<Name>LookupCache.Targets</Name>
</Step>
<Step>
<Name>Python.DecodeBase64</Name>
<Condition>request.header.NHSD-Target-Identifier != null</Condition>
</Step>
<Step>
<Name>Javascript.UnpackVars</Name>
<Condition>targets != null</Condition>
</Step>
<Step>
<Name>Javascript.CheckTargets</Name>
<Condition>targets != null</Condition>
</Step>
<Step>
<Name>ServiceCallout.GetTargetsKvm</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>PopulateCache.Targets</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>AssignMessage.Targets</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>Javascript.UnpackVars</Name>
</Step>
<Step>
<Name>Javascript.SetTargetUrl</Name>
</Step>
<Step>
<Name>RaiseFault.400MalformedTargetIdentifier</Name>
<Condition>idMalformed = true</Condition>
</Step>
<Step>
<Name>RaiseFault.404ProxyNotFound</Name>
<Condition>isError = true</Condition>
</Step>
</Request>
</PreFlow>
<DefaultFaultRule>
<Step>
<Name>ExtractVariables.OperationOutcomeCode</Name>
</Step>
<Step>
<Name>Javascript.HandleErrors</Name>
</Step>
<Step>
<Name>AssignMessage.SetErrorResponse</Name>
</Step>
</DefaultFaultRule>
<HTTPTargetConnection>
<PreFlow>
<Request>
<Step>
<Name>LookupCache.Targets</Name>
</Step>
<Step>
<Name>Python.DecodeBase64</Name>
<Condition>request.header.NHSD-Target-Identifier != null</Condition>
</Step>
<Step>
<Name>Javascript.UnpackVars</Name>
<Condition>targets != null</Condition>
</Step>
<Step>
<Name>Javascript.CheckTargets</Name>
<Condition>targets != null</Condition>
</Step>
<Step>
<Name>KVM.GetTargets</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>ServiceCallout.GetTargetsKvm</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>PopulateCache.Targets</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>AssignMessage.Targets</Name>
<Condition>targets = null</Condition>
</Step>
<Step>
<Name>Javascript.UnpackVars</Name>
</Step>
<Step>
<Name>Javascript.SetTargetUrl</Name>
</Step>
<Step>
<Name>RaiseFault.400MalformedTargetIdentifier</Name>
<Condition>idMalformed = true</Condition>
</Step>
<Step>
<Name>RaiseFault.404ProxyNotFound</Name>
<Condition>isError = true</Condition>
</Step>
</Request>
</PreFlow>
<DefaultFaultRule>
<Step>
<Name>ExtractVariables.OperationOutcomeCode</Name>
</Step>
<Step>
<Name>Javascript.HandleErrors</Name>
</Step>
<Step>
<Name>AssignMessage.SetErrorResponse</Name>
</Step>
</DefaultFaultRule>
<HTTPTargetConnection>
<Properties>
<Property name="io.timeout.millis">32000</Property>
</Properties>
<URL>https://mocktarget.apigee.net</URL>
<SSLInfo>
<Enabled>true</Enabled>
<ClientAuthEnabled>true</ClientAuthEnabled>
<KeyStore>ref://bars-client</KeyStore>
<KeyAlias>cert</KeyAlias>
</SSLInfo>
</HTTPTargetConnection>
</TargetEndpoint>
<URL>https://mocktarget.apigee.net</URL>
<SSLInfo>
<Enabled>true</Enabled>
<ClientAuthEnabled>true</ClientAuthEnabled>
<KeyStore>ref://bars-client</KeyStore>
<KeyAlias>cert</KeyAlias>
</SSLInfo>
</HTTPTargetConnection>
</TargetEndpoint>