Compare commits
7 Commits
0af3e218a1
...
fix/woodpe
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f5b6ca2e7 | ||
|
|
4741b3e16f | ||
|
|
2d4d799c26 | ||
|
|
410ada409c | ||
| 755df9079e | |||
| ac5650d9f9 | |||
| bd83f86740 |
@@ -46,18 +46,28 @@ steps:
|
|||||||
test:
|
test:
|
||||||
image: *node_image
|
image: *node_image
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgresql://mosaic:mosaic@postgres:5432/mosaic
|
# Avoid the namespace-level Woodpecker DB service named "postgres".
|
||||||
|
# The Kubernetes backend exposes service containers by step name.
|
||||||
|
DATABASE_URL: postgresql://mosaic:mosaic@ci-postgres:5432/mosaic
|
||||||
commands:
|
commands:
|
||||||
- *enable_pnpm
|
- *enable_pnpm
|
||||||
# Install postgresql-client for pg_isready
|
# Install postgresql-client for pg_isready
|
||||||
- apk add --no-cache postgresql-client
|
- apk add --no-cache postgresql-client
|
||||||
# Wait up to 30s for postgres to be ready
|
# Wait up to 60s for CI postgres to be ready; fail fast if it never comes up.
|
||||||
- |
|
- |
|
||||||
for i in $(seq 1 30); do
|
ready=0
|
||||||
pg_isready -h postgres -p 5432 -U mosaic && break
|
for i in $(seq 1 60); do
|
||||||
echo "Waiting for postgres ($i/30)..."
|
if pg_isready -h ci-postgres -p 5432 -U mosaic; then
|
||||||
|
ready=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
echo "Waiting for ci-postgres ($i/60)..."
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
if [ "$ready" -ne 1 ]; then
|
||||||
|
echo "ci-postgres did not become ready" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
# Run migrations (DATABASE_URL is set in environment above)
|
# Run migrations (DATABASE_URL is set in environment above)
|
||||||
- pnpm --filter @mosaicstack/db run db:migrate
|
- pnpm --filter @mosaicstack/db run db:migrate
|
||||||
# Run all tests
|
# Run all tests
|
||||||
@@ -66,7 +76,7 @@ steps:
|
|||||||
- typecheck
|
- typecheck
|
||||||
|
|
||||||
services:
|
services:
|
||||||
postgres:
|
ci-postgres:
|
||||||
image: pgvector/pgvector:pg17
|
image: pgvector/pgvector:pg17
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: mosaic
|
POSTGRES_USER: mosaic
|
||||||
|
|||||||
@@ -1,8 +1,21 @@
|
|||||||
import { mkdirSync } from 'node:fs';
|
import { mkdirSync } from 'node:fs';
|
||||||
import { homedir } from 'node:os';
|
import { homedir } from 'node:os';
|
||||||
import { join } from 'node:path';
|
import { join } from 'node:path';
|
||||||
import { Global, Inject, Module, type OnApplicationShutdown } from '@nestjs/common';
|
import {
|
||||||
import { createDb, createPgliteDb, type Db, type DbHandle } from '@mosaicstack/db';
|
Global,
|
||||||
|
Inject,
|
||||||
|
Logger,
|
||||||
|
Module,
|
||||||
|
type OnApplicationShutdown,
|
||||||
|
type OnModuleInit,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
createDb,
|
||||||
|
createPgliteDb,
|
||||||
|
runPgliteMigrations,
|
||||||
|
type Db,
|
||||||
|
type DbHandle,
|
||||||
|
} from '@mosaicstack/db';
|
||||||
import { createStorageAdapter, type StorageAdapter } from '@mosaicstack/storage';
|
import { createStorageAdapter, type StorageAdapter } from '@mosaicstack/storage';
|
||||||
import type { MosaicConfig } from '@mosaicstack/config';
|
import type { MosaicConfig } from '@mosaicstack/config';
|
||||||
import { MOSAIC_CONFIG } from '../config/config.module.js';
|
import { MOSAIC_CONFIG } from '../config/config.module.js';
|
||||||
@@ -39,12 +52,37 @@ export const STORAGE_ADAPTER = 'STORAGE_ADAPTER';
|
|||||||
],
|
],
|
||||||
exports: [DB, STORAGE_ADAPTER],
|
exports: [DB, STORAGE_ADAPTER],
|
||||||
})
|
})
|
||||||
export class DatabaseModule implements OnApplicationShutdown {
|
export class DatabaseModule implements OnApplicationShutdown, OnModuleInit {
|
||||||
|
private readonly logger = new Logger(DatabaseModule.name);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@Inject(DB_HANDLE) private readonly handle: DbHandle,
|
@Inject(DB_HANDLE) private readonly handle: DbHandle,
|
||||||
@Inject(STORAGE_ADAPTER) private readonly storageAdapter: StorageAdapter,
|
@Inject(STORAGE_ADAPTER) private readonly storageAdapter: StorageAdapter,
|
||||||
|
@Inject(MOSAIC_CONFIG) private readonly config: MosaicConfig,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
|
// Migrations must complete before any module that injects DB starts serving
|
||||||
|
// requests. NestJS awaits onModuleInit before app.listen(), and modules that
|
||||||
|
// inject DB are initialized after this one — so all DB-dependent code sees a
|
||||||
|
// populated schema before the first HTTP request lands.
|
||||||
|
//
|
||||||
|
// Local (PGlite) tier: we run gateway-DB migrations explicitly here. The
|
||||||
|
// storage adapter writes to a separate PGlite directory and only manages its
|
||||||
|
// own KV tables, so we still call its migrate() afterwards.
|
||||||
|
//
|
||||||
|
// Postgres tier: PostgresAdapter.migrate() already calls runMigrations() on
|
||||||
|
// the same DATABASE_URL, so a single call covers both the gateway DB and
|
||||||
|
// the storage tables. We deliberately do NOT call runMigrations() here to
|
||||||
|
// avoid opening a second short-lived connection and doubling startup cost.
|
||||||
|
async onModuleInit(): Promise<void> {
|
||||||
|
if (this.config.tier === 'local') {
|
||||||
|
this.logger.log('Applying PGlite schema migrations...');
|
||||||
|
await runPgliteMigrations(this.handle);
|
||||||
|
}
|
||||||
|
this.logger.log(`Initializing storage adapter (${this.storageAdapter.name})...`);
|
||||||
|
await this.storageAdapter.migrate();
|
||||||
|
}
|
||||||
|
|
||||||
async onApplicationShutdown(): Promise<void> {
|
async onApplicationShutdown(): Promise<void> {
|
||||||
await Promise.all([this.handle.close(), this.storageAdapter.close()]);
|
await Promise.all([this.handle.close(), this.storageAdapter.close()]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@
|
|||||||
"access": "public"
|
"access": "public"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist"
|
"dist",
|
||||||
|
"drizzle"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import { PGlite } from '@electric-sql/pglite';
|
import { PGlite } from '@electric-sql/pglite';
|
||||||
|
import { vector } from '@electric-sql/pglite/vector';
|
||||||
import { drizzle } from 'drizzle-orm/pglite';
|
import { drizzle } from 'drizzle-orm/pglite';
|
||||||
import * as schema from './schema.js';
|
import * as schema from './schema.js';
|
||||||
import type { DbHandle } from './client.js';
|
import type { DbHandle } from './client.js';
|
||||||
|
|
||||||
export function createPgliteDb(dataDir: string): DbHandle {
|
export function createPgliteDb(dataDir: string): DbHandle {
|
||||||
const client = new PGlite(dataDir);
|
// pgvector extension is required by migration 0001 (insights.embedding column).
|
||||||
|
const client = new PGlite(dataDir, { extensions: { vector } });
|
||||||
const db = drizzle(client, { schema });
|
const db = drizzle(client, { schema });
|
||||||
return {
|
return {
|
||||||
db: db as unknown as DbHandle['db'],
|
db: db as unknown as DbHandle['db'],
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
export { createDb, type Db, type DbHandle } from './client.js';
|
export { createDb, type Db, type DbHandle } from './client.js';
|
||||||
export { createPgliteDb } from './client-pglite.js';
|
export { createPgliteDb } from './client-pglite.js';
|
||||||
export { runMigrations } from './migrate.js';
|
export { runMigrations, runPgliteMigrations } from './migrate.js';
|
||||||
export * from './schema.js';
|
export * from './schema.js';
|
||||||
export * from './federation.js';
|
export * from './federation.js';
|
||||||
export {
|
export {
|
||||||
|
|||||||
70
packages/db/src/migrate.test.ts
Normal file
70
packages/db/src/migrate.test.ts
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
import { mkdtempSync, rmSync } from 'node:fs';
|
||||||
|
import { tmpdir } from 'node:os';
|
||||||
|
import { join } from 'node:path';
|
||||||
|
import { sql } from 'drizzle-orm';
|
||||||
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
import { createPgliteDb } from './client-pglite.js';
|
||||||
|
import { runPgliteMigrations } from './migrate.js';
|
||||||
|
import type { DbHandle } from './client.js';
|
||||||
|
|
||||||
|
interface PgliteExec {
|
||||||
|
exec(query: string): Promise<unknown>;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('runPgliteMigrations', () => {
|
||||||
|
let dataDir: string;
|
||||||
|
let handle: DbHandle;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
dataDir = mkdtempSync(join(tmpdir(), 'mosaic-db-migrate-test-'));
|
||||||
|
handle = createPgliteDb(dataDir);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await handle.close();
|
||||||
|
rmSync(dataDir, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates the BetterAuth tables required by the gateway', async () => {
|
||||||
|
await runPgliteMigrations(handle);
|
||||||
|
|
||||||
|
const result = (await handle.db.execute(sql`
|
||||||
|
SELECT table_name FROM information_schema.tables
|
||||||
|
WHERE table_schema = 'public'
|
||||||
|
ORDER BY table_name
|
||||||
|
`)) as unknown as { rows: Array<{ table_name: string }> };
|
||||||
|
|
||||||
|
const tables = result.rows.map((r) => r.table_name);
|
||||||
|
|
||||||
|
// Auth tables — required for sign-in / bootstrap to function.
|
||||||
|
expect(tables).toContain('users');
|
||||||
|
expect(tables).toContain('sessions');
|
||||||
|
expect(tables).toContain('accounts');
|
||||||
|
expect(tables).toContain('verifications');
|
||||||
|
|
||||||
|
// Schema sanity check — admin token table consumed by mosaic gateway config.
|
||||||
|
expect(tables).toContain('admin_tokens');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is idempotent — running twice does not error', async () => {
|
||||||
|
await runPgliteMigrations(handle);
|
||||||
|
await expect(runPgliteMigrations(handle)).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('surfaces statement-level error context on failure and leaves no ledger row', async () => {
|
||||||
|
// Pre-create a `users` table that conflicts with migration 0000's CREATE TABLE,
|
||||||
|
// forcing it to fail without IF NOT EXISTS.
|
||||||
|
const client = (handle.db as unknown as { $client: PgliteExec }).$client;
|
||||||
|
await client.exec('CREATE TABLE users (sentinel text)');
|
||||||
|
|
||||||
|
await expect(runPgliteMigrations(handle)).rejects.toThrow(
|
||||||
|
/migration hash=[a-f0-9]+ statement #\d+ failed/,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Ledger should be empty — partial application must not pretend to be complete.
|
||||||
|
const ledger = (await handle.db.execute(
|
||||||
|
sql`SELECT count(*)::int AS count FROM drizzle.__drizzle_migrations`,
|
||||||
|
)) as unknown as { rows: Array<{ count: number }> };
|
||||||
|
expect(ledger.rows[0]?.count).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,18 +1,109 @@
|
|||||||
import { dirname, resolve } from 'node:path';
|
import { dirname, resolve } from 'node:path';
|
||||||
import { fileURLToPath } from 'node:url';
|
import { fileURLToPath } from 'node:url';
|
||||||
import { drizzle } from 'drizzle-orm/postgres-js';
|
import { sql } from 'drizzle-orm';
|
||||||
import { migrate } from 'drizzle-orm/postgres-js/migrator';
|
import { drizzle as drizzlePostgres } from 'drizzle-orm/postgres-js';
|
||||||
|
import { migrate as migratePostgres } from 'drizzle-orm/postgres-js/migrator';
|
||||||
|
import { readMigrationFiles } from 'drizzle-orm/migrator';
|
||||||
import postgres from 'postgres';
|
import postgres from 'postgres';
|
||||||
import { DEFAULT_DATABASE_URL } from './defaults.js';
|
import { DEFAULT_DATABASE_URL } from './defaults.js';
|
||||||
|
import type { DbHandle } from './client.js';
|
||||||
|
|
||||||
|
interface PgliteExecutor {
|
||||||
|
exec(query: string): Promise<unknown>;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ExecuteRows<T> {
|
||||||
|
rows: T[];
|
||||||
|
}
|
||||||
|
|
||||||
|
function migrationsFolder(): string {
|
||||||
|
const here = dirname(fileURLToPath(import.meta.url));
|
||||||
|
return resolve(here, '../drizzle');
|
||||||
|
}
|
||||||
|
|
||||||
export async function runMigrations(url?: string): Promise<void> {
|
export async function runMigrations(url?: string): Promise<void> {
|
||||||
const connectionString = url ?? process.env['DATABASE_URL'] ?? DEFAULT_DATABASE_URL;
|
const connectionString = url ?? process.env['DATABASE_URL'] ?? DEFAULT_DATABASE_URL;
|
||||||
const sql = postgres(connectionString, { max: 1 });
|
const sqlClient = postgres(connectionString, { max: 1 });
|
||||||
const db = drizzle(sql);
|
const db = drizzlePostgres(sqlClient);
|
||||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
||||||
try {
|
try {
|
||||||
await migrate(db, { migrationsFolder: resolve(__dirname, '../drizzle') });
|
// TODO: postgres-tier first-install also fails because (a) Drizzle wraps every
|
||||||
|
// migration in one transaction (breaks 0009's ALTER TYPE ADD VALUE → SET DEFAULT
|
||||||
|
// sequence) and (b) drizzle/meta/_journal.json has 0009 ordered before 0008,
|
||||||
|
// which the postgres-js migrator skips by `created_at < folderMillis`. The
|
||||||
|
// PGlite path below sidesteps both. A follow-up should either share the
|
||||||
|
// per-statement loop (see runPgliteMigrations) or fix the journal ordering.
|
||||||
|
await migratePostgres(db, { migrationsFolder: migrationsFolder() });
|
||||||
} finally {
|
} finally {
|
||||||
await sql.end();
|
await sqlClient.end();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply Drizzle migrations against an embedded PGlite database.
|
||||||
|
//
|
||||||
|
// We don't reuse drizzle's pglite migrator because it wraps ALL migrations in
|
||||||
|
// one outer transaction, which breaks Postgres' `check_safe_enum_use` rule —
|
||||||
|
// e.g. migration 0009 does `ALTER TYPE ADD VALUE 'pending'` then references
|
||||||
|
// `'pending'` as a default in the same tx. PGlite's `exec()` runs each
|
||||||
|
// statement under the Simple Query protocol, autocommitting between them.
|
||||||
|
//
|
||||||
|
// We still write to the standard `drizzle.__drizzle_migrations` ledger so the
|
||||||
|
// result is interoperable with `runMigrations()` on a postgres-backed deploy
|
||||||
|
// (modulo the journal-ordering bug noted above).
|
||||||
|
//
|
||||||
|
// We skip-by-hash rather than skip-by-folderMillis (which is what Drizzle's
|
||||||
|
// postgres-js migrator does). That's deliberate — out-of-order timestamps in
|
||||||
|
// `_journal.json` won't silently drop migrations.
|
||||||
|
//
|
||||||
|
// Failure model: each statement autocommits, and the ledger row is written
|
||||||
|
// only after all statements in a migration succeed. A crash mid-migration
|
||||||
|
// leaves the prefix applied with no ledger entry, so the next boot will
|
||||||
|
// replay those statements and fail loudly on "already exists". Recovery:
|
||||||
|
// drop the partially-applied objects, or insert the migration's hash into
|
||||||
|
// `drizzle.__drizzle_migrations` manually. The error log identifies which
|
||||||
|
// statement of which migration was the culprit.
|
||||||
|
export async function runPgliteMigrations(handle: DbHandle): Promise<void> {
|
||||||
|
const client = (handle.db as unknown as { $client?: PgliteExecutor }).$client;
|
||||||
|
if (!client || typeof client.exec !== 'function') {
|
||||||
|
throw new Error('runPgliteMigrations: handle.db is not backed by a PGlite client');
|
||||||
|
}
|
||||||
|
|
||||||
|
await client.exec('CREATE SCHEMA IF NOT EXISTS drizzle');
|
||||||
|
await client.exec(`
|
||||||
|
CREATE TABLE IF NOT EXISTS drizzle.__drizzle_migrations (
|
||||||
|
id SERIAL PRIMARY KEY,
|
||||||
|
hash text NOT NULL,
|
||||||
|
created_at bigint
|
||||||
|
)
|
||||||
|
`);
|
||||||
|
|
||||||
|
const appliedRows = (await handle.db.execute(
|
||||||
|
sql`SELECT hash FROM drizzle.__drizzle_migrations`,
|
||||||
|
)) as unknown as ExecuteRows<{ hash: string }>;
|
||||||
|
const applied = new Set(appliedRows.rows.map((r) => r.hash));
|
||||||
|
|
||||||
|
const migrations = readMigrationFiles({ migrationsFolder: migrationsFolder() });
|
||||||
|
for (const migration of migrations) {
|
||||||
|
if (applied.has(migration.hash)) continue;
|
||||||
|
|
||||||
|
// Run each statement-breakpoint chunk in its own exec() call so PGlite
|
||||||
|
// commits between statements — this is what lets `ALTER TYPE ADD VALUE`
|
||||||
|
// become visible before a subsequent statement references the new value.
|
||||||
|
for (const [stmtIdx, stmt] of migration.sql.entries()) {
|
||||||
|
const trimmed = stmt.trim();
|
||||||
|
if (!trimmed) continue;
|
||||||
|
try {
|
||||||
|
await client.exec(trimmed);
|
||||||
|
} catch (err) {
|
||||||
|
const cause = err instanceof Error ? err.message : String(err);
|
||||||
|
throw new Error(
|
||||||
|
`runPgliteMigrations: migration hash=${migration.hash} statement #${stmtIdx} failed: ${cause}\n` +
|
||||||
|
`Statement: ${trimmed.slice(0, 200)}${trimmed.length > 200 ? '…' : ''}`,
|
||||||
|
{ cause: err },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await handle.db.execute(
|
||||||
|
sql`INSERT INTO drizzle.__drizzle_migrations (hash, created_at) VALUES (${migration.hash}, ${migration.folderMillis})`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,20 @@ _mosaic_sync_woodpecker_env() {
|
|||||||
printf '%s\n' "$expected" > "$env_file"
|
printf '%s\n' "$expected" > "$env_file"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Load legacy flat Woodpecker credentials (.woodpecker.url / .woodpecker.token).
|
||||||
|
# Some environments export WOODPECKER_INSTANCE=mosaic, but the current
|
||||||
|
# credentials.json may still use the legacy flat schema. Treat "mosaic" as the
|
||||||
|
# default flat instance when a nested .woodpecker.mosaic object is absent.
|
||||||
|
_mosaic_load_woodpecker_legacy() {
|
||||||
|
export WOODPECKER_URL="$(_mosaic_read_cred '.woodpecker.url')"
|
||||||
|
export WOODPECKER_TOKEN="$(_mosaic_read_cred '.woodpecker.token')"
|
||||||
|
export WOODPECKER_INSTANCE="${WOODPECKER_INSTANCE:-mosaic}"
|
||||||
|
WOODPECKER_URL="${WOODPECKER_URL%/}"
|
||||||
|
[[ -n "$WOODPECKER_URL" ]] || { echo "Error: woodpecker.url not found" >&2; return 1; }
|
||||||
|
[[ -n "$WOODPECKER_TOKEN" ]] || { echo "Error: woodpecker.token not found" >&2; return 1; }
|
||||||
|
_mosaic_sync_woodpecker_env "$WOODPECKER_INSTANCE" "$WOODPECKER_URL" "$WOODPECKER_TOKEN"
|
||||||
|
}
|
||||||
|
|
||||||
load_credentials() {
|
load_credentials() {
|
||||||
local service="$1"
|
local service="$1"
|
||||||
|
|
||||||
@@ -155,7 +169,14 @@ EOF
|
|||||||
;;
|
;;
|
||||||
woodpecker-*)
|
woodpecker-*)
|
||||||
local wp_instance="${service#woodpecker-}"
|
local wp_instance="${service#woodpecker-}"
|
||||||
# credentials.json is authoritative — always read from it, ignore env
|
# credentials.json is authoritative — always read from it, ignore env.
|
||||||
|
# Backward compatibility: the default Mosaic Woodpecker instance may be
|
||||||
|
# stored in the legacy flat schema (.woodpecker.url/.token) instead of
|
||||||
|
# .woodpecker.mosaic.url/.token.
|
||||||
|
if [[ "$wp_instance" == "mosaic" ]] && [[ -z "$(_mosaic_read_cred '.woodpecker.mosaic.url')" ]] && [[ -n "$(_mosaic_read_cred '.woodpecker.url')" ]]; then
|
||||||
|
WOODPECKER_INSTANCE="mosaic" _mosaic_load_woodpecker_legacy
|
||||||
|
return $?
|
||||||
|
fi
|
||||||
export WOODPECKER_URL="$(_mosaic_read_cred ".woodpecker.${wp_instance}.url")"
|
export WOODPECKER_URL="$(_mosaic_read_cred ".woodpecker.${wp_instance}.url")"
|
||||||
export WOODPECKER_TOKEN="$(_mosaic_read_cred ".woodpecker.${wp_instance}.token")"
|
export WOODPECKER_TOKEN="$(_mosaic_read_cred ".woodpecker.${wp_instance}.token")"
|
||||||
export WOODPECKER_INSTANCE="$wp_instance"
|
export WOODPECKER_INSTANCE="$wp_instance"
|
||||||
@@ -166,7 +187,10 @@ EOF
|
|||||||
_mosaic_sync_woodpecker_env "$wp_instance" "$WOODPECKER_URL" "$WOODPECKER_TOKEN"
|
_mosaic_sync_woodpecker_env "$wp_instance" "$WOODPECKER_URL" "$WOODPECKER_TOKEN"
|
||||||
;;
|
;;
|
||||||
woodpecker)
|
woodpecker)
|
||||||
# Resolve default instance, then load it
|
# Resolve default instance, then load it. If WOODPECKER_INSTANCE is set to
|
||||||
|
# "mosaic" by a shell/profile but credentials.json still uses the legacy
|
||||||
|
# flat .woodpecker.url/.token schema, load the flat credentials instead of
|
||||||
|
# failing with "woodpecker.mosaic.url not found".
|
||||||
local wp_default
|
local wp_default
|
||||||
wp_default="${WOODPECKER_INSTANCE:-$(_mosaic_read_cred '.woodpecker.default')}"
|
wp_default="${WOODPECKER_INSTANCE:-$(_mosaic_read_cred '.woodpecker.default')}"
|
||||||
if [[ -z "$wp_default" ]]; then
|
if [[ -z "$wp_default" ]]; then
|
||||||
@@ -174,19 +198,19 @@ EOF
|
|||||||
local legacy_url
|
local legacy_url
|
||||||
legacy_url="$(_mosaic_read_cred '.woodpecker.url')"
|
legacy_url="$(_mosaic_read_cred '.woodpecker.url')"
|
||||||
if [[ -n "$legacy_url" ]]; then
|
if [[ -n "$legacy_url" ]]; then
|
||||||
export WOODPECKER_URL="${WOODPECKER_URL:-$legacy_url}"
|
_mosaic_load_woodpecker_legacy
|
||||||
export WOODPECKER_TOKEN="${WOODPECKER_TOKEN:-$(_mosaic_read_cred '.woodpecker.token')}"
|
|
||||||
WOODPECKER_URL="${WOODPECKER_URL%/}"
|
|
||||||
[[ -n "$WOODPECKER_URL" ]] || { echo "Error: woodpecker.url not found" >&2; return 1; }
|
|
||||||
[[ -n "$WOODPECKER_TOKEN" ]] || { echo "Error: woodpecker.token not found" >&2; return 1; }
|
|
||||||
else
|
else
|
||||||
echo "Error: woodpecker.default not set and no WOODPECKER_INSTANCE env var" >&2
|
echo "Error: woodpecker.default not set and no WOODPECKER_INSTANCE env var" >&2
|
||||||
echo "Available instances: $(jq -r '.woodpecker | keys | join(", ")' "$MOSAIC_CREDENTIALS_FILE" 2>/dev/null)" >&2
|
echo "Available instances: $(jq -r '.woodpecker | keys | join(", ")' "$MOSAIC_CREDENTIALS_FILE" 2>/dev/null)" >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
if [[ "$wp_default" == "mosaic" ]] && [[ -z "$(_mosaic_read_cred '.woodpecker.mosaic.url')" ]] && [[ -n "$(_mosaic_read_cred '.woodpecker.url')" ]]; then
|
||||||
|
WOODPECKER_INSTANCE="mosaic" _mosaic_load_woodpecker_legacy
|
||||||
else
|
else
|
||||||
load_credentials "woodpecker-${wp_default}"
|
load_credentials "woodpecker-${wp_default}"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
cloudflare-*)
|
cloudflare-*)
|
||||||
local cf_instance="${service#cloudflare-}"
|
local cf_instance="${service#cloudflare-}"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# issue-list.sh - List issues on Gitea or GitHub
|
# issue-list.sh - List issues on Gitea or GitHub
|
||||||
# Usage: issue-list.sh [-s state] [-l label] [-m milestone] [-a assignee]
|
# Usage: issue-list.sh [-r owner/repo] [-s state] [-l label] [-m milestone] [-a assignee]
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@ LABEL=""
|
|||||||
MILESTONE=""
|
MILESTONE=""
|
||||||
ASSIGNEE=""
|
ASSIGNEE=""
|
||||||
LIMIT=100
|
LIMIT=100
|
||||||
|
REPO_OVERRIDE=""
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@@ -26,12 +27,14 @@ Options:
|
|||||||
-m, --milestone NAME Filter by milestone name
|
-m, --milestone NAME Filter by milestone name
|
||||||
-a, --assignee USER Filter by assignee
|
-a, --assignee USER Filter by assignee
|
||||||
-n, --limit N Maximum issues to show (default: 100)
|
-n, --limit N Maximum issues to show (default: 100)
|
||||||
|
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
||||||
-h, --help Show this help message
|
-h, --help Show this help message
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
$(basename "$0") # List open issues
|
$(basename "$0") # List open issues
|
||||||
$(basename "$0") -s all -l bug # All issues with 'bug' label
|
$(basename "$0") -s all -l bug # All issues with 'bug' label
|
||||||
$(basename "$0") -m "0.2.0" # Issues in milestone 0.2.0
|
$(basename "$0") -m "0.2.0" # Issues in milestone 0.2.0
|
||||||
|
$(basename "$0") --repo ddk/ai-bma # List issues from anywhere
|
||||||
EOF
|
EOF
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
@@ -59,6 +62,10 @@ while [[ $# -gt 0 ]]; do
|
|||||||
LIMIT="$2"
|
LIMIT="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
-r|--repo)
|
||||||
|
REPO_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
@@ -69,25 +76,33 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
REPO_INFO="$REPO_OVERRIDE"
|
||||||
|
PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
|
||||||
|
else
|
||||||
PLATFORM=$(detect_platform)
|
PLATFORM=$(detect_platform)
|
||||||
|
REPO_INFO=$(get_repo_info)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
|
||||||
|
echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
github)
|
github)
|
||||||
CMD="gh issue list --state $STATE --limit $LIMIT"
|
CMD=(gh issue list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
|
||||||
[[ -n "$LABEL" ]] && CMD="$CMD --label \"$LABEL\""
|
[[ -n "$LABEL" ]] && CMD+=(--label "$LABEL")
|
||||||
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestone \"$MILESTONE\""
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestone "$MILESTONE")
|
||||||
[[ -n "$ASSIGNEE" ]] && CMD="$CMD --assignee \"$ASSIGNEE\""
|
[[ -n "$ASSIGNEE" ]] && CMD+=(--assignee "$ASSIGNEE")
|
||||||
eval "$CMD"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
CMD="tea issues list --state $STATE --limit $LIMIT"
|
CMD=(tea issues list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
|
||||||
[[ -n "$LABEL" ]] && CMD="$CMD --labels \"$LABEL\""
|
[[ -n "$LABEL" ]] && CMD+=(--labels "$LABEL")
|
||||||
[[ -n "$MILESTONE" ]] && CMD="$CMD --milestones \"$MILESTONE\""
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestones "$MILESTONE")
|
||||||
# Note: tea may not support assignee filter directly
|
[[ -n "$ASSIGNEE" ]] && CMD+=(--assignee "$ASSIGNEE")
|
||||||
eval "$CMD"
|
"${CMD[@]}"
|
||||||
if [[ -n "$ASSIGNEE" ]]; then
|
|
||||||
echo "Note: Assignee filtering may require manual review for Gitea" >&2
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: Could not detect git platform" >&2
|
echo "Error: Could not detect git platform" >&2
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# pr-ci-wait.sh - Wait for PR CI status to reach terminal state (GitHub/Gitea)
|
# pr-ci-wait.sh - Wait for PR CI status to reach terminal state (GitHub/Gitea)
|
||||||
# Usage: pr-ci-wait.sh -n <pr_number> [-t timeout_sec] [-i interval_sec]
|
# Usage: pr-ci-wait.sh -n <pr_number> [-r owner/repo] [-t timeout_sec] [-i interval_sec]
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
@@ -10,6 +10,7 @@ source "$SCRIPT_DIR/detect-platform.sh"
|
|||||||
PR_NUMBER=""
|
PR_NUMBER=""
|
||||||
TIMEOUT_SEC=1800
|
TIMEOUT_SEC=1800
|
||||||
INTERVAL_SEC=15
|
INTERVAL_SEC=15
|
||||||
|
REPO_OVERRIDE=""
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@@ -17,12 +18,14 @@ Usage: $(basename "$0") -n <pr_number> [-t timeout_sec] [-i interval_sec]
|
|||||||
|
|
||||||
Options:
|
Options:
|
||||||
-n, --number NUMBER PR number (required)
|
-n, --number NUMBER PR number (required)
|
||||||
|
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
||||||
-t, --timeout SECONDS Max wait time in seconds (default: 1800)
|
-t, --timeout SECONDS Max wait time in seconds (default: 1800)
|
||||||
-i, --interval SECONDS Poll interval in seconds (default: 15)
|
-i, --interval SECONDS Poll interval in seconds (default: 15)
|
||||||
-h, --help Show this help
|
-h, --help Show this help
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
$(basename "$0") -n 643
|
$(basename "$0") -n 643
|
||||||
|
$(basename "$0") -n 643 --repo ddk/ai-bma
|
||||||
$(basename "$0") -n 643 -t 900 -i 10
|
$(basename "$0") -n 643 -t 900 -i 10
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@@ -95,7 +98,7 @@ PY
|
|||||||
}
|
}
|
||||||
|
|
||||||
github_get_pr_head_sha() {
|
github_get_pr_head_sha() {
|
||||||
gh pr view "$PR_NUMBER" --json headRefOid --jq '.headRefOid'
|
gh pr view "$PR_NUMBER" --repo "$OWNER/$REPO" --json headRefOid --jq '.headRefOid'
|
||||||
}
|
}
|
||||||
|
|
||||||
github_get_commit_status_json() {
|
github_get_commit_status_json() {
|
||||||
@@ -132,6 +135,10 @@ while [[ $# -gt 0 ]]; do
|
|||||||
PR_NUMBER="$2"
|
PR_NUMBER="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
-r|--repo)
|
||||||
|
REPO_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-t|--timeout)
|
-t|--timeout)
|
||||||
TIMEOUT_SEC="$2"
|
TIMEOUT_SEC="$2"
|
||||||
shift 2
|
shift 2
|
||||||
@@ -163,10 +170,21 @@ if ! [[ "$TIMEOUT_SEC" =~ ^[0-9]+$ ]] || ! [[ "$INTERVAL_SEC" =~ ^[0-9]+$ ]]; th
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
REPO_INFO="$REPO_OVERRIDE"
|
||||||
|
PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
|
||||||
|
else
|
||||||
detect_platform > /dev/null
|
detect_platform > /dev/null
|
||||||
|
REPO_INFO=$(get_repo_info)
|
||||||
|
fi
|
||||||
|
|
||||||
OWNER=$(get_repo_owner)
|
if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* || "$REPO_INFO" != */* ]]; then
|
||||||
REPO=$(get_repo_name)
|
echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo owner/repo." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
OWNER=${REPO_INFO%%/*}
|
||||||
|
REPO=${REPO_INFO##*/}
|
||||||
START_TS=$(date +%s)
|
START_TS=$(date +%s)
|
||||||
DEADLINE_TS=$((START_TS + TIMEOUT_SEC))
|
DEADLINE_TS=$((START_TS + TIMEOUT_SEC))
|
||||||
|
|
||||||
@@ -182,10 +200,7 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
fi
|
fi
|
||||||
echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
HOST=$(get_remote_host) || {
|
HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
|
||||||
echo "Error: Could not determine remote host." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
TOKEN=$(get_gitea_token "$HOST") || {
|
TOKEN=$(get_gitea_token "$HOST") || {
|
||||||
echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
|
echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -195,7 +210,7 @@ elif [[ "$PLATFORM" == "gitea" ]]; then
|
|||||||
echo "Error: Could not resolve head SHA for PR #$PR_NUMBER." >&2
|
echo "Error: Could not resolve head SHA for PR #$PR_NUMBER." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "[pr-ci-wait] Platform=gitea host=${HOST} PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
echo "[pr-ci-wait] Platform=gitea host=${HOST} repo=${OWNER}/${REPO} PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
||||||
else
|
else
|
||||||
echo "Error: Unsupported platform '${PLATFORM}'." >&2
|
echo "Error: Unsupported platform '${PLATFORM}'." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# pr-diff.sh - Get the diff for a pull request on GitHub or Gitea
|
# pr-diff.sh - Get the diff for a pull request on GitHub or Gitea
|
||||||
# Usage: pr-diff.sh -n <pr_number> [-o <output_file>]
|
# Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [-o <output_file>]
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
@@ -10,6 +10,7 @@ source "$SCRIPT_DIR/detect-platform.sh"
|
|||||||
# Parse arguments
|
# Parse arguments
|
||||||
PR_NUMBER=""
|
PR_NUMBER=""
|
||||||
OUTPUT_FILE=""
|
OUTPUT_FILE=""
|
||||||
|
REPO_OVERRIDE=""
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
@@ -21,11 +22,16 @@ while [[ $# -gt 0 ]]; do
|
|||||||
OUTPUT_FILE="$2"
|
OUTPUT_FILE="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
-r|--repo)
|
||||||
|
REPO_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
echo "Usage: pr-diff.sh -n <pr_number> [-o <output_file>]"
|
echo "Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [-o <output_file>]"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Options:"
|
echo "Options:"
|
||||||
echo " -n, --number PR number (required)"
|
echo " -n, --number PR number (required)"
|
||||||
|
echo " -r, --repo Repository slug (default: infer from git origin)"
|
||||||
echo " -o, --output Output file (optional, prints to stdout if omitted)"
|
echo " -o, --output Output file (optional, prints to stdout if omitted)"
|
||||||
echo " -h, --help Show this help"
|
echo " -h, --help Show this help"
|
||||||
exit 0
|
exit 0
|
||||||
@@ -42,31 +48,30 @@ if [[ -z "$PR_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
REPO_INFO="$REPO_OVERRIDE"
|
||||||
|
PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
|
||||||
|
else
|
||||||
detect_platform > /dev/null
|
detect_platform > /dev/null
|
||||||
|
REPO_INFO=$(get_repo_info)
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
|
||||||
if [[ -n "$OUTPUT_FILE" ]]; then
|
|
||||||
gh pr diff "$PR_NUMBER" > "$OUTPUT_FILE"
|
|
||||||
else
|
|
||||||
gh pr diff "$PR_NUMBER"
|
|
||||||
fi
|
fi
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
|
||||||
# tea doesn't have a direct diff command — use the API
|
|
||||||
OWNER=$(get_repo_owner)
|
|
||||||
REPO=$(get_repo_name)
|
|
||||||
REMOTE_URL=$(git remote get-url origin 2>/dev/null)
|
|
||||||
|
|
||||||
# Extract host from remote URL
|
if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
|
||||||
if [[ "$REMOTE_URL" == https://* ]]; then
|
echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
|
||||||
HOST=$(echo "$REMOTE_URL" | sed -E 's|https://([^/]+)/.*|\1|')
|
|
||||||
elif [[ "$REMOTE_URL" == git@* ]]; then
|
|
||||||
HOST=$(echo "$REMOTE_URL" | sed -E 's|git@([^:]+):.*|\1|')
|
|
||||||
else
|
|
||||||
echo "Error: Cannot determine host from remote URL" >&2
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DIFF_URL="https://${HOST}/api/v1/repos/${OWNER}/${REPO}/pulls/${PR_NUMBER}.diff"
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
|
if [[ -n "$OUTPUT_FILE" ]]; then
|
||||||
|
gh pr diff "$PR_NUMBER" --repo "$REPO_INFO" > "$OUTPUT_FILE"
|
||||||
|
else
|
||||||
|
gh pr diff "$PR_NUMBER" --repo "$REPO_INFO"
|
||||||
|
fi
|
||||||
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
|
# tea doesn't have a direct diff command — use the API
|
||||||
|
HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
|
||||||
|
|
||||||
|
DIFF_URL="https://${HOST}/api/v1/repos/${REPO_INFO}/pulls/${PR_NUMBER}.diff"
|
||||||
|
|
||||||
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# pr-list.sh - List pull requests on Gitea or GitHub
|
# pr-list.sh - List pull requests on Gitea or GitHub
|
||||||
# Usage: pr-list.sh [-s state] [-l label] [-a author]
|
# Usage: pr-list.sh [-r owner/repo] [-s state] [-l label] [-a author]
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
@@ -12,6 +12,7 @@ STATE="open"
|
|||||||
LABEL=""
|
LABEL=""
|
||||||
AUTHOR=""
|
AUTHOR=""
|
||||||
LIMIT=100
|
LIMIT=100
|
||||||
|
REPO_OVERRIDE=""
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@@ -24,12 +25,14 @@ Options:
|
|||||||
-l, --label LABEL Filter by label
|
-l, --label LABEL Filter by label
|
||||||
-a, --author USER Filter by author
|
-a, --author USER Filter by author
|
||||||
-n, --limit N Maximum PRs to show (default: 100)
|
-n, --limit N Maximum PRs to show (default: 100)
|
||||||
|
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
||||||
-h, --help Show this help message
|
-h, --help Show this help message
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
$(basename "$0") # List open PRs
|
$(basename "$0") # List open PRs
|
||||||
$(basename "$0") -s all # All PRs
|
$(basename "$0") -s all # All PRs
|
||||||
$(basename "$0") -s merged -a username # Merged PRs by user
|
$(basename "$0") -s merged -a username # Merged PRs by user
|
||||||
|
$(basename "$0") --repo ddk/ai-bma # List PRs from anywhere
|
||||||
EOF
|
EOF
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
@@ -53,6 +56,10 @@ while [[ $# -gt 0 ]]; do
|
|||||||
LIMIT="$2"
|
LIMIT="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
-r|--repo)
|
||||||
|
REPO_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
@@ -63,18 +70,30 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
REPO_INFO="$REPO_OVERRIDE"
|
||||||
|
# Explicit --repo is primarily for Gitea wrappers; if a git origin is present,
|
||||||
|
# still honor GitHub detection for cross-platform behavior.
|
||||||
|
PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
|
||||||
|
else
|
||||||
PLATFORM=$(detect_platform)
|
PLATFORM=$(detect_platform)
|
||||||
|
REPO_INFO=$(get_repo_info)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
|
||||||
|
echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
github)
|
github)
|
||||||
CMD="gh pr list --state $STATE --limit $LIMIT"
|
CMD=(gh pr list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
|
||||||
[[ -n "$LABEL" ]] && CMD="$CMD --label \"$LABEL\""
|
[[ -n "$LABEL" ]] && CMD+=(--label "$LABEL")
|
||||||
[[ -n "$AUTHOR" ]] && CMD="$CMD --author \"$AUTHOR\""
|
[[ -n "$AUTHOR" ]] && CMD+=(--author "$AUTHOR")
|
||||||
eval "$CMD"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
# tea pr list - note: tea uses 'pulls' subcommand in some versions
|
CMD=(tea pr list --repo "$REPO_INFO" --state "$STATE" --limit "$LIMIT")
|
||||||
CMD="tea pr list --state $STATE --limit $LIMIT"
|
|
||||||
|
|
||||||
# tea filtering may be limited
|
# tea filtering may be limited
|
||||||
if [[ -n "$LABEL" ]]; then
|
if [[ -n "$LABEL" ]]; then
|
||||||
@@ -84,7 +103,7 @@ case "$PLATFORM" in
|
|||||||
echo "Note: Author filtering may require manual review for Gitea" >&2
|
echo "Note: Author filtering may require manual review for Gitea" >&2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval "$CMD"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: Could not detect git platform" >&2
|
echo "Error: Could not detect git platform" >&2
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# pr-view.sh - View pull request details on GitHub or Gitea
|
# pr-view.sh - View pull request details on GitHub or Gitea
|
||||||
# Usage: pr-view.sh -n <pr_number>
|
# Usage: pr-view.sh -n <pr_number> [-r owner/repo]
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
@@ -9,6 +9,7 @@ source "$SCRIPT_DIR/detect-platform.sh"
|
|||||||
|
|
||||||
# Parse arguments
|
# Parse arguments
|
||||||
PR_NUMBER=""
|
PR_NUMBER=""
|
||||||
|
REPO_OVERRIDE=""
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
@@ -16,11 +17,16 @@ while [[ $# -gt 0 ]]; do
|
|||||||
PR_NUMBER="$2"
|
PR_NUMBER="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
-r|--repo)
|
||||||
|
REPO_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
echo "Usage: pr-view.sh -n <pr_number>"
|
echo "Usage: pr-view.sh -n <pr_number> [-r owner/repo]"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Options:"
|
echo "Options:"
|
||||||
echo " -n, --number PR number (required)"
|
echo " -n, --number PR number (required)"
|
||||||
|
echo " -r, --repo Repository slug (default: infer from git origin)"
|
||||||
echo " -h, --help Show this help"
|
echo " -h, --help Show this help"
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
@@ -36,12 +42,23 @@ if [[ -z "$PR_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
REPO_INFO="$REPO_OVERRIDE"
|
||||||
|
PLATFORM=$(detect_platform 2>/dev/null || echo gitea)
|
||||||
|
else
|
||||||
|
detect_platform > /dev/null
|
||||||
|
REPO_INFO=$(get_repo_info)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$REPO_INFO" || "$REPO_INFO" == error:* ]]; then
|
||||||
|
echo "Error: Could not determine repository from git origin. Run from a repo or pass --repo." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh pr view "$PR_NUMBER"
|
gh pr view "$PR_NUMBER" --repo "$REPO_INFO"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
tea pr "$PR_NUMBER"
|
tea pr "$PR_NUMBER" --repo "$REPO_INFO"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ REPO_ID=$(wp_resolve_repo_id "$REPO") || exit 1
|
|||||||
|
|
||||||
response=$(curl -sk -w "\n%{http_code}" \
|
response=$(curl -sk -w "\n%{http_code}" \
|
||||||
-H "Authorization: Bearer $WOODPECKER_TOKEN" \
|
-H "Authorization: Bearer $WOODPECKER_TOKEN" \
|
||||||
"${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?per_page=${LIMIT}")
|
"${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?perPage=${LIMIT}")
|
||||||
|
|
||||||
http_code=$(echo "$response" | tail -n1)
|
http_code=$(echo "$response" | tail -n1)
|
||||||
body=$(echo "$response" | sed '$d')
|
body=$(echo "$response" | sed '$d')
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ _wp_fetch() {
|
|||||||
|
|
||||||
if [[ -z "$NUMBER" ]]; then
|
if [[ -z "$NUMBER" ]]; then
|
||||||
# Get latest pipeline number from list, then fetch full detail
|
# Get latest pipeline number from list, then fetch full detail
|
||||||
list_body=$(_wp_fetch "${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?per_page=1") || exit 1
|
list_body=$(_wp_fetch "${WOODPECKER_URL}/api/repos/${REPO_ID}/pipelines?perPage=1") || exit 1
|
||||||
NUMBER=$(echo "$list_body" | jq -r '.[0].number // empty')
|
NUMBER=$(echo "$list_body" | jq -r '.[0].number // empty')
|
||||||
if [[ -z "$NUMBER" ]]; then
|
if [[ -z "$NUMBER" ]]; then
|
||||||
echo "Error: No pipelines found" >&2
|
echo "Error: No pipelines found" >&2
|
||||||
|
|||||||
@@ -16,8 +16,15 @@ import fs from 'node:fs/promises';
|
|||||||
import os from 'node:os';
|
import os from 'node:os';
|
||||||
import path from 'node:path';
|
import path from 'node:path';
|
||||||
|
|
||||||
import { users, teams, teamMembers, conversations, messages } from '@mosaicstack/db';
|
import {
|
||||||
import { createPgliteDbWithVector, runPgliteMigrations } from './test-utils/pglite-with-vector.js';
|
users,
|
||||||
|
teams,
|
||||||
|
teamMembers,
|
||||||
|
conversations,
|
||||||
|
messages,
|
||||||
|
createPgliteDb,
|
||||||
|
runPgliteMigrations,
|
||||||
|
} from '@mosaicstack/db';
|
||||||
|
|
||||||
import postgres from 'postgres';
|
import postgres from 'postgres';
|
||||||
import { afterAll, describe, expect, it } from 'vitest';
|
import { afterAll, describe, expect, it } from 'vitest';
|
||||||
@@ -102,11 +109,8 @@ describe.skipIf(!run)('migrate-tier — PGlite → federated PG', () => {
|
|||||||
/* ---- 1. Create a temp PGlite db ---------------------------------- */
|
/* ---- 1. Create a temp PGlite db ---------------------------------- */
|
||||||
|
|
||||||
pgliteDataDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fed-m1-08-'));
|
pgliteDataDir = await fs.mkdtemp(path.join(os.tmpdir(), 'fed-m1-08-'));
|
||||||
const handle = createPgliteDbWithVector(pgliteDataDir);
|
const handle = createPgliteDb(pgliteDataDir);
|
||||||
|
await runPgliteMigrations(handle);
|
||||||
// Run Drizzle migrations against PGlite.
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
await runPgliteMigrations(handle.db as any);
|
|
||||||
|
|
||||||
/* ---- 2. Seed representative data --------------------------------- */
|
/* ---- 2. Seed representative data --------------------------------- */
|
||||||
|
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
/**
|
|
||||||
* Test-only helpers for creating a PGlite database with the pgvector extension
|
|
||||||
* and running Drizzle migrations against it.
|
|
||||||
*
|
|
||||||
* These are intentionally NOT exported from @mosaicstack/db to avoid pulling
|
|
||||||
* the WASM vector bundle into the public API surface.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { createRequire } from 'node:module';
|
|
||||||
import { dirname, resolve } from 'node:path';
|
|
||||||
|
|
||||||
import { PGlite } from '@electric-sql/pglite';
|
|
||||||
import { vector } from '@electric-sql/pglite/vector';
|
|
||||||
import { drizzle } from 'drizzle-orm/pglite';
|
|
||||||
import { migrate as migratePglite } from 'drizzle-orm/pglite/migrator';
|
|
||||||
import type { PgliteDatabase } from 'drizzle-orm/pglite';
|
|
||||||
import * as schema from '@mosaicstack/db';
|
|
||||||
import type { DbHandle } from '@mosaicstack/db';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a PGlite DB handle with the pgvector extension loaded.
|
|
||||||
* Required for running Drizzle migrations that include `CREATE EXTENSION vector`.
|
|
||||||
*/
|
|
||||||
export function createPgliteDbWithVector(dataDir: string): DbHandle {
|
|
||||||
const client = new PGlite(dataDir, { extensions: { vector } });
|
|
||||||
const db = drizzle(client, { schema });
|
|
||||||
return {
|
|
||||||
db: db as unknown as DbHandle['db'],
|
|
||||||
close: async () => {
|
|
||||||
await client.close();
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Run Drizzle migrations against an already-open PGlite database handle.
|
|
||||||
* Resolves the migrations folder from @mosaicstack/db's installed location.
|
|
||||||
*
|
|
||||||
* @param db A PgliteDatabase instance (from drizzle-orm/pglite).
|
|
||||||
*/
|
|
||||||
export async function runPgliteMigrations(
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
db: PgliteDatabase<any>,
|
|
||||||
): Promise<void> {
|
|
||||||
// Resolve @mosaicstack/db package root to locate its drizzle migrations folder.
|
|
||||||
const _require = createRequire(import.meta.url);
|
|
||||||
const dbPkgMain = _require.resolve('@mosaicstack/db');
|
|
||||||
// dbPkgMain → …/packages/db/dist/index.js → dirname = dist/
|
|
||||||
// go up one level from dist/ to find the sibling drizzle/ folder
|
|
||||||
const migrationsFolder = resolve(dirname(dbPkgMain), '../drizzle');
|
|
||||||
await migratePglite(db, { migrationsFolder });
|
|
||||||
}
|
|
||||||
125
scratchpads/fix-db-bootstrap-migrations.md
Normal file
125
scratchpads/fix-db-bootstrap-migrations.md
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
# fix(db): bootstrap migrations on local-tier gateway startup
|
||||||
|
|
||||||
|
## Problem
|
||||||
|
|
||||||
|
Fresh `mosaic gateway install` (npm-installed) leaves the gateway DB schema empty:
|
||||||
|
|
||||||
|
```
|
||||||
|
relation "users" does not exist
|
||||||
|
```
|
||||||
|
|
||||||
|
Sign-in 500s, `auth users create` says "Not signed in", `admin/bootstrap setup`
|
||||||
|
also fails — every entry point queries `users` before doing anything else.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
This PR fixes the **local (PGlite) tier** end-to-end. The postgres-tier path
|
||||||
|
has additional pre-existing bugs (see "Known issues, out of scope" below) and
|
||||||
|
needs a separate change with real Postgres validation.
|
||||||
|
|
||||||
|
## Root causes addressed (5 stacked bugs on the local-tier path)
|
||||||
|
|
||||||
|
1. **`packages/db/package.json` `files: ["dist"]`** — the `drizzle/` SQL
|
||||||
|
migrations folder is excluded from the published tarball. Even if a
|
||||||
|
migrate runner existed, it would have nothing to apply.
|
||||||
|
|
||||||
|
2. **`packages/db/src/migrate.ts`** only supports `postgres-js`. Local-tier
|
||||||
|
gateways use embedded PGlite, which can't be reached over a postgres wire
|
||||||
|
protocol — so `runMigrations()` is unusable for the local tier.
|
||||||
|
|
||||||
|
3. **`apps/gateway/src/database/database.module.ts`** never invokes
|
||||||
|
migrations at startup. The module creates the DB handle and storage
|
||||||
|
adapter, but no consumer calls `.migrate()` on either. `mosaic storage
|
||||||
|
migrate` CLI even claims "pglite runs schema setup automatically on first
|
||||||
|
connection via `adapter.migrate()`" — but `adapter.migrate()` is only
|
||||||
|
called by tests, never at runtime.
|
||||||
|
|
||||||
|
4. **`createPgliteDb` does not load the pgvector extension.** Migration 0001
|
||||||
|
declares `CREATE EXTENSION IF NOT EXISTS vector;` for the
|
||||||
|
`insights.embedding` column. Bare PGlite has no pgvector — the migration
|
||||||
|
fails on extension control file lookup.
|
||||||
|
|
||||||
|
5. **Drizzle's PG migrator wraps every migration in one outer transaction.**
|
||||||
|
Migration 0009 does `ALTER TYPE grant_status ADD VALUE 'pending'` and then
|
||||||
|
`ALTER TABLE federation_grants ALTER COLUMN status SET DEFAULT 'pending'`.
|
||||||
|
Postgres' `check_safe_enum_use` rejects the second statement because the
|
||||||
|
new enum value isn't committed yet. Splitting the migration into two
|
||||||
|
files doesn't help — drizzle batches all migrations into one outer tx.
|
||||||
|
|
||||||
|
## Fix
|
||||||
|
|
||||||
|
- `packages/db/package.json` — ship `drizzle/` in `files`.
|
||||||
|
- `packages/db/src/client-pglite.ts` — load `@electric-sql/pglite/vector`.
|
||||||
|
- `packages/db/src/migrate.ts` — add `runPgliteMigrations(handle)`. Walks the
|
||||||
|
Drizzle journal and runs each statement-breakpoint chunk through PGlite's
|
||||||
|
`client.exec()` (Simple Query protocol → autocommit per statement). Writes
|
||||||
|
to the standard `drizzle.__drizzle_migrations` ledger so the result is
|
||||||
|
interoperable with `runMigrations()` on a postgres-backed deployment.
|
||||||
|
Per-statement try/catch surfaces which statement of which migration failed
|
||||||
|
and the ledger row is only written on full success.
|
||||||
|
- `packages/db/src/index.ts` — re-export.
|
||||||
|
- `apps/gateway/src/database/database.module.ts` — implement `OnModuleInit`:
|
||||||
|
- Local tier → `runPgliteMigrations(handle)`, then `storageAdapter.migrate()`
|
||||||
|
(the local storage adapter has its own kv tables in a separate PGlite dir).
|
||||||
|
- Postgres tier → `storageAdapter.migrate()` only, since
|
||||||
|
`PostgresAdapter.migrate()` already calls `runMigrations(url)` against
|
||||||
|
the same DATABASE_URL — we deliberately don't double-call.
|
||||||
|
|
||||||
|
NestJS awaits `onModuleInit` before `app.listen()`, so DB-dependent modules
|
||||||
|
see a populated schema before any HTTP traffic is accepted.
|
||||||
|
|
||||||
|
- `packages/storage/src/test-utils/pglite-with-vector.ts` — **deleted**.
|
||||||
|
The "intentionally not exported" rationale is moot now that migration 0001
|
||||||
|
forces pgvector load anyway. `migrate-tier.integration.test.ts` switched
|
||||||
|
to `createPgliteDb` + `runPgliteMigrations` from `@mosaicstack/db`.
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
`packages/db/src/migrate.test.ts`:
|
||||||
|
|
||||||
|
- Verifies `runPgliteMigrations` creates the BetterAuth tables (the original
|
||||||
|
failure mode).
|
||||||
|
- Idempotence (transitively re-runs migration 0009).
|
||||||
|
- Partial-failure: pre-creates a conflicting `users` table, asserts the
|
||||||
|
thrown error includes statement context (`hash=… statement #N failed`)
|
||||||
|
and that no ledger row was written.
|
||||||
|
|
||||||
|
## QA evidence
|
||||||
|
|
||||||
|
End-to-end on a fresh PGlite install:
|
||||||
|
|
||||||
|
- `[DatabaseModule] Applying PGlite schema migrations...` then
|
||||||
|
`Initializing storage adapter (pglite)...` in startup log.
|
||||||
|
- `GET /api/bootstrap/status` → `{"needsSetup":true}` HTTP 200 (was 500
|
||||||
|
with `relation "users" does not exist`).
|
||||||
|
- `POST /api/bootstrap/setup` with empty body → HTTP 400 with Zod
|
||||||
|
validation error (was 500), confirming the request reached the
|
||||||
|
validator past the table-existence check.
|
||||||
|
|
||||||
|
## Known issues, out of scope (file separately)
|
||||||
|
|
||||||
|
- **Postgres-tier first install is still broken.** `runMigrations()` uses
|
||||||
|
Drizzle's `migratePostgres`, which has the same outer-transaction problem
|
||||||
|
as PGlite's migrator. A fresh standalone-tier install would also fail at
|
||||||
|
migration 0009. Inline TODO in `migrate.ts:31-35` flags this. Fixing it
|
||||||
|
needs either (a) a shared per-statement loop reused for both drivers, or
|
||||||
|
(b) splitting migration 0009.
|
||||||
|
- **`drizzle/meta/_journal.json` has 0009 ordered before 0008** (`when`
|
||||||
|
values `1745280000000` < `1776822435828`). `migratePostgres` skips by
|
||||||
|
`created_at < folderMillis`, so on a postgres deployment that already
|
||||||
|
applied 0008, 0009 would be skipped forever. Our hash-based skip in the
|
||||||
|
PGlite path sidesteps this.
|
||||||
|
- **No advisory lock around the migration loop.** Two gateway processes
|
||||||
|
pointed at the same DATABASE_URL would race. PGlite is single-process by
|
||||||
|
file lock so the local tier is fine; postgres-tier deployments should add
|
||||||
|
`pg_advisory_lock(<deterministic-id>)` around the loop in a follow-up.
|
||||||
|
- **`mosaic storage migrate` CLI message is misleading** — it claims
|
||||||
|
"automatic on first connection via adapter.migrate()" but the adapter
|
||||||
|
doesn't self-migrate. With this PR the gateway invokes it explicitly, but
|
||||||
|
the CLI message could still be tightened.
|
||||||
|
- **Crash mid-migration leaves a partial-state PGlite DB without a ledger
|
||||||
|
row.** Detected loudly on next boot (the replay errors on "already
|
||||||
|
exists"), but recovery is manual (drop the partially-applied objects or
|
||||||
|
insert the migration hash into `drizzle.__drizzle_migrations`). A robust
|
||||||
|
fix would add a "started_at" column to a sidecar table to detect
|
||||||
|
half-applied state and refuse to start with actionable guidance.
|
||||||
Reference in New Issue
Block a user