mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-21 16:02:36 +00:00
* fix: let a draft-only schedule, trigger or resource be deleted Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012SV5kjTis3AFtTx2nW2VRi * fix: keep the legacy-draft write gate out of the draft-only delete Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012SV5kjTis3AFtTx2nW2VRi * fix: don't gate a draft-only resource discard on the deployment rules Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012SV5kjTis3AFtTx2nW2VRi * docs: condense the draft-only delete comments per the comment policy Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_012SV5kjTis3AFtTx2nW2VRi --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
323 lines
10 KiB
Rust
323 lines
10 KiB
Rust
use serde_json::json;
|
|
use sqlx::{Pool, Postgres};
|
|
|
|
use windmill_test_utils::*;
|
|
|
|
fn schedule_url(port: u16, endpoint: &str, path: &str) -> String {
|
|
format!("http://localhost:{port}/api/w/test-workspace/schedules/{endpoint}/{path}")
|
|
}
|
|
|
|
fn client() -> reqwest::Client {
|
|
reqwest::Client::new()
|
|
}
|
|
|
|
fn authed(builder: reqwest::RequestBuilder) -> reqwest::RequestBuilder {
|
|
builder.header("Authorization", "Bearer SECRET_TOKEN")
|
|
}
|
|
|
|
async fn authed_get(port: u16, endpoint: &str, path: &str) -> reqwest::Response {
|
|
authed(client().get(schedule_url(port, endpoint, path)))
|
|
.send()
|
|
.await
|
|
.unwrap()
|
|
}
|
|
|
|
#[sqlx::test(migrations = "../migrations", fixtures("base"))]
|
|
async fn test_schedule_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let base = format!("http://localhost:{port}/api/w/test-workspace/schedules");
|
|
|
|
// create a script for the schedule to reference
|
|
let resp = authed(client().post(format!(
|
|
"http://localhost:{port}/api/w/test-workspace/scripts/create"
|
|
)))
|
|
.json(&json!({
|
|
"path": "u/test-user/scheduled_script",
|
|
"summary": "Scheduled script",
|
|
"description": "",
|
|
"content": "export async function main() { return 1; }",
|
|
"language": "deno",
|
|
"schema": {
|
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
"type": "object",
|
|
"properties": {},
|
|
"required": []
|
|
}
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 201, "create script: {}", resp.text().await?);
|
|
|
|
// --- create ---
|
|
let resp = authed(client().post(format!("{base}/create")))
|
|
.json(&json!({
|
|
"path": "u/test-user/test_schedule",
|
|
"schedule": "0 0 */6 * * *",
|
|
"timezone": "UTC",
|
|
"script_path": "u/test-user/scheduled_script",
|
|
"is_flow": false,
|
|
"enabled": false
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200, "create: {}", resp.text().await?);
|
|
|
|
// create second schedule
|
|
let resp = authed(client().post(format!("{base}/create")))
|
|
.json(&json!({
|
|
"path": "u/test-user/another_schedule",
|
|
"schedule": "0 0 0 * * *",
|
|
"timezone": "America/New_York",
|
|
"script_path": "u/test-user/scheduled_script",
|
|
"is_flow": false,
|
|
"enabled": false
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200, "create another: {}", resp.text().await?);
|
|
|
|
// --- exists ---
|
|
let resp = authed_get(port, "exists", "u/test-user/test_schedule").await;
|
|
assert_eq!(resp.status(), 200);
|
|
assert_eq!(resp.json::<bool>().await?, true);
|
|
|
|
let resp = authed_get(port, "exists", "u/test-user/nonexistent").await;
|
|
assert_eq!(resp.status(), 200);
|
|
assert_eq!(resp.json::<bool>().await?, false);
|
|
|
|
// --- get ---
|
|
let resp = authed_get(port, "get", "u/test-user/test_schedule").await;
|
|
assert_eq!(resp.status(), 200);
|
|
let body = resp.json::<serde_json::Value>().await?;
|
|
assert_eq!(body["path"], "u/test-user/test_schedule");
|
|
assert_eq!(body["schedule"], "0 0 */6 * * *");
|
|
assert_eq!(body["timezone"], "UTC");
|
|
assert_eq!(body["script_path"], "u/test-user/scheduled_script");
|
|
assert_eq!(body["is_flow"], false);
|
|
assert_eq!(body["enabled"], false);
|
|
|
|
// --- list ---
|
|
let resp = authed(client().get(format!("{base}/list")))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
let list = resp.json::<Vec<serde_json::Value>>().await?;
|
|
assert!(
|
|
list.len() >= 2,
|
|
"expected at least 2 schedules, got {}",
|
|
list.len()
|
|
);
|
|
assert!(list
|
|
.iter()
|
|
.any(|s| s["path"] == "u/test-user/test_schedule"));
|
|
|
|
// --- list_with_jobs ---
|
|
let resp = authed(client().get(format!("{base}/list_with_jobs")))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
let list = resp.json::<Vec<serde_json::Value>>().await?;
|
|
assert!(!list.is_empty());
|
|
|
|
// --- update ---
|
|
let resp = authed(client().post(schedule_url(port, "update", "u/test-user/test_schedule")))
|
|
.json(&json!({
|
|
"schedule": "0 0 */12 * * *",
|
|
"timezone": "Europe/Paris"
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200, "update: {}", resp.text().await?);
|
|
|
|
// verify update
|
|
let resp = authed_get(port, "get", "u/test-user/test_schedule").await;
|
|
let body = resp.json::<serde_json::Value>().await?;
|
|
assert_eq!(body["schedule"], "0 0 */12 * * *");
|
|
assert_eq!(body["timezone"], "Europe/Paris");
|
|
|
|
// --- setenabled ---
|
|
let resp = authed(client().post(schedule_url(
|
|
port,
|
|
"setenabled",
|
|
"u/test-user/test_schedule",
|
|
)))
|
|
.json(&json!({"enabled": true}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
|
|
let resp = authed_get(port, "get", "u/test-user/test_schedule").await;
|
|
let body = resp.json::<serde_json::Value>().await?;
|
|
assert_eq!(body["enabled"], true);
|
|
|
|
// disable it back
|
|
let resp = authed(client().post(schedule_url(
|
|
port,
|
|
"setenabled",
|
|
"u/test-user/test_schedule",
|
|
)))
|
|
.json(&json!({"enabled": false}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
|
|
// --- setdefaulthandler ---
|
|
let resp = authed(client().post(format!("{base}/setdefaulthandler")))
|
|
.json(&json!({
|
|
"handler_type": "error",
|
|
"override_existing": false,
|
|
"path": "u/test-user/scheduled_script",
|
|
"number_of_occurence": 1,
|
|
"number_of_occurence_exact": false
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(
|
|
resp.status(),
|
|
200,
|
|
"setdefaulthandler: {}",
|
|
resp.text().await?
|
|
);
|
|
|
|
// clear default handler
|
|
let resp = authed(client().post(format!("{base}/setdefaulthandler")))
|
|
.json(&json!({
|
|
"handler_type": "error",
|
|
"override_existing": false
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
|
|
// --- delete ---
|
|
let resp =
|
|
authed(client().delete(schedule_url(port, "delete", "u/test-user/another_schedule")))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200);
|
|
|
|
let resp = authed_get(port, "exists", "u/test-user/another_schedule").await;
|
|
assert_eq!(resp.json::<bool>().await?, false);
|
|
|
|
// ===== Global endpoints =====
|
|
|
|
// --- preview ---
|
|
let resp = authed(client().post(format!("http://localhost:{port}/api/schedules/preview")))
|
|
.json(&json!({
|
|
"schedule": "0 0 */6 * * *",
|
|
"timezone": "UTC"
|
|
}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200, "preview: {}", resp.text().await?);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// A schedule with no `schedule` row is listed from the `draft` table, so its
|
|
/// DELETE drops that draft, then 404s once nothing is left at the path. A legacy
|
|
/// (`email IS NULL`) draft is owned by nobody and stays put.
|
|
#[sqlx::test(migrations = "../migrations", fixtures("base"))]
|
|
async fn test_delete_draft_only_schedule(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let path = "u/test-user/draft_only_schedule";
|
|
|
|
let resp = authed(client().post(format!(
|
|
"http://localhost:{port}/api/w/test-workspace/drafts/update/trigger_schedule/{path}"
|
|
)))
|
|
.json(&json!({ "value": {
|
|
"path": path,
|
|
"schedule": "0 0 */6 * * *",
|
|
"timezone": "UTC",
|
|
"script_path": "u/test-user/never_deployed",
|
|
"is_flow": false,
|
|
}}))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200, "save draft: {}", resp.text().await?);
|
|
|
|
let resp = authed(client().get(format!(
|
|
"http://localhost:{port}/api/w/test-workspace/schedules/list?include_draft_only=true"
|
|
)))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
let listed: Vec<serde_json::Value> = resp.json().await?;
|
|
assert!(
|
|
listed
|
|
.iter()
|
|
.any(|s| s["path"] == path && s["draft_only"] == json!(true)),
|
|
"draft-only schedule should be listed: {listed:?}"
|
|
);
|
|
|
|
let resp = authed(client().delete(schedule_url(port, "delete", path)))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 200, "delete: {}", resp.text().await?);
|
|
|
|
let remaining: i64 = sqlx::query_scalar(
|
|
"SELECT count(*) FROM draft WHERE workspace_id = 'test-workspace' AND path = $1 \
|
|
AND typ = 'trigger_schedule'::DRAFT_KIND",
|
|
)
|
|
.bind(path)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(remaining, 0, "the draft should be gone");
|
|
|
|
let resp = authed(client().delete(schedule_url(port, "delete", path)))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(resp.status(), 404, "nothing left at the path");
|
|
|
|
// A legacy (email IS NULL) draft is owned by nobody and keeps the write gate
|
|
// on the drafts routes, so this one must not become a second door to it.
|
|
let legacy_path = "u/test-user/legacy_draft_only_schedule";
|
|
sqlx::query(
|
|
"INSERT INTO draft (workspace_id, email, path, typ, value) \
|
|
VALUES ('test-workspace', NULL, $1, 'trigger_schedule'::DRAFT_KIND, '{}'::json)",
|
|
)
|
|
.bind(legacy_path)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let resp = authed(client().delete(schedule_url(port, "delete", legacy_path)))
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(
|
|
resp.status(),
|
|
404,
|
|
"legacy draft is not this route's to delete"
|
|
);
|
|
|
|
let legacy_remaining: i64 = sqlx::query_scalar(
|
|
"SELECT count(*) FROM draft WHERE workspace_id = 'test-workspace' AND path = $1 \
|
|
AND typ = 'trigger_schedule'::DRAFT_KIND",
|
|
)
|
|
.bind(legacy_path)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(legacy_remaining, 1, "the legacy draft should survive");
|
|
|
|
Ok(())
|
|
}
|