Merge pull request #1665 from navikt/graceful_proxy

bump http-proxy-middleware til 3.0.0-beta.1 fro graceful shutdown av proxy
navikt · Sep 1, 2023 · 6d12379 · 6d12379
2 parents 9305a8f + ab91d3c
commit 6d12379
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 117 deletions.
diff --git a/nais/dev-gcp.yaml b/nais/dev-gcp.yaml
@@ -32,8 +32,6 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.intern.dev.nav.no/min-side-arbeidsgiver/oauth2/login
     - name: PROXY_LOG_LEVEL

diff --git a/nais/labs-gcp.yaml b/nais/labs-gcp.yaml
@@ -26,8 +26,6 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://demo-min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.ekstern.dev.nav.no/fake-login/login?issuer=selvbetjening&sub=123456789&domain=arbeidsgiver.ekstern.dev.nav.no&redirect=https://arbeidsgiver.ekstern.dev.nav.no/min-side-arbeidsgiver/
     - name: PROXY_LOG_LEVEL

diff --git a/nais/prod-gcp.yaml b/nais/prod-gcp.yaml
@@ -32,8 +32,6 @@ spec:
   env:
     - name: NODE_EXTRA_CA_CERTS
       value: /etc/ssl/ca-bundle.pem
-    - name: BACKEND_API_URL
-      value: http://min-side-arbeidsgiver-api.fager
     - name: LOGIN_URL
       value: https://arbeidsgiver.nav.no/min-side-arbeidsgiver/oauth2/login
     - name: PROXY_LOG_LEVEL

diff --git a/server/mock/antallArbeidsforholdMock.js b/server/mock/antallArbeidsforholdMock.js
@@ -1,9 +1,12 @@
 export const mock = (app) => {
-    app.use('/min-side-arbeidsgiver/antall-arbeidsforhold', (req, res) => {
-        const antall = 502;
-        const missing = Math.floor(Math.random() * 10) === 0;
-        setTimeout(() => {
-            res.send({ first: '131488434', second: missing ? -1 : antall });
-        }, 1000);
-    });
+    app.use(
+        '/min-side-arbeidsgiver/arbeidsgiver-arbeidsforhold-api/antall-arbeidsforhold',
+        (req, res) => {
+            const antall = 502;
+            const missing = Math.floor(Math.random() * 10) === 0;
+            setTimeout(() => {
+                res.send({ first: '131488434', second: missing ? -1 : antall });
+            }, 1000);
+        }
+    );
 };
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -11,7 +11,7 @@
     "cookie-parser": "^1.4.6",
     "express": "^4.17.3",
     "express-http-proxy": "1.6.3",
-    "http-proxy-middleware": "^1.0.6",
+    "http-proxy-middleware": "3.0.0-beta.1",
     "jsdom": "^16.4.0",
     "mustache": "^4.2.0",
     "node-fetch": "^3.2.10",