tylerg/auth-yes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(infra): separate Auth-Yes and SPIRE environment configurations

Browse Source
This commit is contained in:
Tyler Gillispie 2026-08-23 11:05:53 -07:00
parent e7f01940b3
commit f967ba3480
2 changed files with 73 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
spire_ffi/target/
.env
infra/.env
.env*
infra/.env*
infra/compose*.yml
.DS_Store
node_modules/

71
infra/setup.ts
View File

@ -4,6 +4,7 @@ import * as colors from "jsr:@std/fmt@0.225.2/colors";
import * as path from "jsr:@std/path@0.225.2";
const ENV_PATH = path.join("infra", ".env");
const SPIRE_ENV_PATH = path.join("infra", ".env.spire");
const COMPOSE_PATH = path.join("infra", "compose.yml");
const SPIRE_COMPOSE_PATH = path.join("infra", "compose.spire.yml");
@ -28,9 +29,10 @@ const DEFAULT_AUTH_CONFIG: AuthSetupConfig = {
};
export async function readEnv(): Promise<Partial<AuthSetupConfig>> {
try {
const text = await Deno.readTextFile(ENV_PATH);
const config: Partial<AuthSetupConfig> = {};
for (const filePath of [ENV_PATH, SPIRE_ENV_PATH]) {
try {
const text = await Deno.readTextFile(filePath);
for (const line of text.split("\n")) {
const trimmed = line.trim();
if (!trimmed || trimmed.startsWith("#")) continue;
@ -44,17 +46,16 @@ export async function readEnv(): Promise<Partial<AuthSetupConfig>> {
if (key === "SPIRE_DATA_PATH") config.spireDataPath = val;
if (key === "APP_SECRET") config.appSecret = val;
}
return config;
} catch (_e) {
// Ignore and check next
return {};
}
}
return config;
}
export function generateEnv(config: AuthSetupConfig): string {
return `# --- Container Registry ---
REG=${config.reg}
GHCR_REG=${config.ghcrReg || "ghcr.atyg.org"}
# --- Network & Routing ---
SYSTEM_DOMAIN=${config.domainName}
@ -72,9 +73,6 @@ POSTGRES_DB=authdb
POSTGRES_PASSWORD=${config.dbPassword}
DB_DATA_PATH=${config.dbDataPath || "/volume1/docker/auth-yes/data"}
# --- SPIRE Configuration ---
SPIRE_DATA_PATH=${config.spireDataPath || "/volume1/docker/spire"}
# --- Valkey Configuration ---
VALKEY_HOST=auth-valkey
VALKEY_PORT=6379
@ -82,6 +80,16 @@ VALKEY_URL=redis://auth-valkey:6379
`;
}
export function generateSpireEnv(config: AuthSetupConfig): string {
return `# --- Container Registry ---
REG=${config.reg}
GHCR_REG=${config.ghcrReg || "ghcr.atyg.org"}
# --- SPIRE Storage & Persistence ---
SPIRE_DATA_PATH=${config.spireDataPath || "/volume1/docker/spire"}
`;
}
export function generateDockerCompose(): string {
return `version: "3.8"
@ -262,6 +270,9 @@ export async function generateAuthSetupFiles(
const envContent = generateEnv(config);
await Deno.writeTextFile(ENV_PATH, envContent);
const spireEnvContent = generateSpireEnv(config);
await Deno.writeTextFile(SPIRE_ENV_PATH, spireEnvContent);
const composeContent = generateDockerCompose();
await Deno.writeTextFile(COMPOSE_PATH, composeContent);
@ -270,14 +281,17 @@ export async function generateAuthSetupFiles(
console.log(
colors.green(
`\n✓ Successfully generated ${ENV_PATH}, ${COMPOSE_PATH}, and ${SPIRE_COMPOSE_PATH}!`,
`\n✓ Successfully generated ${ENV_PATH}, ${SPIRE_ENV_PATH}, ${COMPOSE_PATH}, and ${SPIRE_COMPOSE_PATH}!`,
),
);
console.log(
colors.green("Setup complete. You may now deploy your stack by running:\n"),
colors.green("Setup complete. You may deploy your stacks by running:\n"),
);
console.log(
colors.cyan(
"1. Deploy SPIRE Stack:\n" +
" podman-compose --project-name spire --env-file infra/.env.spire -f infra/compose.spire.yml up -d\n\n" +
"2. Deploy Auth-Yes Stack:\n" +
" podman-compose --project-name auth-yes --env-file infra/.env -f infra/compose.yml up -d\n",
),
);
@ -713,7 +727,10 @@ if (import.meta.main) {
);
console.log(generateSpireDockerCompose());
})
.command("dump_env", "Output current environment configuration (.env)")
.command(
"dump_env",
"Output current environment configuration (.env and .env.spire)",
)
.action(async () => {
const loadedEnv = await readEnv();
const currentConfig: AuthSetupConfig = {
@ -729,7 +746,7 @@ if (import.meta.main) {
);
console.log(
colors.bold(
colors.green(" ENVIRONMENT CONFIGURATION (infra/.env)"),
colors.green(" STACK 1: Auth-Yes Environment (infra/.env)"),
),
);
console.log(
@ -740,6 +757,28 @@ if (import.meta.main) {
),
);
console.log(generateEnv(currentConfig));
console.log(
colors.bold(
colors.blue(
"================================================================",
),
),
);
console.log(
colors.bold(
colors.green(
" STACK 2: SPIRE Stack Environment (infra/.env.spire)",
),
),
);
console.log(
colors.bold(
colors.blue(
"================================================================\n",
),
),
);
console.log(generateSpireEnv(currentConfig));
})
.command("secrets", "Inspect secrets status and persistence paths")
.action(async () => {
@ -768,7 +807,7 @@ if (import.meta.main) {
console.log(
`${
colors.cyan("Local Artifact Files:")
} ${ENV_PATH}, ${COMPOSE_PATH}, ${SPIRE_COMPOSE_PATH}`,
} ${ENV_PATH}, ${SPIRE_ENV_PATH}, ${COMPOSE_PATH}, ${SPIRE_COMPOSE_PATH}`,
);
console.log(
`${colors.cyan("PostgreSQL Password:")} ${
@ -910,7 +949,7 @@ if (import.meta.main) {
console.log(colors.gray("\n# 4. Deploy fresh stacks:"));
console.log(
colors.cyan(
"podman-compose --project-name spire --env-file infra/.env -f infra/compose.spire.yml up -d",
"podman-compose --project-name spire --env-file infra/.env.spire -f infra/compose.spire.yml up -d",
),
);
console.log(
@ -947,12 +986,12 @@ if (import.meta.main) {
);
console.log(
colors.cyan(
"podman-compose --project-name spire --env-file infra/.env -f infra/compose.spire.yml pull",
"podman-compose --project-name spire --env-file infra/.env.spire -f infra/compose.spire.yml pull",
),
);
console.log(
colors.cyan(
"podman-compose --project-name spire --env-file infra/.env -f infra/compose.spire.yml up -d\n",
"podman-compose --project-name spire --env-file infra/.env.spire -f infra/compose.spire.yml up -d\n",
),
);
console.log(