From 068e6cd926d71eb1f9a7fceec92e0e3096076d88 Mon Sep 17 00:00:00 2001
From: Ken Gullaksen <ken.gullaksen@nav.no>
Date: Tue, 1 Feb 2022 08:57:43 +0100
Subject: [PATCH] =?UTF-8?q?ta=20i=20bruk=20esm=20import=20n=C3=A5=20som=20?=
 =?UTF-8?q?det=20er=20fikset=20i=20winston?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

i tillegg:
- fjernet --experimental-modules flagget siden Dockerfile nå kjører med node:16
- bumpet prom api og client pga deprecation warning:
```
(node:22932) [DEP0152] DeprecationWarning: Custom PerformanceEntry accessors are deprecated. Please use the detail property.
    at PerformanceObserver.<anonymous> (/Users/g161400/dev/git/ditt-nav-arbeidsgiver/server/node_modules/prom-client/lib/metrics/gc.js:42:38)
```

re:
- https://github.com/winstonjs/winston/releases/tag/v3.4.0
- https://github.com/winstonjs/winston/pull/2006
---
 server/package-lock.json | 19 +++++++++----------
 server/package.json      |  4 ++--
 server/server.js         |  6 +++---
 server/start.sh          | 13 +------------
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/server/package-lock.json b/server/package-lock.json
index 27e9d07..c05088b 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "server",
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
@@ -14,9 +13,9 @@
         "jsdom": "^16.7.0",
         "mustache-express": "^1.3.2",
         "node-fetch": "^3.1.1",
-        "prom-client": "^12.0.0",
-        "prometheus-api-metrics": "^3.1.0",
-        "winston": "^3.4.0"
+        "prom-client": "^13.2.0",
+        "prometheus-api-metrics": "^3.2.0",
+        "winston": "3.4.0"
       }
     },
     "node_modules/@dabh/diagnostics": {
@@ -1306,9 +1305,9 @@
       }
     },
     "node_modules/prom-client": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz",
-      "integrity": "sha512-JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz",
+      "integrity": "sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==",
       "dependencies": {
         "tdigest": "^0.1.1"
       },
@@ -2809,9 +2808,9 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prom-client": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz",
-      "integrity": "sha512-JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz",
+      "integrity": "sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==",
       "requires": {
         "tdigest": "^0.1.1"
       }
diff --git a/server/package.json b/server/package.json
index 8333a42..de20098 100644
--- a/server/package.json
+++ b/server/package.json
@@ -10,8 +10,8 @@
     "jsdom": "^16.7.0",
     "mustache-express": "^1.3.2",
     "node-fetch": "^3.1.1",
-    "prom-client": "^12.0.0",
-    "prometheus-api-metrics": "^3.1.0",
+    "prom-client": "^13.2.0",
+    "prometheus-api-metrics": "^3.2.0",
     "winston": "3.4.0"
   },
   "scripts": {
diff --git a/server/server.js b/server/server.js
index 3c97a6a..9c7fb0f 100644
--- a/server/server.js
+++ b/server/server.js
@@ -3,11 +3,11 @@ import fetch from 'node-fetch';
 import express from 'express';
 import mustacheExpress from 'mustache-express';
 import httpProxyMiddleware from "http-proxy-middleware";
+import {createLogger, transports, format} from 'winston';
 import jsdom from "jsdom";
 import Prometheus from "prom-client";
-import require from "./esm-require.js";
 
-const {createLogger, transports, format} = require('winston');
+import require from "./esm-require.js";
 const apiMetricsMiddleware = require('prometheus-api-metrics');
 const {JSDOM} = jsdom;
 const {createProxyMiddleware} = httpProxyMiddleware;
@@ -115,7 +115,7 @@ app.use('/kursoversikt/api/kurs', createProxyMiddleware({
     },
     secure: true,
     xfwd: true,
-    onProxyReq: (proxyReq, req, res) => {
+    onProxyReq: (proxyReq, _req, _res) => {
         log.info("sf proxy proxyReq target: ", proxyReq.target);
     },
     onProxyRes: (proxyRes, req, res) => {
diff --git a/server/start.sh b/server/start.sh
index c1e89a3..39bb617 100644
--- a/server/start.sh
+++ b/server/start.sh
@@ -1,14 +1,3 @@
 #!/usr/bin/env sh
 
-if test -d /var/run/secrets/pindena-auth;
-then
-    for FILE in /var/run/secrets/pindena-auth
-    do
-        for line in $(cat $FILE); do
-            echo "- exporting `echo $line | cut -d '=' -f 1`"
-            export $line
-        done
-    done
-fi
-
-exec node --experimental-modules server.js
+exec node server.js