Skip to content

Commit dca84de

Browse files
RajaGovindharaj16RajaGovindharaj16
authored
Merge pull request #98 from NHSDigital/feature/apim-release-nft
Feature/apim release nft
2 parents 698dd2d + 7ca56c7 commit dca84de

File tree

9 files changed

+61
-12
lines changed

9 files changed

+61
-12
lines changed

‎azure/azure-release-pipeline.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@ extends:
8989
make_spec_visible: true
9090
depends_on:
9191
- manual_approval_int
92+
- environment: manual-approval
93+
stage_name: manual_approval_nft2
94+
- environment: ref
95+
stage_name: ers_nft2_release
96+
make_spec_visible: true
97+
depends_on:
98+
- manual_approval_nft2
9299
- environment: internal-qa-sandbox
93100
proxy_path: sandbox
94101
depends_on:

‎proxies/live/apiproxy/policies/AssignMessage.AddBaseUrlHeader.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddBaseUrlHeader">
2+
<Set>
3+
<Headers>
4+
<Header name="x-ers-network-baseurl">https://{request.header.Host}/{proxy.basepath}</Header>
5+
</Headers>
6+
</Set>
7+
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
8+
<AssignTo createNew="false"/>
9+
</AssignMessage>

‎proxies/live/apiproxy/policies/AssignMessage.SpikeArrestErrorResponse.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<AssignMessage continueOnError="false" enabled="true" name="AssignMessage.SpikeArrestErrorResponse">
2+
<DisplayName>AssignMessage.SpikeArrestErrorResponse</DisplayName>
3+
<Remove>
4+
<Payload>true</Payload>
5+
</Remove>
6+
<AssignTo createNew="false" type="response"/>
7+
</AssignMessage>

‎proxies/live/apiproxy/policies/Quota.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎proxies/live/apiproxy/policies/SpikeArrest.Binary.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<SpikeArrest continueOnError="false" enabled="true" name="SpikeArrest.Binary">
3+
<DisplayName>SpikeArrest.Binary</DisplayName>
4+
<Identifier ref="app.asid"/>
5+
<Rate ref="app.ratelimit.binary">2ps</Rate>
6+
<UseEffectiveCount>true</UseEffectiveCount>
7+
</SpikeArrest>
8+

‎proxies/live/apiproxy/policies/SpikeArrest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<SpikeArrest name="SpikeArrest">
2+
<SpikeArrest continueOnError="false" enabled="true" name="SpikeArrest">
33
<DisplayName>SpikeArrest</DisplayName>
4-
<Rate ref="apiproduct.ratelimit">5ps</Rate>
4+
<Identifier ref="app.asid"/>
5+
<Rate ref="app.ratelimit">10ps</Rate>
6+
<UseEffectiveCount>true</UseEffectiveCount>
57
</SpikeArrest>
68

‎proxies/live/apiproxy/targets/ers-target.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,26 @@
99
</Step>
1010
<Condition>oauthV2.OauthV2.VerifyAccessToken.failed</Condition>
1111
</FaultRule>
12+
<FaultRule name="spike_arrest_fault">
13+
<Step>
14+
<Name>AssignMessage.SpikeArrestErrorResponse</Name>
15+
</Step>
16+
<Condition>(fault.name Matches "SpikeArrestViolation")</Condition>
17+
</FaultRule>
1218
</FaultRules>
1319
<PreFlow>
1420
<Request>
1521
<Step>
16-
<Name>Quota</Name>
22+
<Name>OauthV2.VerifyAccessToken</Name>
1723
</Step>
1824
<Step>
25+
<!-- Should use Java Regex for non binary request -->
26+
<Condition>(proxy.pathsuffix Not Matches "/**/Binary/*")</Condition>
1927
<Name>SpikeArrest</Name>
2028
</Step>
2129
<Step>
22-
<Name>OauthV2.VerifyAccessToken</Name>
30+
<Condition>(proxy.pathsuffix MatchesPath "/**/Binary/*")</Condition>
31+
<Name>SpikeArrest.Binary</Name>
2332
</Step>
2433
<Step>
2534
<Name>AssignMessage.PopulateAsidFromApp</Name>
@@ -30,6 +39,9 @@
3039
<Step>
3140
<Name>AssignMessage.RemoveAndAddUserIdHeader</Name>
3241
</Step>
42+
<Step>
43+
<Name>AssignMessage.AddBaseUrlHeader</Name>
44+
</Step>
3345
<Step>
3446
<Name>AssignMessage.Swap.nhsd-ers-ods-code</Name>
3547
<Condition>(request.header.nhsd-ers-ods-code ~~ ".+")</Condition>

‎proxies/sandbox/apiproxy/policies/AssignMessage.AddBaseUrlHeader.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<AssignMessage async="false" continueOnError="false" enabled="true" name="AssignMessage.AddBaseUrlHeader">
2+
<Add>
3+
<Headers>
4+
<Header name="x-ers-network-baseurl">https://{request.header.Host}/{proxy.basepath}</Header>
5+
</Headers>
6+
</Add>
7+
<IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
8+
<AssignTo createNew="false"/>
9+
</AssignMessage>

‎proxies/sandbox/apiproxy/targets/sandbox.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<Step>
1313
<Name>AssignMessage.AddCors</Name>
1414
</Step>
15+
<Step>
16+
<Name>AssignMessage.AddBaseUrlHeader</Name>
17+
</Step>
1518
</Response>
1619
</PreFlow>
1720
<HTTPTargetConnection>

0 commit comments

Comments
 (0)