The per-env approval policy was applier-supplied — a hand-crafted request
that omitted `project.environments` was ungated, and flipping a gate to
`confirm = false` in the same request un-gated it. Persist the policy
server-side and enforce against `persisted ∪ declared`.
- Migration 0067: `project_environments (project_id, env_name, confirm)`,
CASCADE on the project. Written declaratively (delete-then-insert) inside
`upsert_project_tx`, same tx as the project row + node claim.
- `ProjectRepository::get_environments_by_slug` (read side) +
`ApplyService::effective_env_policy` union the persisted policy with the
request's declared one (confirm if EITHER says so — monotonic).
- `env_gate_check` now evaluates the effective policy; the three handlers load
it before the gate. `plan.approvals_required` is the effective gated set, so
CI sees a persisted gate even when the manifest omits it.
- The union rule closes both bypasses: an omitted policy still trips a
persisted gate, and an ungating apply must itself pass the gate (the
declarative replace then takes effect next time) — TOCTOU-safe.
Pinned by env_approval::{persisted_policy_gates_a_request_that_omits_it,
flipping_a_gate_to_false_in_the_same_request_still_gates} +
projects_repo::get_environments_by_slug_returns_persisted_policy. Schema golden
reblessed.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
151 lines
5.3 KiB
Rust
151 lines
5.3 KiB
Rust
//! §7 repo round-trip: `list_with_owner` pairs each group with its owning
|
|
//! project's slug (`None` when unclaimed), and `ancestors()` surfaces
|
|
//! `owner_project` for every node — the nearest-claimed fold the ownership
|
|
//! claim path (M1.3) relies on.
|
|
//!
|
|
//! Deterministic; skips cleanly when `DATABASE_URL` is unset.
|
|
|
|
use picloud_manager_core::group_repo::{GroupRepository, PostgresGroupRepository};
|
|
use picloud_manager_core::project_repo::{PostgresProjectRepository, ProjectRepository};
|
|
use sqlx::postgres::PgPoolOptions;
|
|
use sqlx::PgPool;
|
|
use uuid::Uuid;
|
|
|
|
async fn pool_or_skip() -> Option<PgPool> {
|
|
let Ok(url) = std::env::var("DATABASE_URL") else {
|
|
eprintln!("projects_repo: DATABASE_URL unset — skipping");
|
|
return None;
|
|
};
|
|
let pool = PgPoolOptions::new()
|
|
.max_connections(2)
|
|
.connect(&url)
|
|
.await
|
|
.expect("connect to DATABASE_URL");
|
|
sqlx::migrate!("./migrations")
|
|
.run(&pool)
|
|
.await
|
|
.expect("apply migrations");
|
|
Some(pool)
|
|
}
|
|
|
|
fn uniq(prefix: &str) -> String {
|
|
format!("{prefix}-{}", &Uuid::new_v4().to_string()[..8])
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn list_with_owner_and_ancestors_surface_ownership() {
|
|
let Some(pool) = pool_or_skip().await else {
|
|
return;
|
|
};
|
|
let groups = PostgresGroupRepository::new(pool.clone());
|
|
let projects = PostgresProjectRepository::new(pool.clone());
|
|
|
|
// A project + a parent/child group pair; claim the CHILD only (a parent is
|
|
// deliberately left unclaimed to pin the `None` path).
|
|
let proj_slug = uniq("proj");
|
|
let (proj_id,): (Uuid,) =
|
|
sqlx::query_as("INSERT INTO projects (slug, name) VALUES ($1, $1) RETURNING id")
|
|
.bind(&proj_slug)
|
|
.fetch_one(&pool)
|
|
.await
|
|
.expect("insert project");
|
|
|
|
let parent = groups
|
|
.create(&uniq("parent"), "Parent", None, None)
|
|
.await
|
|
.expect("create parent");
|
|
let child_slug = uniq("child");
|
|
let child = groups
|
|
.create(&child_slug, "Child", None, Some(parent.id))
|
|
.await
|
|
.expect("create child");
|
|
sqlx::query("UPDATE groups SET owner_project = $1 WHERE id = $2")
|
|
.bind(proj_id)
|
|
.bind(child.id.into_inner())
|
|
.execute(&pool)
|
|
.await
|
|
.expect("claim child");
|
|
|
|
// list_with_owner: the child pairs with the project slug; the parent is
|
|
// unclaimed (None). (The list spans the whole instance — filter by slug.)
|
|
let listed = groups.list_with_owner().await.expect("list_with_owner");
|
|
let child_row = listed
|
|
.iter()
|
|
.find(|(g, _)| g.slug == child_slug)
|
|
.expect("child present in list_with_owner");
|
|
assert_eq!(child_row.1.as_deref(), Some(proj_slug.as_str()));
|
|
let parent_row = listed
|
|
.iter()
|
|
.find(|(g, _)| g.id == parent.id)
|
|
.expect("parent present");
|
|
assert_eq!(parent_row.1, None, "unclaimed group has no owner slug");
|
|
|
|
// ancestors(child) is nearest-first and carries owner_project on each node —
|
|
// the child holds its claim, the parent is None. This is the exact fold
|
|
// input the nearest-claimed resolution walks.
|
|
let chain = groups.ancestors(child.id).await.expect("ancestors");
|
|
assert_eq!(chain[0].id, child.id, "ancestors is nearest-first");
|
|
assert!(
|
|
chain[0].owner_project.is_some(),
|
|
"child ancestor row carries its claim"
|
|
);
|
|
let parent_in_chain = chain
|
|
.iter()
|
|
.find(|g| g.id == parent.id)
|
|
.expect("parent in chain");
|
|
assert!(parent_in_chain.owner_project.is_none());
|
|
|
|
// Project reads round-trip by slug and by id.
|
|
let by_slug = projects.get_by_slug(&proj_slug).await.expect("get_by_slug");
|
|
assert_eq!(by_slug.as_ref().map(|p| p.id.into_inner()), Some(proj_id));
|
|
let by_id = projects
|
|
.get_by_id(by_slug.unwrap().id)
|
|
.await
|
|
.expect("get_by_id");
|
|
assert_eq!(by_id.map(|p| p.slug), Some(proj_slug));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn get_environments_by_slug_returns_persisted_policy() {
|
|
// §3 M3 hermetic gate: the persisted per-env policy round-trips by project
|
|
// slug. Backs `ApplyService::effective_env_policy` (the `persisted` half).
|
|
let Some(pool) = pool_or_skip().await else {
|
|
return;
|
|
};
|
|
let projects = PostgresProjectRepository::new(pool.clone());
|
|
|
|
let proj_slug = uniq("penv");
|
|
let (proj_id,): (Uuid,) =
|
|
sqlx::query_as("INSERT INTO projects (slug, name) VALUES ($1, $1) RETURNING id")
|
|
.bind(&proj_slug)
|
|
.fetch_one(&pool)
|
|
.await
|
|
.expect("insert project");
|
|
for (env, confirm) in [("production", true), ("staging", false)] {
|
|
sqlx::query(
|
|
"INSERT INTO project_environments (project_id, env_name, confirm) VALUES ($1, $2, $3)",
|
|
)
|
|
.bind(proj_id)
|
|
.bind(env)
|
|
.bind(confirm)
|
|
.execute(&pool)
|
|
.await
|
|
.expect("insert env policy");
|
|
}
|
|
|
|
let policy = projects
|
|
.get_environments_by_slug(&proj_slug)
|
|
.await
|
|
.expect("get_environments_by_slug");
|
|
assert_eq!(policy.get("production"), Some(&true));
|
|
assert_eq!(policy.get("staging"), Some(&false));
|
|
assert_eq!(policy.len(), 2);
|
|
|
|
// An unknown slug yields an empty policy (no gate).
|
|
let empty = projects
|
|
.get_environments_by_slug("no-such-project")
|
|
.await
|
|
.expect("get_environments_by_slug");
|
|
assert!(empty.is_empty());
|
|
}
|