@dooer/dooer-test-env 1.8.0 → 1.8.1

package/lib/command/service.js

@@ -5,6 +5,7 @@ const yaml = require('js-yaml')
 const chalk = require('chalk')
 const rt = require('../runtime')
 const discovery = require('../discovery/client')
+const bankid = require('../bankid')
 const { imageFor } = require('../compose/manifests')
 
 // Per-service control in a running env. `local`/`unlocal`/`deploy` update the discovery router so peers
@@ -21,8 +22,17 @@ function localEnv(name, port) {
   } catch (_) {
     /* compose not generated yet — fall back to the minimum below */
   }
+  // Compose interpolates `${VAR:-default}` when it starts a container; a HOST process would otherwise get
+  // the literal string (service-accounts died with `Malformed boolean: "${DOOER_BANK_ID_IS_PRODUCTION:-false}"`).
+  // Resolve them the same way compose does, against the host env + the injected bankid values.
+  const injected = bankid.loadEnv()
+  const interpolate = (v) =>
+    String(v).replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/g, (_m, key, fallback) => {
+      const val = injected[key] !== undefined ? injected[key] : process.env[key]
+      return val !== undefined && val !== '' ? val : fallback || ''
+    })
   const rw = (v) =>
-    String(v)
+    interpolate(v)
       .replace(/\bpostgres:/g, 'localhost:')
       .replace(/(^|@)postgres\b/g, `$1localhost`)
       .replace(/\bredis:/g, 'localhost:')
@@ -32,7 +42,9 @@ function localEnv(name, port) {
   for (const k of Object.keys(env)) env[k] = rw(env[k])
   // guaranteed minimum wiring (also covers the no-compose fallback)
   env.DOOER_SQL_HOST = 'localhost'
-  env.DOOER_SQL_PORT = env.DOOER_SQL_PORT || '5432'
+  // Postgres is published on 55432, NOT 5432 — the compose value (5432) is the in-container port, and a
+  // dev's brew Postgres usually squats 5432, so a host process would silently talk to the wrong database.
+  env.DOOER_SQL_PORT = process.env.DOOER_TEST_ENV_PG_PORT || '55432'
   env.DOOER_SQL_DATABASE = env.DOOER_SQL_DATABASE || 'dooer'
   env.DOOER_IS_ONEPLATFORMER = 'false'
   env.CONSUL_HTTP_ADDR = 'localhost:8500'
@@ -40,6 +52,11 @@ function localEnv(name, port) {
   env.DOOER_SERVICE_NAME = env.DOOER_SERVICE_NAME || name
   env.DOOER_ENVIRONMENT_NAME = env.DOOER_ENVIRONMENT_NAME || 'local'
   env.NODE_ENV = env.NODE_ENV || 'development'
+  // SELF-calls: the router advertises this service as host.docker.internal:<port> so CONTAINERS can reach
+  // the host process — but that name does not resolve ON the host, so the process fails calling itself
+  // (service-accounts → /api/v1/token-invalidation/all → ENOTFOUND, which broke every HQ navigation query).
+  // @dooer/service checks DOOER_HOST_<NAME> before Consul, so point the service at its own localhost port.
+  env[`DOOER_HOST_${name.toUpperCase().replace(/-/g, '_')}`] = `localhost:${port}`
   return env
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dooer/dooer-test-env",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Run the whole Dooer backend locally (staging DB minus customers), copy/purge customers between environments, and shred — one CLI.",
   "license": "UNLICENSED",
   "repository": "Dooer/cli-dooer-test-env",