Merge pull request #67 from NHSDigital/apm-3416-timeout

APM-3416 Increase sync-wrap timeout to 59 seconds

Author: dominicplatt2-nhs

azure/azure-pr-pipeline.yml

@@ -33,8 +33,6 @@ extends:
     service_name: ${{ variables.service_name }}
     service_base_path: ${{ variables.service_base_path }}
     short_service_name: ${{ variables.short_service_name }}
-    product_display_name: ${{ variables.product_display_name }}
-    product_description: ${{ variables.product_description }}
     apigee_deployments:
       - environment: internal-dev
         post_deploy:

azure/azure-release-pipeline.yml

@@ -31,8 +31,6 @@ extends:
     service_name: ${{ variables.service_name }}
     short_service_name: ${{ variables.short_service_name }}
     service_base_path: ${{ variables.service_base_path }}
-    product_display_name: ${{ variables.product_display_name }}
-    product_description: ${{ variables.product_description }}
     enable_monitoring: true
     enable_status_monitoring: true
     apigee_deployments:

docker/_shared/Makefile

@@ -11,7 +11,7 @@ clean:
 	rm -rf ./node_modules
 
 install:
-	npm install --include=dev
+	npm install --include=dev --legacy-peer-deps
 
 update:
 	npm update

docker/async-slowapp/package-lock.json

@@ -163,23 +163,23 @@ describe("express with postman-echo", function () {
             .get("/delay/3")
             .set("x-sync-wait", "eek")
             .set("Accept", "application/json")
-            .expect(400, {err: "x-sync-wait should be a number between 0.25 and 29"}, done);
+            .expect(400, {err: "x-sync-wait should be a number between 0.25 and 59"}, done);
     });
 
     it("it validates x-sync-wait is > lower bound", (done) => {
         request(server)
             .get("/delay/3")
             .set("x-sync-wait", "0.0001")
             .set("Accept", "application/json")
-            .expect(400, {err: "x-sync-wait should be a number between 0.25 and 29"}, done);
+            .expect(400, {err: "x-sync-wait should be a number between 0.25 and 59"}, done);
     });
 
     it("it validates x-sync-wait is < upper bound", (done) => {
         request(server)
             .get("/delay/3")
-            .set("x-sync-wait", "30")
+            .set("x-sync-wait", "60")
             .set("Accept", "application/json")
-            .expect(400, {err: "x-sync-wait should be a number between 0.25 and 29"}, done);
+            .expect(400, {err: "x-sync-wait should be a number between 0.25 and 59"}, done);
     });
 
     it("it times out if x-sync-wait shorter than initial response", (done) => {

docker/sync-wrap/package-lock.json

@@ -335,16 +335,16 @@ async function proxy(req, res, next) {
         if(isNaN(syncWait)){
             res.status(400);
             res.json({
-                err: "x-sync-wait should be a number between 0.25 and 29"
+                err: "x-sync-wait should be a number between 0.25 and 59"
             });
             next();
             return;
         }
         syncWait = parseFloat(syncWait);
-        if (syncWait < 0.25 || syncWait > 29) {
+        if (syncWait < 0.25 || syncWait > 59) {
             res.status(400);
             res.json({
-                err: "x-sync-wait should be a number between 0.25 and 29"
+                err: "x-sync-wait should be a number between 0.25 and 59"
             });
             next();
             return;

docker/sync-wrap/src/app.postman.spec.js

@@ -3,5 +3,8 @@
   <PreFlow/>
   <HTTPTargetConnection>
     {{ HOSTED_TARGET_CONNECTION }}
+    <Properties>
+      <Property name="io.timeout.millis">65000</Property>
+    </Properties>
   </HTTPTargetConnection>
 </TargetEndpoint>