@oneuptime/common 13.0.8 → 14.0.0

package/test-setup.sh

@@ -1,12 +1,39 @@
 #!/usr/bin/env bash
 
-# Run database in docker-compose
-
-cd ../..
-# Run Preinstall. 
-
-cp config.env.example config.env
-
+# Sets up what the Common, App and Enterprise Edition test jobs run against:
+# config.env at the repository root, which each suite's `npm test` exports,
+# and the dev compose file's postgres (localhost:5400) and valkey
+# (localhost:6310). test.common.yaml, test.app.yaml and test.ee.yaml each run
+# it as `bash test-setup.sh` from packages/Common. It overwrites config.env, so
+# it is for CI's throwaway checkouts, not for a development checkout.
+#
+# Every step has to succeed, or the step fails. That was not always so: this
+# used to run without errexit, leave config.env to `npm run prerun`, and start
+# the containers with a bare `up -d`, so the step only ever reported whether
+# that last command had created two containers. On 2026-09-21 prerun's
+# Scripts/Install/configure.sh could not download gomplate from GitHub's
+# release CDN, which was answering 504, and exited before it merged the env
+# template. config.env had no DATABASE_* settings, postgres restart-looped for
+# want of a password, the step passed anyway, and ten Postgres tests failed
+# fifteen minutes later with a bare AggregateError (ECONNREFUSED) that pointed
+# nowhere near here.
+#
+# Not -u: BILLING_PRIVATE_KEY, expanded below, is unset outside CI.
+set -eo pipefail
+
+# The repository root, whichever directory this is run from.
+cd "$(dirname "${BASH_SOURCE[0]}")/../.."
+
+fail() {
+	if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
+		echo "::error title=Test setup failed::$1" >&2
+	fi
+	echo "test-setup.sh: $1" >&2
+	exit 1
+}
+
+# The settings the suites run with that differ from config.example.env's.
+# Everything else is appended from the template by MergeEnvTemplate.js below.
 cat <<EOL > config.env
 NODE_ENV=test
 BILLING_ENABLED=true
@@ -24,35 +51,77 @@ BILLING_PUBLIC_KEY=pk_test_51LleTZANuQdJ93r7PvyfOvpm5TZXtUf1T5fjS5cbOmDuCFIiGMoE
 BILLING_PRIVATE_KEY=$BILLING_PRIVATE_KEY
 EOL
 
-npm run prerun
-# Run Postgres
-
-# Change all of the following env vars in config.env
-
-# process.env['NODE_ENV'] = 'test';
-
-# process.env['BILLING_ENABLED'] = 'true';
+# Two of the steps `npm run prerun` takes, and the only two these suites need.
+# prerun's other step, Scripts/Install/configure.sh, is an installer: before it
+# merges the env template it downloads gomplate from GitHub's release CDN and
+# installs ts-node globally, and afterwards it renders the Dockerfile.tpl
+# templates with gomplate. No suite reads a rendered Dockerfile (the ones that
+# check Dockerfiles read the .tpl templates) or runs a global ts-node (App's
+# tests load ts-node/register from App's own node_modules), so none of that
+# belongs here. Both of these are offline, so the network can no longer stop
+# config.env from being written.
+#
+# Every package.json's version, synced to VERSION: ee's ModuleShape test holds
+# ee/package.json to it.
+node ./Scripts/Install/SyncPackageVersions.js
+# Appends every config.example.env setting config.env does not have yet,
+# DATABASE_USERNAME, DATABASE_PASSWORD and DATABASE_NAME among them.
+node ./Scripts/Install/MergeEnvTemplate.js
+
+# A setting's value as the suites will see it: config.env exported the way
+# their `npm test` scripts export it, into an otherwise empty environment, so a
+# variable this job happens to carry cannot stand in for one config.env lacks.
+config_env_value() {
+	# Single-quoted on purpose: the inner bash expands it.
+	# shellcheck disable=SC2016
+	env -i PATH="$PATH" bash -c 'export $(grep -v "^#" config.env | xargs) && printenv "$1"' _ "$1" || true
+}
+
+# postgres initialises its database from these (POSTGRES_USER,
+# POSTGRES_PASSWORD and POSTGRES_DB in docker-compose.base.yml) and the suites
+# connect with them. Without a password the postgres image refuses to
+# initialise at all, which is how 2026-09-21 failed, so check before starting
+# it rather than wait for it.
+missing=()
+for key in DATABASE_USERNAME DATABASE_PASSWORD DATABASE_NAME; do
+	if [ -z "$(config_env_value "$key")" ]; then
+		missing+=("$key")
+	fi
+done
+if [ ${#missing[@]} -gt 0 ]; then
+	fail "config.env has no value for ${missing[*]} after merging config.example.env into it. postgres is initialised with DATABASE_USERNAME, DATABASE_PASSWORD and DATABASE_NAME, and the suites connect with them, so nothing was started."
+fi
+
+# For the log, without BILLING_PRIVATE_KEY's value. GitHub masks the secret it
+# comes from, but masking is a backstop, and whether it is set is all a reader
+# of this log needs.
+redact() {
+	sed -E 's/^(BILLING_PRIVATE_KEY=).+$/\1<set, not printed>/'
+}
 
-# process.env['DATABASE_HOST'] = 'localhost';
-# process.env['DATABASE_PORT'] = '5400';
-
-# process.env['VALKEY_HOST'] = 'localhost';
-# process.env['VALKEY_PORT'] = '6379';
-# process.env['VALKEY_DB'] = '0';
-# process.env['VALKEY_USERNAME'] = 'default';
-
-# Using sed
-
-
-
-# print config.env file
 echo "config.env file"
-cat config.env
+redact < config.env
+echo
 
-export $(grep -v '^#' config.env | xargs) 
+# Exported so compose interpolates postgres's and valkey's settings, and the
+# password valkey's healthcheck pings with, from config.env. Unquoted on
+# purpose, as in every suite's `npm test`: one KEY=value per word.
+# shellcheck disable=SC2046
+export $(grep -v '^#' config.env | xargs)
 
-# print env vars
 echo "env vars"
-printenv
-
-docker compose --project-directory . -f Scripts/Dev/docker-compose.dev.yml up -d postgres valkey
+printenv | redact
+
+# --wait: the step passes only once postgres and valkey report healthy (both
+# have a healthcheck in docker-compose.base.yml: pg_isready and valkey-cli
+# ping), so a database that cannot start fails here, with its logs, instead of
+# in whichever suite reaches for it first. The timeout covers the wait alone,
+# not the image pulls before it, and outlasts the healthchecks' own budget
+# (a 15s start period, then 5 retries 10s apart), so Docker's verdict is what
+# decides. Both are normally healthy within ten seconds of starting.
+COMPOSE=(docker compose --project-directory . -f Scripts/Dev/docker-compose.dev.yml)
+if ! "${COMPOSE[@]}" up -d --wait --wait-timeout 120 postgres valkey; then
+	"${COMPOSE[@]}" ps --all postgres valkey || true
+	"${COMPOSE[@]}" logs --no-color --tail 100 postgres valkey || true
+	fail "postgres and valkey did not both become healthy. Their state and logs are printed above."
+fi

package/tsconfig.json

@@ -100,9 +100,22 @@
      * paths here are relative to this file). Setting baseUrl would change how
      * every bare specifier in Common resolves, which is a much larger blast
      * radius than this needs.
+     *
+     * "@oneuptime/ee-dashboard" and "@oneuptime/ee-admin-dashboard" are the
+     * Enterprise UI plugins, imported by the two frontends'
+     * src/Enterprise/Plugins.ts - which every Common test that renders an
+     * enterprise shell reaches. They are not packages at all: they map to the
+     * Community stubs here, exactly as in the frontends' own tsconfigs, and
+     * their jest twins map to the same files.
      */
     "paths": {
       "Common/*": ["./*"],
+      "@oneuptime/ee-dashboard": [
+        "../App/FeatureSet/Dashboard/src/Enterprise/CommunityPlugins"
+      ],
+      "@oneuptime/ee-admin-dashboard": [
+        "../App/FeatureSet/AdminDashboard/src/Enterprise/CommunityPlugins"
+      ],
       "react-router-dom": ["./node_modules/react-router-dom"],
       "react-i18next": ["./node_modules/react-i18next"],
       "i18next": ["./node_modules/i18next"],