feat(manager-core,orchestrator-core): multi-app scoping (Phase 3b)
Apps become the isolation boundary for scripts, routes, domains, and
later data. Doing this now — while the surface is small — avoids
several migrations on populated tables once v1.1 data-plane services
ship.
Schema (migration 0005_apps.sql):
- New tables: apps, app_domains (with shape_key UNIQUE for collision
detection), app_slug_history (for permanent slug-rename redirects).
- app_id added to scripts, routes, execution_logs (non-null, cascading
rules per row).
- Script-name uniqueness becomes per-app; the route unique index is
swapped for an app-scoped version.
- The "default" app is seeded unconditionally with a localhost claim;
existing scripts/routes backfill into it. Fresh installs additionally
get the Hello World seed via seed_hello_world_if_fresh after
migrations run (idempotent — only fires when the default app has no
scripts).
Orchestrator dispatch is two-phase: AppDomainTable resolves Host →
app_id (most-specific match wins, exact beats wildcard), then the
existing route matcher runs against that app's partitioned slice via
RouteTable. Unknown hosts return 404 at the app layer with a clear
message; /api/v1/execute/{id} still works as the implicit
__internal__ claim, decoupled from any public domain.
Manager API: full CRUD for /api/v1/admin/apps/* and
/api/v1/admin/apps/{id_or_slug}/domains/*, with slug:check + force
takeover semantics implementing the rename-history flow (two-step
check → confirm, never a single endpoint). Script create requires
app_id; list accepts ?app= filter. Route create validates host
against the parent app's claims; conflict detection stays strictly
intra-app.
Dashboard: /admin/apps and /admin/apps/{slug} (overview + scripts +
domains + settings tabs, with slug-history-aware redirects). Root
path redirects to the apps list. Script detail page gains an app
breadcrumb and threads app_id into the route preview.
Deferred per design: per-app admin roles. The require_admin middleware
remains the seam where role checks will slot in later.
Blueprint §11.5 and roadmap updated to reflect what shipped; docs/
versioning.md notes the schema 3 → 5 bump.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
53
crates/shared/src/app.rs
Normal file
53
crates/shared/src/app.rs
Normal file
@@ -0,0 +1,53 @@
|
||||
//! App scoping: top-level isolation boundary for scripts, routes,
|
||||
//! domains, and (forward) data. Every script and route belongs to
|
||||
//! exactly one app; cross-app references are not allowed.
|
||||
//!
|
||||
//! See blueprint §11.5. The orchestrator dispatches via two-phase
|
||||
//! lookup: `Host → app_id → route trie`.
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::AppId;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct App {
|
||||
pub id: AppId,
|
||||
/// URL-safe identifier; appears in dashboard paths. Mutable via the
|
||||
/// slug-rename flow which preserves the old slug as a permanent 301
|
||||
/// in `app_slug_history`.
|
||||
pub slug: String,
|
||||
pub name: String,
|
||||
pub description: Option<String>,
|
||||
pub created_at: DateTime<Utc>,
|
||||
pub updated_at: DateTime<Utc>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum DomainShape {
|
||||
/// Exact host: `app.example.com`.
|
||||
Exact,
|
||||
/// Wildcard suffix: `*.example.com` matches any subdomain.
|
||||
Wildcard,
|
||||
/// Parameterized wildcard: `{tenant}.example.com`. Same shape as
|
||||
/// `Wildcard` for collision purposes; the binding name surfaces in
|
||||
/// request context (future).
|
||||
Parameterized,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct AppDomain {
|
||||
pub id: Uuid,
|
||||
pub app_id: AppId,
|
||||
/// As the user typed it: `app.example.com`, `*.example.com`, or
|
||||
/// `{tenant}.example.com`.
|
||||
pub pattern: String,
|
||||
pub shape: DomainShape,
|
||||
/// Normalized collision key. `exact:<host>` for exact; `wildcard:<suffix>`
|
||||
/// for both wildcard and parameterized (parameter name is a binding,
|
||||
/// not a discriminator — per blueprint §11.5).
|
||||
pub shape_key: String,
|
||||
pub created_at: DateTime<Utc>,
|
||||
}
|
||||
@@ -11,4 +11,10 @@ pub enum Error {
|
||||
|
||||
#[error("invalid script source: {0}")]
|
||||
InvalidScript(String),
|
||||
|
||||
#[error("app not found: {0}")]
|
||||
AppNotFound(crate::AppId),
|
||||
|
||||
#[error("domain claim conflict: {0}")]
|
||||
DomainConflict(String),
|
||||
}
|
||||
|
||||
@@ -4,13 +4,16 @@ use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{RequestId, ScriptId};
|
||||
use crate::{AppId, RequestId, ScriptId};
|
||||
|
||||
/// One row in the `execution_logs` table. Same shape flows through the
|
||||
/// `ExecutionLogSink` trait and the `GET /scripts/{id}/logs` response.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ExecutionLog {
|
||||
pub id: Uuid,
|
||||
/// Owning app at the time of execution. Materialized at write time
|
||||
/// so a future "move script to another app" doesn't retag history.
|
||||
pub app_id: AppId,
|
||||
pub script_id: ScriptId,
|
||||
pub request_id: RequestId,
|
||||
|
||||
|
||||
@@ -51,3 +51,4 @@ id_type!(ScriptId);
|
||||
id_type!(ExecutionId);
|
||||
id_type!(RequestId);
|
||||
id_type!(AdminUserId);
|
||||
id_type!(AppId);
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
//! that core's crate. Things here must be genuinely shared (IDs, the Script
|
||||
//! entity, error roots, transport DTOs).
|
||||
|
||||
pub mod app;
|
||||
pub mod error;
|
||||
pub mod execution_log;
|
||||
pub mod ids;
|
||||
@@ -14,9 +15,10 @@ pub mod script;
|
||||
pub mod validator;
|
||||
pub mod version;
|
||||
|
||||
pub use app::{App, AppDomain, DomainShape};
|
||||
pub use error::Error;
|
||||
pub use execution_log::{ExecutionLog, ExecutionStatus};
|
||||
pub use ids::{AdminUserId, ExecutionId, RequestId, ScriptId};
|
||||
pub use ids::{AdminUserId, AppId, ExecutionId, RequestId, ScriptId};
|
||||
pub use log_sink::{ExecutionLogSink, LogSinkError};
|
||||
pub use route::{HostKind, PathKind, Route};
|
||||
pub use sandbox::ScriptSandbox;
|
||||
|
||||
@@ -7,7 +7,7 @@ use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::ScriptId;
|
||||
use crate::{AppId, ScriptId};
|
||||
|
||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
@@ -40,6 +40,10 @@ pub enum PathKind {
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Route {
|
||||
pub id: Uuid,
|
||||
/// Owning app. Always equals `scripts.app_id` for the bound script.
|
||||
/// Carried on the route row so the orchestrator can partition the
|
||||
/// route table without joining back to scripts on every refresh.
|
||||
pub app_id: AppId,
|
||||
pub script_id: ScriptId,
|
||||
|
||||
pub host_kind: HostKind,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::{ScriptId, ScriptSandbox};
|
||||
use crate::{AppId, ScriptId, ScriptSandbox};
|
||||
|
||||
/// A user-uploaded Rhai script and its execution configuration.
|
||||
///
|
||||
@@ -11,6 +11,10 @@ use crate::{ScriptId, ScriptSandbox};
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Script {
|
||||
pub id: ScriptId,
|
||||
/// Owning app. Set on create, immutable thereafter — a "move to
|
||||
/// another app" is a copy+delete, not an in-place edit (snapshot
|
||||
/// semantics — see blueprint §11.5).
|
||||
pub app_id: AppId,
|
||||
pub name: String,
|
||||
pub description: Option<String>,
|
||||
pub version: i32,
|
||||
|
||||
Reference in New Issue
Block a user