* feat: add script module mode with folder model for Bun and Python Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add missing modules field to RawCode in bun_executor Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * sqlx * feat: enrich WAC templates with checkpoint and replay semantics Add prominent comments explaining that all computation must happen inside task/step/taskScript or it will be replayed on resume/retry. Clarify that waitForApproval does not hold a worker and that approve/reject URLs are available in the timeline step details. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(cli): script module sync idempotency, per-module hash tracking, and preview support - Fix pull→push idempotency: use `??` instead of `||` for module lock field so empty strings are preserved (matches API's `lock: ""`) - Add per-module hash tracking in wmill-lock.yaml following the flow inline script pattern (SCRIPT_TOP_HASH + per-module subpath hashes) - Selective module lock regeneration: only regenerate locks for modules whose content actually changed, not all modules - Use unfiltered rawWorkspaceDependencies for module hashes to match what updateModuleLocks passes to fetchScriptLock - Show changed module names in stale script output for clarity - Add module support to `script preview` command: read modules from __mod/ folder and pass them in the preview API request - Add preview tests for taskScript pattern (flat and folder layout) - Update test assertion for module stale detection output Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): WAC UI improvements — reorder templates, module tab rename, import consolidation - Reorder WAC template buttons: TypeScript before Python in ScriptBuilder, CreateActionsScript, and CreateActionsFlow - Remove dropdown items from +Script button (simplify to direct link) - Move "Import Workflow-as-Code" to +Flow dropdown with dedicated drawer - Add module tab rename: pencil icon on hover opens popover with validation, fixed-width icon container prevents layout shift Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat: remaining module-mode changes from working branch - Backend parser updates for WAC detection - CLI sync/types updates for raw app path and module support - Frontend UI polish (Dev.svelte, ScriptRow, script hash page) - Test fixture updates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test(cli): add test for module modification detection in generate-metadata Verifies that modifying a single module file re-triggers stale detection and only the changed module is listed, not all modules. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): critical fixes from PR review - Fix hardcoded dev path in bun_executor.rs WAC v2 wrapper — use "windmill-client" import instead of absolute filesystem path - Fix missed no_main_func → auto_kind rename in parser TS test - Add modules column to clone_script SQL (windmill-common and windmill-api-workspaces) so cloned scripts retain their modules - Add modules: None to RawCode structs in worker tests - Restore complete sqlx cache (merge main's cache + our new queries) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix clone warning treated as error in CI Change `.clone()` on double reference to `*k` dereference in scripts.rs hash implementation. Update sqlx cache with new query hashes from modified clone_script SQL. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use published parser wasm versions for CI build The local file:// paths for windmill-parser-wasm-py and windmill-parser-wasm-ts don't exist in the Cloudflare Pages build environment. Revert to published npm versions (1.655.0). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): update parser wasm packages to 1.657.2 Use newly published windmill-parser-wasm-ts and windmill-parser-wasm-py v1.657.2 which include auto_kind/WAC detection changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): regenerate package-lock.json for npm ci compatibility Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(frontend): use main's lockfile as base, update only parser wasm packages Regenerating package-lock.json from scratch pulled different dependency versions causing svelte-check type errors. Instead, start from main's lockfile and only update the two changed packages. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): add modules column to fetch_script_for_update query The Script<SR> struct has a modules field (FromRow), but fetch_script_for_update didn't SELECT modules, causing a runtime error "no column found for name: modules" when the worker processed dependency jobs. This was the root cause of the relock_skip test timeout. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix script module execution for Python and Bun - Fix modules not passed through job queue: inject _MODULES into PushArgs.extra when pushing Code jobs so worker can extract them - Fix Python module imports: use relative imports (from .helper) and add sys.path.insert for module directory in wrapper - Fix Python tests: use relative imports and empty lock to prevent pip from resolving module names as packages - Add local file check in Bun loader for module resolution - Ignore Bun module test (bundle mode loader integration tracked separately) - Add missing modules column to fetch_script_for_update query Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): remove unnecessary empty lock in Python module tests Relative imports (from .helper) are not parsed as pip packages, so the empty lock workaround is not needed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(backend): fix module execution for Python and Bun — all tests pass Python modules: - Use relative imports (from .helper import greet) since scripts run as packages - Add sys.path.insert for module directory in wrapper to ensure local modules take precedence over pip packages with same name Bun modules: - Use bundled output (./out/main.js) as wrapper import when modules are present — the bundled output has module content inlined by Bun.build, avoiding runtime loader resolution issues - Add local file check in loader.bun.js onResolve to short-circuit API URL resolution for module files on disk Job queue: - Inject _MODULES into PushArgs.extra when pushing Code jobs so the worker can extract them at execution time Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: address PR review — simplify, fix correctness, remove dead code Critical fixes: - Replace all CLI `no_main_func` references with `auto_kind` (string) to match the backend migration and API changes - Remove duplicated `compute_python_module_dir` in worker.rs, use the canonical version from python_executor.rs High priority: - Auto-create `__init__.py` in intermediate directories for nested Python modules so imports like `from .utils.math import add` work without users manually creating __init__.py files - Remove redundant `sys_path_insert` — relative imports use Python's package system, not sys.path Medium: - Fix lock file base name extraction: use regex to strip only the final extension (`.replace(/\.[^.]+$/, '')`) instead of `indexOf(".")` which breaks for files like `helper.test.ts` Simplification: - Remove dead `{#if false}` Popover block in ScriptEditor.svelte - Guard loader.bun.js local file check to only run for relative paths (matching the Windows loader pattern) - Add clarifying comment on Bun dual mechanism (build + run phases) - Add maintenance comment on manual Hash impl for NewScript Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final review fixes — stale cleanup, baseName, auto_kind export - Fix sync.ts baseName extraction using indexOf(".") → regex (same fix as script.ts/metadata.ts, missed this instance) - Add stale module file cleanup in writeModulesToDisk: removes files from __mod/ that are no longer in the modules map before writing, fixing the pull→push cycle that couldn't delete modules - Log warning when _MODULES serialization fails in job push instead of silently dropping modules - Use strict equality (===) for auto_kind comparison - Exclude auto_kind from workspace export — it is auto-detected by the parser at deploy time from script content Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(cli): remove auto_kind from push, comparison, and metadata auto_kind is auto-detected by the parser at deploy time, so the CLI should not send it, compare it, or write it to script.yaml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: remove erroneously added backend/backend/.sqlx directory Duplicate .sqlx cache was committed at the wrong nested path. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address PR review feedback + fix CI dead_code warning Frontend (ScriptEditor.svelte): - Fix switchToMain() missing lastSyncedCode update — prevents stale code sync on external changes while editing a module tab - Fix formatAction saving module code to main script's localStorage draft — now saves main code when on a module tab - Fix non-null assertion on inferModuleLang in renameModule — fall back to original language instead of force unwrap - Remove redundant activeModuleTab truthy check in runTest CLI (script.ts): - Clean up empty directories after removing stale module files in writeModulesToDisk Backend: - Add path traversal guard in write_module_files — reject module paths containing ".." - Fix dead_code warning on auto_kind field in workspace export struct Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * feat(frontend): improve auto_kind UX + address review findings - Rename "Include without main function" toggle to "Include library scripts" in script list (ItemsList.svelte) - Update NoMainFuncBadge: "No main" → "Library" with clearer tooltip - Filter module file extensions by main script language — Python scripts only allow .py modules, TypeScript only .ts, etc. - Split flushModuleState into flushModuleContent (no UI side-effect) and flushModuleState (flush + reset tab), reducing duplication - Dynamic placeholder and hint text in add module popover based on main script language Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
639 lines
18 KiB
Rust
639 lines
18 KiB
Rust
use serde_json::json;
|
|
use sqlx::{Pool, Postgres};
|
|
use windmill_common::jobs::{JobPayload, RawCode};
|
|
use windmill_common::scripts::ScriptLang;
|
|
use windmill_test_utils::*;
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_insert(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
"test-volume",
|
|
1024_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT workspace_id, name, size_bytes, created_by, last_used_at
|
|
FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"test-volume"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
|
|
assert_eq!(row.workspace_id, "test-workspace");
|
|
assert_eq!(row.name, "test-volume");
|
|
assert_eq!(row.size_bytes, 1024);
|
|
assert_eq!(row.created_by, "test-user");
|
|
assert!(row.last_used_at.is_none());
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_upsert_size(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by, last_used_at)
|
|
VALUES ($1, $2, $3, $4, now())
|
|
ON CONFLICT (workspace_id, name) DO UPDATE
|
|
SET size_bytes = $3, last_used_at = now()",
|
|
"test-workspace",
|
|
"upsert-vol",
|
|
500_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT size_bytes FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"upsert-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(row.size_bytes, 500);
|
|
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by, last_used_at)
|
|
VALUES ($1, $2, $3, $4, now())
|
|
ON CONFLICT (workspace_id, name) DO UPDATE
|
|
SET size_bytes = $3, last_used_at = now()",
|
|
"test-workspace",
|
|
"upsert-vol",
|
|
2048_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT size_bytes, last_used_at FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"upsert-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(row.size_bytes, 2048);
|
|
assert!(row.last_used_at.is_some());
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_update_last_used(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
"used-vol",
|
|
100_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT last_used_at FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"used-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert!(row.last_used_at.is_none());
|
|
|
|
sqlx::query!(
|
|
"UPDATE volume SET last_used_at = now() WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"used-vol"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT last_used_at FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"used-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert!(row.last_used_at.is_some());
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_update_nonexistent_noop(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let result = sqlx::query!(
|
|
"UPDATE volume SET last_used_at = now() WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"nonexistent-vol"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
assert_eq!(result.rows_affected(), 0);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_list_multiple(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
for i in 0..5 {
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
format!("vol-{}", i),
|
|
(i * 100) as i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
}
|
|
|
|
let rows = sqlx::query!(
|
|
"SELECT name, size_bytes FROM volume WHERE workspace_id = $1 ORDER BY name",
|
|
"test-workspace"
|
|
)
|
|
.fetch_all(&db)
|
|
.await?;
|
|
|
|
assert_eq!(rows.len(), 5);
|
|
assert_eq!(rows[0].name, "vol-0");
|
|
assert_eq!(rows[0].size_bytes, 0);
|
|
assert_eq!(rows[4].name, "vol-4");
|
|
assert_eq!(rows[4].size_bytes, 400);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_delete(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
"deleteme",
|
|
100_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let count = sqlx::query_scalar!(
|
|
"SELECT count(*) FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"deleteme"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(count, Some(1));
|
|
|
|
sqlx::query!(
|
|
"DELETE FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"deleteme"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let count = sqlx::query_scalar!(
|
|
"SELECT count(*) FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"deleteme"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(count, Some(0));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_workspace_fk_constraint(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let result = sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"nonexistent-workspace",
|
|
"vol",
|
|
100_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await;
|
|
|
|
assert!(result.is_err());
|
|
let err = result.unwrap_err().to_string();
|
|
assert!(
|
|
err.contains("foreign key"),
|
|
"Expected foreign key violation, got: {}",
|
|
err
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_primary_key_uniqueness(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
"unique-vol",
|
|
100_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let result = sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
"unique-vol",
|
|
200_i64,
|
|
"another-user"
|
|
)
|
|
.execute(&db)
|
|
.await;
|
|
|
|
assert!(result.is_err());
|
|
let err = result.unwrap_err().to_string();
|
|
assert!(
|
|
err.contains("duplicate key") || err.contains("unique"),
|
|
"Expected unique violation, got: {}",
|
|
err
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_extra_perms(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
// Insert volume with default (empty) extra_perms
|
|
sqlx::query!(
|
|
"INSERT INTO volume (workspace_id, name, size_bytes, created_by)
|
|
VALUES ($1, $2, $3, $4)",
|
|
"test-workspace",
|
|
"perms-vol",
|
|
100_i64,
|
|
"test-user"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
// Default extra_perms should be empty object
|
|
let row = sqlx::query!(
|
|
"SELECT extra_perms FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"perms-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(row.extra_perms, serde_json::json!({}));
|
|
|
|
// Set extra_perms via jsonb_set (same pattern as granular_acls.rs)
|
|
sqlx::query!(
|
|
"UPDATE volume SET extra_perms = jsonb_set(extra_perms, $1, to_jsonb($2::bool), true)
|
|
WHERE workspace_id = $3 AND name = $4",
|
|
&vec!["u/alice".to_string()],
|
|
true,
|
|
"test-workspace",
|
|
"perms-vol"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT extra_perms FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"perms-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
let perms = row.extra_perms.as_object().unwrap();
|
|
assert_eq!(perms.get("u/alice").and_then(|v| v.as_bool()), Some(true));
|
|
|
|
// Remove a permission entry
|
|
sqlx::query!(
|
|
"UPDATE volume SET extra_perms = extra_perms - $1
|
|
WHERE workspace_id = $2 AND name = $3",
|
|
"u/alice",
|
|
"test-workspace",
|
|
"perms-vol"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
let row = sqlx::query!(
|
|
"SELECT extra_perms FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"perms-vol"
|
|
)
|
|
.fetch_one(&db)
|
|
.await?;
|
|
assert_eq!(row.extra_perms, serde_json::json!({}));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn test_parse_volume_annotations_python() {
|
|
use windmill_worker_volumes::parse_volume_annotations;
|
|
|
|
let content = r#"# sandbox
|
|
# volume: training-data /tmp/training
|
|
# volume: models /opt/models
|
|
|
|
def main():
|
|
pass
|
|
"#;
|
|
let volumes = parse_volume_annotations(content, "#");
|
|
assert_eq!(volumes.len(), 2);
|
|
assert_eq!(volumes[0].name, "training-data");
|
|
assert_eq!(volumes[0].target, "/tmp/training");
|
|
assert_eq!(volumes[1].name, "models");
|
|
assert_eq!(volumes[1].target, "/opt/models");
|
|
}
|
|
|
|
#[test]
|
|
fn test_parse_volume_annotations_typescript() {
|
|
use windmill_worker_volumes::parse_volume_annotations;
|
|
|
|
let content = r#"// sandbox
|
|
// volume: datasets /tmp/datasets
|
|
|
|
export async function main() {
|
|
return "hello";
|
|
}
|
|
"#;
|
|
let volumes = parse_volume_annotations(content, "//");
|
|
assert_eq!(volumes.len(), 1);
|
|
assert_eq!(volumes[0].name, "datasets");
|
|
assert_eq!(volumes[0].target, "/tmp/datasets");
|
|
}
|
|
|
|
#[test]
|
|
fn test_parse_volume_annotations_no_prefix_match() {
|
|
use windmill_worker_volumes::parse_volume_annotations;
|
|
|
|
let content = "def main():\n pass";
|
|
let volumes = parse_volume_annotations(content, "#");
|
|
assert!(volumes.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn test_parse_volume_annotations_empty_script() {
|
|
use windmill_worker_volumes::parse_volume_annotations;
|
|
|
|
let volumes = parse_volume_annotations("", "#");
|
|
assert!(volumes.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn test_sandbox_annotation_python() {
|
|
use windmill_common::worker::PythonAnnotations;
|
|
|
|
let content = "# sandbox\n# volume: data /tmp/data\ndef main():\n pass";
|
|
let annotations = PythonAnnotations::parse(content);
|
|
assert!(annotations.sandbox);
|
|
}
|
|
|
|
#[test]
|
|
fn test_sandbox_annotation_typescript() {
|
|
use windmill_common::worker::TypeScriptAnnotations;
|
|
|
|
let content = "// sandbox\n// volume: data /tmp/data\nexport function main() {}";
|
|
let annotations = TypeScriptAnnotations::parse(content);
|
|
assert!(annotations.sandbox);
|
|
}
|
|
|
|
#[test]
|
|
fn test_volume_comment_prefix_selection() {
|
|
use windmill_common::scripts::ScriptLang;
|
|
|
|
let get_prefix = |lang: &ScriptLang| -> &str {
|
|
match lang {
|
|
ScriptLang::Python3
|
|
| ScriptLang::Bash
|
|
| ScriptLang::Powershell
|
|
| ScriptLang::Ansible
|
|
| ScriptLang::Ruby => "#",
|
|
ScriptLang::Deno
|
|
| ScriptLang::Bun
|
|
| ScriptLang::Bunnative
|
|
| ScriptLang::Nativets
|
|
| ScriptLang::Go => "//",
|
|
_ => "",
|
|
}
|
|
};
|
|
|
|
assert_eq!(get_prefix(&ScriptLang::Python3), "#");
|
|
assert_eq!(get_prefix(&ScriptLang::Bash), "#");
|
|
assert_eq!(get_prefix(&ScriptLang::Powershell), "#");
|
|
assert_eq!(get_prefix(&ScriptLang::Ansible), "#");
|
|
assert_eq!(get_prefix(&ScriptLang::Ruby), "#");
|
|
assert_eq!(get_prefix(&ScriptLang::Deno), "//");
|
|
assert_eq!(get_prefix(&ScriptLang::Bun), "//");
|
|
assert_eq!(get_prefix(&ScriptLang::Bunnative), "//");
|
|
assert_eq!(get_prefix(&ScriptLang::Nativets), "//");
|
|
assert_eq!(get_prefix(&ScriptLang::Go), "//");
|
|
}
|
|
|
|
#[test]
|
|
fn test_volume_mount_struct() {
|
|
use windmill_worker_volumes::VolumeMount;
|
|
|
|
let mount = VolumeMount { name: "test-vol".to_string(), target: "/mnt/data".to_string() };
|
|
assert_eq!(mount.name, "test-vol");
|
|
assert_eq!(mount.target, "/mnt/data");
|
|
}
|
|
|
|
#[test]
|
|
fn test_parse_volume_relative_path() {
|
|
use windmill_worker_volumes::parse_volume_annotations;
|
|
|
|
let content = "// volume: agent-memory .claude\nexport function main() {}";
|
|
let volumes = parse_volume_annotations(content, "//");
|
|
assert_eq!(volumes.len(), 1);
|
|
assert_eq!(volumes[0].name, "agent-memory");
|
|
assert_eq!(volumes[0].target, ".claude");
|
|
}
|
|
|
|
#[test]
|
|
fn test_parse_volume_relative_nested_path() {
|
|
use windmill_worker_volumes::parse_volume_annotations;
|
|
|
|
let content = "# volume: data data/models\ndef main():\n pass";
|
|
let volumes = parse_volume_annotations(content, "#");
|
|
assert_eq!(volumes.len(), 1);
|
|
assert_eq!(volumes[0].name, "data");
|
|
assert_eq!(volumes[0].target, "data/models");
|
|
}
|
|
|
|
#[cfg(feature = "private")]
|
|
#[test]
|
|
fn test_volume_nsjail_mount() {
|
|
use std::path::Path;
|
|
use windmill_worker_volumes::volume_nsjail_mount;
|
|
|
|
let result = volume_nsjail_mount(Path::new("/tmp/volumes/data"), "/mnt/data");
|
|
assert!(result.contains("src: \"/tmp/volumes/data\""));
|
|
assert!(result.contains("dst: \"/mnt/data\""));
|
|
assert!(result.contains("is_bind: true"));
|
|
assert!(result.contains("rw: true"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_sync_stats_default() {
|
|
use windmill_worker_volumes::SyncStats;
|
|
|
|
let stats = SyncStats { new_size_bytes: 0, file_count: 0, uploaded: 0, skipped: 0 };
|
|
assert_eq!(stats.new_size_bytes, 0);
|
|
assert_eq!(stats.file_count, 0);
|
|
assert_eq!(stats.uploaded, 0);
|
|
assert_eq!(stats.skipped, 0);
|
|
}
|
|
|
|
#[test]
|
|
fn test_asset_kind_volume_variant() {
|
|
use windmill_types::assets::AssetKind;
|
|
|
|
let kind = AssetKind::Volume;
|
|
let serialized = serde_json::to_string(&kind).unwrap();
|
|
assert_eq!(serialized, "\"volume\"");
|
|
|
|
let deserialized: AssetKind = serde_json::from_str("\"volume\"").unwrap();
|
|
assert!(matches!(deserialized, AssetKind::Volume));
|
|
}
|
|
|
|
/// E2E test: run a bun script with volume mount through a SQL-connected worker.
|
|
/// Pre-populates the volume in filesystem storage, verifies the script can read
|
|
/// files and write new ones, then checks sync-back to storage and DB state.
|
|
#[cfg(feature = "parquet")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_volume_sql_worker_e2e(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
|
|
// 1. Set up filesystem-based object storage in a temp dir
|
|
let storage_dir = tempfile::tempdir()?;
|
|
let storage_root = storage_dir.path().to_string_lossy().to_string();
|
|
|
|
let lfs_config = json!({
|
|
"type": "FilesystemStorage",
|
|
"root_path": storage_root,
|
|
"public_resource": null,
|
|
"advanced_permissions": null,
|
|
"volume_storage": "primary"
|
|
});
|
|
|
|
sqlx::query!(
|
|
"UPDATE workspace_settings SET large_file_storage = $1 WHERE workspace_id = $2",
|
|
lfs_config,
|
|
"test-workspace"
|
|
)
|
|
.execute(&db)
|
|
.await?;
|
|
|
|
// 2. Pre-populate the volume with a file (workspace-namespaced path)
|
|
let vol_dir = storage_dir
|
|
.path()
|
|
.join("volumes")
|
|
.join("test-workspace")
|
|
.join("test-vol");
|
|
std::fs::create_dir_all(&vol_dir)?;
|
|
std::fs::write(vol_dir.join("hello.txt"), b"hello from volume")?;
|
|
|
|
// 3. Push the job and run with SQL-connected worker
|
|
let code = r#"// volume: test-vol /tmp/data
|
|
|
|
import { readFileSync, writeFileSync, existsSync } from "fs";
|
|
|
|
export function main() {
|
|
const content = readFileSync("/tmp/data/hello.txt", "utf-8");
|
|
writeFileSync("/tmp/data/output.txt", "written by sql worker");
|
|
return {
|
|
read_content: content,
|
|
output_exists: existsSync("/tmp/data/output.txt"),
|
|
};
|
|
}"#;
|
|
|
|
let job = JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: code.to_string(),
|
|
path: None,
|
|
language: ScriptLang::Bun,
|
|
lock: None,
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
modules: None,
|
|
});
|
|
|
|
let result = run_job_in_new_worker_until_complete(&db, false, job, port).await;
|
|
|
|
assert!(result.success, "job should succeed: {:?}", result.result);
|
|
let json = result.json_result().expect("should have JSON result");
|
|
assert_eq!(json["read_content"], json!("hello from volume"));
|
|
assert_eq!(json["output_exists"], json!(true));
|
|
|
|
// 4. Verify volume DB row was updated
|
|
let vol_row = sqlx::query!(
|
|
"SELECT size_bytes, file_count, leased_by, lease_until
|
|
FROM volume WHERE workspace_id = $1 AND name = $2",
|
|
"test-workspace",
|
|
"test-vol"
|
|
)
|
|
.fetch_optional(&db)
|
|
.await?;
|
|
|
|
let vol_row = vol_row.expect("volume row should exist");
|
|
assert!(
|
|
vol_row.file_count >= 2,
|
|
"should have at least 2 files (hello.txt + output.txt), got: {}",
|
|
vol_row.file_count
|
|
);
|
|
assert!(vol_row.size_bytes > 0, "size_bytes should be > 0");
|
|
assert!(vol_row.leased_by.is_none(), "lease should be released");
|
|
|
|
// 5. Verify the new file was written back to storage
|
|
let output_path = vol_dir.join("output.txt");
|
|
assert!(
|
|
output_path.exists(),
|
|
"output.txt should be synced back to storage"
|
|
);
|
|
let output_content = std::fs::read_to_string(&output_path)?;
|
|
assert_eq!(output_content, "written by sql worker");
|
|
|
|
Ok(())
|
|
}
|