fabi/PiCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(apply): restore bare-bundle wire compat on the plan endpoints

Browse Source 
§7 M3 wrapped the three plan request bodies in a `{bundle, project}` struct,
silently breaking version-skew compatibility: a pre-§7 `pic plan` POSTs a BARE
bundle at the JSON top level and now fails deserialization (422 "missing field
bundle"), even though the sibling apply request deliberately kept its added
fields additive (`#[serde(default)]`) so an older CLI still works.

`#[serde(flatten)]` the bundle in `PlanRequest`/`TreePlanRequest` so the bundle
fields sit at the top level again: a bare bundle deserializes (`project`
defaults to `None`) and a newer client sends the same fields plus a top-level
`project` key. The CLI now builds that shape via a `plan_body` helper (bundle
object + optional `project`), which an older server also accepts (Bundle has no
`deny_unknown_fields`, so the extra key is ignored) — compatible in both skew
directions. Apply is left unwrapped (it was already `{bundle, ...}` pre-§7).

Pinned by `plan_request_accepts_a_bare_bundle` / `_a_flattened_project` /
`tree_plan_request_accepts_a_bare_bundle` unit tests.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
MechaCat02
2026-07-07 07:37:35 +02:00
parent 74f7a67be7
commit ffa8b02506
2 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/picloud-cli/src/client.rs
View File

@@ -39,6 +39,25 @@ fn seg(s: &str) -> String {
utf8_percent_encode(s, PATH_SEGMENT).to_string()
}
/// Build a `plan` request body: the bundle fields at the JSON top level plus an
/// optional `project` key (§7). The plan endpoints `#[serde(flatten)]` the
/// bundle, so a bare bundle (no `[project]`) is the pre-§7 wire shape — this
/// keeps `pic plan` compatible across a CLI/server version skew in either
/// direction (an old server ignores the extra `project`; a new server accepts
/// the bare bundle).
fn plan_body(
bundle: &serde_json::Value,
project: Option<&crate::manifest::ManifestProject>,
) -> Result<serde_json::Value> {
let mut body = bundle.clone();
if let Some(p) = project {
if let Some(obj) = body.as_object_mut() {
obj.insert("project".to_string(), serde_json::to_value(p)?);
}
}
Ok(body)
}
pub struct Client {
http: reqwest::Client,
url: String,
@@ -1233,7 +1252,7 @@ impl Client {
project: Option<&crate::manifest::ManifestProject>,
) -> Result<PlanDto> {
let slug = seg(slug);
let body = serde_json::json!({ "bundle": bundle, "project": project });
let body = plan_body(bundle, project)?;
let resp = self
.request(
Method::POST,
@@ -1291,7 +1310,7 @@ impl Client {
bundle: &serde_json::Value,
project: Option<&crate::manifest::ManifestProject>,
) -> Result<TreePlanDto> {
let body = serde_json::json!({ "bundle": bundle, "project": project });
let body = plan_body(bundle, project)?;
let resp = self
.request(Method::POST, "/api/v1/admin/tree/plan")
.json(&body)