From 07f881d543599781c9aa4d61b5400a41354245c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Mon, 21 Apr 2025 14:29:49 +0400 Subject: [PATCH] Load test configs when running tests --- .env.test | 1 + config.ts | 11 ++++++++--- users.yaml.test | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .env.test create mode 100644 users.yaml.test diff --git a/.env.test b/.env.test new file mode 100644 index 0000000..86a0ebb --- /dev/null +++ b/.env.test @@ -0,0 +1 @@ +RELAY_URLS=wss://nostr.kosmos.org diff --git a/config.ts b/config.ts index c4e6e36..b9036a4 100644 --- a/config.ts +++ b/config.ts @@ -3,16 +3,21 @@ import { parse as parseYaml } from "jsr:@std/yaml"; import { checkFileExists } from "./utils.ts"; import { log } from "./log.ts"; +const denoEnv = Deno.env.get("DENO_ENV"); const dirname = Deno.cwd(); -await load({ envPath: `${dirname}/.env`, export: true }); +function envAwarePath(path: string): string { + return denoEnv ? `${path}.${denoEnv}` : path; +} + +await load({ envPath: envAwarePath(`${dirname}/.env`), export: true }); let userConfigPath: string = ""; let staticUsers: { [key: string]: string } = {}; const defaultUserConfigPaths = [ - "/etc/substr/users.yaml", - `${dirname}/users.yaml`, + envAwarePath("/etc/substr/users.yaml"), + envAwarePath(`${dirname}/users.yaml`), ]; for (const path of defaultUserConfigPaths) { diff --git a/users.yaml.test b/users.yaml.test new file mode 100644 index 0000000..e7eec8b --- /dev/null +++ b/users.yaml.test @@ -0,0 +1,3 @@ +_: b3e1b7c0ef48294bd856203bfd460625de95d3afb894e5f09b14cd1f0e7097cf +accounts: b3e1b7c1660b7db0ecb93ec55c09e67961171a5c4e9e2602f1b47477ea61c50a +raucao: 1f79058c77a224e5be226c8f024cacdad4d741855d75ed9f11473ba8eb86e1cb