apm-1486: switch to egress proxy

Author: matt-mercer

docker/async-slowapp/package-lock.json

@@ -14,7 +14,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "chai": "^4 .2.0",
+    "chai": "^4.2.0",
     "mocha": "^7.2.0",
     "mocha-junit-reporter": "^1.23.3",
     "mocha-multi": "^1.1.3",

docker/sync-wrap/package-lock.json

@@ -19,7 +19,7 @@ describe("express with google upstream and botli decompress", function () {
         env = process.env;
         let app = require("./app");
         app.setup({
-            UPSTREAM: "https://www.google.co.uk",
+            UPSTREAM: "www.google.co.uk",
             LOG_LEVEL: "DEBUG",
             UNBOTLI: "true"
         });
@@ -88,7 +88,11 @@ describe("express with google upstream without botli decompress", function () {
         env = process.env;
 
         let app = require("./app");
-        app.setup({UPSTREAM: "https://www.google.co.uk", LOG_LEVEL: (process.env.NODE_ENV === "test" ? "warn": "debug"), UNBOTLI: "false"});
+        app.setup({
+            UPSTREAM: "www.google.co.uk",
+            LOG_LEVEL: (process.env.NODE_ENV === "test" ? "warn": "debug"),
+            UNBOTLI: "false"
+        });
         server = app.start();
     });
 

docker/sync-wrap/package.json

@@ -5,10 +5,26 @@ const app = express();
 const log = require("loglevel");
 const uuid = require('uuid');
 
+
+function stripchars(str, chars) {
+    var start = 0,  end = str.length;
+
+    while(start < end && chars.indexOf(str[start]) >= 0)
+        ++start;
+
+    while(end > start && chars.indexOf(str[end - 1]) >= 0)
+        --end;
+
+    return (start > 0 || end < str.length) ? str.substring(start, end) : str;
+}
+
+
 function setup(options) {
     options = options || {};
     app.locals.app_name = options.APP_NAME || 'sync-wrap';
-    app.locals.upstream = new URL(options.UPSTREAM || "http://localhost:9003");
+    let upstream = stripchars(options.UPSTREAM || 'http://localhost:9003', ': /');
+    upstream = upstream.startsWith('http') ? upstream : `https://${upstream}`
+    app.locals.upstream = new URL(upstream);
     app.locals.version_info = JSON.parse(options.VERSION_INFO || '{}');
     app.locals.base_path = app.locals.upstream.pathname === "/" ? "" : app.locals.upstream.pathname;
     log.setLevel(options.LOG_LEVEL || "info");

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

@@ -10,7 +10,11 @@ describe("express with fake domain", function () {
     before(function () {
         env = process.env;
         let app = require("./app");
-        app.setup({UPSTREAM: "https://localhost:1234", ALLOW_INSECURE: "true", LOG_LEVEL: (process.env.NODE_ENV === "test" ? "warn": "debug")});
+        app.setup({
+            UPSTREAM: "localhost:1234",
+            ALLOW_INSECURE: "true",
+            LOG_LEVEL: (process.env.NODE_ENV === "test" ? "warn": "debug")
+        });
         server = app.start();
     });
 
@@ -38,7 +42,10 @@ describe("express with postman-echo", function () {
     before(function () {
         env = process.env;
         let app = require("./app");
-        app.setup({UPSTREAM: "https://postman-echo.com", LOG_LEVEL: (process.env.NODE_ENV === "test" ? "warn": "debug")});
+        app.setup({
+            UPSTREAM: "postman-echo.com",
+            LOG_LEVEL: (process.env.NODE_ENV === "test" ? "warn": "debug")
+        });
         server = app.start();
     });
 

docker/sync-wrap/src/app.js

@@ -1,9 +1,16 @@
+[project]
+python = "^3.8"
+
 [tool.poetry]
 name = "async-slowapp-e2e"
 version = "0.1.0"
 description = ""
 authors = ["Matthew Mercer <matt.mercer@nhs.net>"]
+readme = 'README.md'
 license = "MIT"
+repository = "https://github.com/NHSDigital/sync-wrap"
+homepage = ""
+keywords = ["nhs"]
 
 [tool.poetry.dependencies]
 python = "^3.8"

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

@@ -22,10 +22,11 @@ docker_service:
         value: production
       - name: LOG_LEVEL
         value: "{{ 'debug' if APIGEE_ENVIRONMENT == 'internal-dev' else 'info' }}"
-      - name: UPSTREAM
-        value: "{{ apigee_uri }}"
       - name: VERSION_INFO
         value: "{{ version_info | to_json }}"
+    secrets:
+      - name: UPSTREAM
+        valueFrom: "/{{ account }}/platform-common/egress/hosts/apigee-{{ APIGEE_ENVIRONMENT }}"
     health_check:
       matcher: "200"
       path: "/_ping"