mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-05 00:03:08 +00:00
1f59841a67
* feat: add WM_ROOT_WORKSPACE, the closest dev or prod workspace of a job Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HBMJwogo6jJ1P55uvB3YpF * fix: do not cache a failed root-workspace lookup, and sweep on fork create Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HBMJwogo6jJ1P55uvB3YpF * fix: shorten the agent-worker root-workspace TTL and pin the sweep wiring Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HBMJwogo6jJ1P55uvB3YpF * chore: update ee-repo-ref to a2fa58e5301d3865dd06ad73519e20ba7a5af0f0 This commit updates the EE repository reference after PR #736 was merged in windmill-ee-private. Previous ee-repo-ref: 07a9d26a79a403ae27c48abd508a6699f2c87c49 New ee-repo-ref: a2fa58e5301d3865dd06ad73519e20ba7a5af0f0 Automated by sync-ee-ref workflow. --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
61 lines
2.6 KiB
Rust
61 lines
2.6 KiB
Rust
//! Regression guard for the workspace a job reports as `WM_ROOT_WORKSPACE`.
|
|
//!
|
|
//! Run with:
|
|
//! cargo test -p windmill-common --test root_workspace
|
|
|
|
use sqlx::{Pool, Postgres};
|
|
use windmill_common::worker::Connection;
|
|
use windmill_common::workspaces::{invalidate_root_workspace_cache, root_workspace_id};
|
|
|
|
async fn insert_ws(db: &Pool<Postgres>, id: &str, parent: Option<&str>, is_dev: bool) {
|
|
sqlx::query(
|
|
"INSERT INTO workspace (id, name, owner, parent_workspace_id, is_dev_workspace)
|
|
VALUES ($1, $1, 'test-user', $2, $3)",
|
|
)
|
|
.bind(id)
|
|
.bind(parent)
|
|
.bind(is_dev)
|
|
.execute(db)
|
|
.await
|
|
.expect("insert workspace");
|
|
// The resolver caches per id in a process-global cache shared across tests.
|
|
invalidate_root_workspace_cache(id);
|
|
}
|
|
|
|
#[sqlx::test(migrations = "../migrations", fixtures("base"))]
|
|
async fn root_workspace_is_the_nearest_dev_or_prod_ancestor(db: Pool<Postgres>) {
|
|
let conn = Connection::Sql(db.clone());
|
|
insert_ws(&db, "rwt-prod", None, false).await;
|
|
insert_ws(&db, "rwt-dev", Some("rwt-prod"), true).await;
|
|
insert_ws(&db, "wm-fork-rwt", Some("rwt-prod"), false).await;
|
|
insert_ws(&db, "wm-fork-underdev", Some("rwt-dev"), false).await;
|
|
insert_ws(&db, "wm-fork-nested", Some("wm-fork-underdev"), false).await;
|
|
// A generated-id workspace re-designated as a dev workspace, under its own root since only one
|
|
// dev workspace is allowed per parent.
|
|
insert_ws(&db, "rwt-prod2", None, false).await;
|
|
insert_ws(&db, "wm-fork-asdev", Some("rwt-prod2"), true).await;
|
|
insert_ws(&db, "wm-fork-asdev-fork", Some("wm-fork-asdev"), false).await;
|
|
|
|
assert_eq!(root_workspace_id(&conn, "rwt-prod").await, "rwt-prod");
|
|
assert_eq!(root_workspace_id(&conn, "rwt-dev").await, "rwt-dev");
|
|
assert_eq!(root_workspace_id(&conn, "wm-fork-rwt").await, "rwt-prod");
|
|
assert_eq!(
|
|
root_workspace_id(&conn, "wm-fork-underdev").await,
|
|
"rwt-dev"
|
|
);
|
|
assert_eq!(root_workspace_id(&conn, "wm-fork-nested").await, "rwt-dev");
|
|
// A dev workspace ends the walk whatever its id. Tag resolution deliberately walks past a
|
|
// generated-id dev workspace because nothing provisions workers for such an id, but the
|
|
// environment a fork belongs to is still that workspace.
|
|
assert_eq!(
|
|
root_workspace_id(&conn, "wm-fork-asdev").await,
|
|
"wm-fork-asdev"
|
|
);
|
|
assert_eq!(
|
|
root_workspace_id(&conn, "wm-fork-asdev-fork").await,
|
|
"wm-fork-asdev"
|
|
);
|
|
// An id with no lineage to resolve is its own environment.
|
|
assert_eq!(root_workspace_id(&conn, "rwt-missing").await, "rwt-missing");
|
|
}
|