Merge pull request #1427 from NHSDigital/develop

APIM-R 1.30 Cut

Author: nhsd-david-wass

package-lock.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/e-referrals-service-api",
   "dependencies": {
-    "@redocly/cli": "^1.7.0"
+    "@redocly/cli": "^1.8.2"
   },
   "devDependencies": {
     "apigeetool": "^0.16.4",

package.json

@@ -22,25 +22,25 @@
             <Step>
                 <Name>AssignMessage.RatelimitOperationOutcomeResponse</Name>
             </Step>
-            <Condition>((ratelimit.SpikeArrest.Binary.failed = true) or (ratelimit.SpikeArrestPerApp.failed = true)) and (isFhirR4Path = true)</Condition>
+            <Condition>(ratelimit.SpikeArrestPerApp.failed = true) and (isFhirR4Path = true)</Condition>
         </FaultRule>
         <FaultRule name="quota_fault_fhir_r4">
             <Step>
                 <Name>AssignMessage.RatelimitOperationOutcomeResponse</Name>
             </Step>
-            <Condition>((ratelimit.Quota.Binary.failed = true) or (ratelimit.QuotaPerApp.failed = true)) and (isFhirR4Path = true)</Condition>
+            <Condition>(ratelimit.QuotaPerApp.failed = true) and (isFhirR4Path = true)</Condition>
         </FaultRule>
         <FaultRule name="spike_arrest_fault">
             <Step>
                 <Name>AssignMessage.SpikeArrestErrorResponse</Name>
             </Step>
-            <Condition>((ratelimit.SpikeArrest.Binary.failed = true) or (ratelimit.SpikeArrestPerApp.failed = true) and (isFhirR4Path = false)</Condition>
+            <Condition>(ratelimit.SpikeArrestPerApp.failed = true) and (isFhirR4Path = false)</Condition>
         </FaultRule>
         <FaultRule name="quota_fault">
             <Step>
                 <Name>AssignMessage.QuotaErrorResponse</Name>
             </Step>
-            <Condition>((ratelimit.Quota.Binary.failed = true) or (ratelimit.QuotaPerApp.failed = true)) and (isFhirR4Path = false)</Condition>
+            <Condition>(ratelimit.QuotaPerApp.failed = true) and (isFhirR4Path = false)</Condition>
         </FaultRule>
     </FaultRules>
     <PreFlow>
@@ -63,20 +63,6 @@
             <Step>
                 <Name>AssignMessage.AddBaseUrlHeader</Name>
             </Step>
-            <Step>
-                <Name>AssignMessage.SetBinaryRateLimitIdentifier</Name>
-            </Step>
-            <Step>
-                <Name>javascript.IsBinaryPath</Name>
-            </Step>
-            <Step>
-                <Condition>(isBinaryPath = true)</Condition>
-                <Name>SpikeArrest.Binary</Name>
-            </Step>
-            <Step>
-                <Condition>(isBinaryPath = true)</Condition>
-                <Name>Quota.Binary</Name>
-            </Step>
             <Step>
                 <Name>FlowCallout.ApplyRateLimiting</Name>
             </Step>

poetry.lock

@@ -25,7 +25,7 @@ pyyaml = "^6.0"
 docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^3.0.2"
-gitpython = "^3.1.41"
+gitpython = "^3.1.42"
 lxml = "^4.9.4"
 xmlformatter = "^0.2.6"
 pytest-check = "^2.2.3"
@@ -35,12 +35,12 @@ openapi-core = "^0.18.2"
 
 [tool.poetry.dev-dependencies]
 flake8 = "^5.0.4"
-black = "^23.12"
+black = "^24.1"
 pip-licenses = "^4.3.4"
 jinja2 = "^3.1.3"
 pytest = "^6.1.2"
 pytest-asyncio = "^0.20.3"
-pytest-nhsd-apim = "^3.3.11"
+pytest-nhsd-apim = "^3.3.12"
 
 [tool.poetry.scripts]