mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-24 16:01:42 +00:00
c4c9ef5fd7
* feat: add optional labels to scripts, flows, apps, raw apps, schedules, and triggers
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: update sqlx cache, make labels optional in openapi, regenerate system prompts
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add minimal labels input UI to script, flow, and schedule editors
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: reduce gap between summary and labels input
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add labels to script/flow detail pages and summary/path popover
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: move labels inside SummaryPathDisplay trigger for clickable area, reduce gap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: display labels inline to the right of summary, not below
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: increase gap between summary and labels
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add labels to resources/variables, make labels nullable, add home page label filter badges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add labels to workspace export/import, resources, variables + test coverage
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: make migration idempotent, regenerate sqlx cache after merge
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: pass labels in script create and flow create/update API calls
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add labels input UI to resource and variable editors
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: remove negative margin from LabelsInput to prevent overlap
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add top and left margin to LabelsInput for better spacing
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: reduce left margin on LabelsInput
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: widen label input to w-32
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use inline-flex so LabelsInput doesn't stretch full width
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: remove flex-wrap so label input stays on same line as badges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add label filter presets to resources, variables, and schedules search
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use max-w-32 on label input to prevent stretching
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: pull labels closer to summary with negative top margin
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: increase negative margin to pull labels even closer to summary
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: pass labels in schedule create/update API calls
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use COALESCE to preserve existing labels when not provided in schedule/flow update
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels to CreateResource, EditResource, CreateVariable, EditVariable in OpenAPI spec
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: display label badges on resource and variable list pages
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: display label badges on schedule and all trigger list pages
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add folder and label presets to schedules search filter
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: apply user_folders_only filter on all workspaces including admins
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add label presets to resources and variables search filters
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: derive folder presets from loaded items, not all workspace folders
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add label query parameter to resource and variable list endpoints in OpenAPI
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: display label filter badges inline with folder filters on home page
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* Revert "feat: display label filter badges inline with folder filters on home page"
This reverts commit 6767a50aa6.
* feat: support comma-separated label filters (allowMultiple) in all list endpoints
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: append label presets with comma for allowMultiple filters instead of duplicating key
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: hide label presets that are already in the comma-separated filter value
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: replace unsafe manual SQL ARRAY construction with parameterized queries, add labels to ScriptWDraft
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: complete down migration, add labels to Resource/Variable OpenAPI schemas, remove type cast, add label length validation
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels field to Schedule test fixture
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels field to Rust client struct constructions
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: regenerate sqlx cache with --all-features for EE builds
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* chore: regenerate sqlx cache and package-lock after merge with main
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: squash two migrations into one, use IF NOT EXISTS for idempotency
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: track label changes in SummaryPathDisplay to enable save button
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use JSON string comparison for label dirty tracking in popover
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: navigate to script by path after save from popover to load new version
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: update initialLabels after save so subsequent label changes enable save again
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use onchange callback for label dirty tracking instead of derived comparison
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: reload script by path after label save to fetch new version
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: propagate script/flow labels to jobs at push time
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: show script/flow labels on runs page, merge with wm_labels for completed jobs
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: change job labels type from JSONB to text[], show labels on job detail page, fix type mismatch
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels to QueuedJob struct, fix get_job queries to return v2_job.labels
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: replace +Label text with icon only
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add tag icon before labels on job detail page
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: move tag icon inside badge on job detail page
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use blue badge with tag icon in RunBadges, remove duplicate labels from JobDetailHeader
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: set icon position to left so tag icon renders in badge
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: render Tag icon inline in badge children instead of via icon prop
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: retry icon prop with small badge and position left
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add hover tooltip showing "Label: X" on job label badges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: include v2_job.labels in runs page label filter and broad search
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* chore: regenerate sqlx cache and system prompts after merge with main
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels to EE JobPayload constructions, regenerate sqlx cache with --all-features
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: regenerate sqlx cache CE-only (without EE symlinks that cause conflicts)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: update remaining wm_labels JSONB queries to use text[] merge expression
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: simplify job labels to just read v2_job.labels (wm_labels already merged at completion)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: consistent label badge spacing with gap-0.5 wrapper and px-0.5 on badges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels: None to test utils JobPayload construction
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add labels to all test fixture JobPayload/NewFlow/EditApp constructions, regenerate sqlx cache
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: fix vertical content shift by fixing container and input height to h-5
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: npm_check errors - unused imports, combinedItems order, flow.labels type, badge px-1 padding
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: remove unused FolderService imports, fix label badge alignment in RunBadges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: restore deleted service imports in variables page, remove empty loadFolders
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* chore: trigger CI with updated ee-repo-ref
* chore: update ee-repo-ref to merged EE companion PR
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* chore: trigger fresh CI run for updated ee-repo-ref
* fix: match label badge size with other badges in RunBadges using {large} prop
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: remove icon from RunBadges label badge to fix vertical alignment
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: shorten "Job kind" to "Kind" in run badges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add small inline tag icon (10px, -mt-px) to label badge without disrupting height
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: add "Label: X" hover tooltip to all label badges, show hidden labels on +N hover
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add tag icon and "Label: X" tooltip to home page label filter badges
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: show LabelsInput even when path is hidden in ResourceEditor
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add labels input to new resource creation drawer (AppConnectInner)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* iterate
* fix: add LabelsInput to all resource creation steps in AppConnectInner
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: reduce LabelsInput top margin from -mt-3 to -mt-1
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: increase negative margin to -mt-2 for tighter spacing
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: split the difference with -mt-1.5
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: adjust to -mt-1 for label spacing
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: per-site label spacing via class prop instead of global negative margin
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: make label badges clickable to toggle label filter on resources, variables, schedules
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use proper array indexOf for label filter toggle, set undefined correctly on removal
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use delete instead of undefined to properly clear label filter
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add /labels/list endpoint and autocomplete dropdown to LabelsInput
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: use inline preventDefault for Svelte 5 event handling
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add "Create new" option in label autocomplete, regenerate sqlx cache with update_sqlx.sh
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* feat: add GIN indexes on labels column for all 16 tables
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: remove CONCURRENTLY from GIN index creation in migration
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* test: add comprehensive label coverage for pull, edit, removal across all item types
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: simplify job label filters to only use v2_job.labels, remove wm_labels back-compat
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* test: add integration tests for job label propagation, display, and filtering
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* fix: address PR review findings — missing labels in fetch_script_for_update, app rename, escape key bug
- Add `labels` to SELECT in `fetch_script_for_update` to prevent lost labels on script clone
- Pass `labels` in app branch of `moveRenameManager.ts` so app renames preserve labels
- Clear `inputValue` before `adding = false` in LabelsInput escape handler to prevent accidental label add via onblur
- Fix `test_job_label_filter` to complete jobs via SQL (label filtering only works on completed jobs)
- Add `test_wm_labels_from_result_merged_with_static_labels` integration test using Bun
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1185 lines
36 KiB
Rust
1185 lines
36 KiB
Rust
use serde::Deserialize;
|
|
use serde_json::json;
|
|
use sqlx::{Pool, Postgres};
|
|
|
|
use windmill_common::{
|
|
jobs::{JobPayload, RawCode},
|
|
scripts::ScriptLang,
|
|
};
|
|
|
|
use windmill_test_utils::*;
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
struct ListJobsResponse {
|
|
#[serde(rename = "type")]
|
|
#[allow(dead_code)]
|
|
typ: String,
|
|
id: String,
|
|
#[serde(default)]
|
|
args: Option<serde_json::Value>,
|
|
#[serde(flatten)]
|
|
_extra: std::collections::HashMap<String, serde_json::Value>,
|
|
}
|
|
|
|
/// Response struct for queue/list endpoint (no type field)
|
|
#[derive(Debug, Deserialize)]
|
|
struct QueueJobResponse {
|
|
id: String,
|
|
#[serde(default)]
|
|
args: Option<serde_json::Value>,
|
|
#[serde(flatten)]
|
|
_extra: std::collections::HashMap<String, serde_json::Value>,
|
|
}
|
|
|
|
/// Response struct for completed/list endpoint
|
|
#[cfg(feature = "python")]
|
|
#[derive(Debug, Deserialize)]
|
|
struct CompletedJobResponse {
|
|
id: String,
|
|
#[serde(default)]
|
|
args: Option<serde_json::Value>,
|
|
#[serde(flatten)]
|
|
_extra: std::collections::HashMap<String, serde_json::Value>,
|
|
}
|
|
|
|
/// Test that list_jobs returns jobs without args by default
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_list_jobs_without_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push a job to the queue with specific args
|
|
let job_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Call list_jobs without include_args
|
|
let response = client
|
|
.client()
|
|
.get(format!("{}/w/test-workspace/jobs/list", client.baseurl()))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success(), "list_jobs should succeed");
|
|
|
|
let jobs: Vec<ListJobsResponse> = response.json().await?;
|
|
|
|
// Find the job we created
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the created job");
|
|
|
|
// Args should be None when include_args is not set
|
|
assert!(
|
|
job.args.is_none(),
|
|
"args should not be included when include_args is not set"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test that list_jobs returns jobs with args when include_args=true
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_list_jobs_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push a job to the queue with specific args
|
|
let job_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Call list_jobs with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"list_jobs with include_args should succeed"
|
|
);
|
|
|
|
let jobs: Vec<ListJobsResponse> = response.json().await?;
|
|
|
|
// Find the job we created
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the created job");
|
|
|
|
// Args should be present when include_args=true
|
|
assert!(
|
|
job.args.is_some(),
|
|
"args should be included when include_args=true"
|
|
);
|
|
|
|
let args = job.args.as_ref().unwrap();
|
|
assert_eq!(
|
|
args.get("x"),
|
|
Some(&json!(42)),
|
|
"args should contain the correct value"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test that list_jobs returns completed jobs with args when include_args=true
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_list_jobs_completed_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Run a job to completion
|
|
let completed_job = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
let job_id = completed_job.id;
|
|
|
|
// Call list_jobs with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"list_jobs with include_args should succeed"
|
|
);
|
|
|
|
let jobs: Vec<ListJobsResponse> = response.json().await?;
|
|
|
|
// Find the completed job
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the completed job");
|
|
|
|
// Args should be present when include_args=true
|
|
assert!(
|
|
job.args.is_some(),
|
|
"args should be included for completed jobs when include_args=true"
|
|
);
|
|
|
|
let args = job.args.as_ref().unwrap();
|
|
assert_eq!(
|
|
args.get("x"),
|
|
Some(&json!(42)),
|
|
"args should contain the correct value for completed jobs"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test that list_jobs returns both queued and completed jobs with args
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_list_jobs_mixed_queue_and_completed(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Run a job to completion first
|
|
let completed_job = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(completed_arg): return completed_arg".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("completed_arg", json!("completed_value"))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
let completed_job_id = completed_job.id;
|
|
|
|
// Push another job to the queue (don't run it)
|
|
let queued_job_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(queued_arg): return queued_arg".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("queued_arg", json!("queued_value"))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Call list_jobs with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"list_jobs with include_args should succeed"
|
|
);
|
|
|
|
let jobs: Vec<ListJobsResponse> = response.json().await?;
|
|
|
|
// Find the completed job
|
|
let completed = jobs
|
|
.iter()
|
|
.find(|j| j.id == completed_job_id.to_string())
|
|
.expect("should find the completed job");
|
|
|
|
assert!(
|
|
completed.args.is_some(),
|
|
"completed job should have args when include_args=true"
|
|
);
|
|
assert_eq!(
|
|
completed.args.as_ref().unwrap().get("completed_arg"),
|
|
Some(&json!("completed_value")),
|
|
"completed job should have correct args"
|
|
);
|
|
|
|
// Find the queued job
|
|
let queued = jobs
|
|
.iter()
|
|
.find(|j| j.id == queued_job_id.to_string())
|
|
.expect("should find the queued job");
|
|
|
|
assert!(
|
|
queued.args.is_some(),
|
|
"queued job should have args when include_args=true"
|
|
);
|
|
assert_eq!(
|
|
queued.args.as_ref().unwrap().get("queued_arg"),
|
|
Some(&json!("queued_value")),
|
|
"queued job should have correct args"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test list_jobs with multiple queued jobs and include_args
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_list_jobs_multiple_queued_with_include_args(
|
|
db: Pool<Postgres>,
|
|
) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push two jobs with different args
|
|
let job1_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(1))
|
|
.push(&db)
|
|
.await;
|
|
|
|
let job2_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(y): return y".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("y", json!(2))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Test with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success(), "list_jobs should succeed");
|
|
|
|
let jobs: Vec<ListJobsResponse> = response.json().await?;
|
|
|
|
// Find both jobs
|
|
let job1 = jobs
|
|
.iter()
|
|
.find(|j| j.id == job1_id.to_string())
|
|
.expect("should find job1");
|
|
let job2 = jobs
|
|
.iter()
|
|
.find(|j| j.id == job2_id.to_string())
|
|
.expect("should find job2");
|
|
|
|
// Both should have args
|
|
assert!(job1.args.is_some(), "job1 args should be included");
|
|
assert!(job2.args.is_some(), "job2 args should be included");
|
|
|
|
// Check the args are correct
|
|
assert_eq!(
|
|
job1.args.as_ref().unwrap().get("x"),
|
|
Some(&json!(1)),
|
|
"job1 should have correct args"
|
|
);
|
|
assert_eq!(
|
|
job2.args.as_ref().unwrap().get("y"),
|
|
Some(&json!(2)),
|
|
"job2 should have correct args"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
// ============================================================================
|
|
// Tests for /queue/list endpoint
|
|
// ============================================================================
|
|
|
|
/// Test that queue/list returns jobs without args by default
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_queue_list_without_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push a job to the queue with specific args
|
|
let job_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Call queue/list without include_args
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/queue/list",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success(), "queue/list should succeed");
|
|
|
|
let jobs: Vec<QueueJobResponse> = response.json().await?;
|
|
|
|
// Find the job we created
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the created job");
|
|
|
|
// Args should be None when include_args is not set
|
|
assert!(
|
|
job.args.is_none(),
|
|
"args should not be included when include_args is not set"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test that queue/list returns jobs with args when include_args=true
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_queue_list_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push a job to the queue with specific args
|
|
let job_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Call queue/list with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/queue/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"queue/list with include_args should succeed"
|
|
);
|
|
|
|
let jobs: Vec<QueueJobResponse> = response.json().await?;
|
|
|
|
// Find the job we created
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the created job");
|
|
|
|
// Args should be present when include_args=true
|
|
assert!(
|
|
job.args.is_some(),
|
|
"args should be included when include_args=true"
|
|
);
|
|
|
|
let args = job.args.as_ref().unwrap();
|
|
assert_eq!(
|
|
args.get("x"),
|
|
Some(&json!(42)),
|
|
"args should contain the correct value"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test queue/list with multiple jobs and include_args=true
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_queue_list_multiple_jobs_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push two jobs with different args
|
|
let job1_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(a): return a".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("a", json!("value_a"))
|
|
.push(&db)
|
|
.await;
|
|
|
|
let job2_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(b): return b".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("b", json!("value_b"))
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Call queue/list with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/queue/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success(), "queue/list should succeed");
|
|
|
|
let jobs: Vec<QueueJobResponse> = response.json().await?;
|
|
|
|
// Find both jobs
|
|
let job1 = jobs
|
|
.iter()
|
|
.find(|j| j.id == job1_id.to_string())
|
|
.expect("should find job1");
|
|
let job2 = jobs
|
|
.iter()
|
|
.find(|j| j.id == job2_id.to_string())
|
|
.expect("should find job2");
|
|
|
|
// Both should have args
|
|
assert!(job1.args.is_some(), "job1 args should be included");
|
|
assert!(job2.args.is_some(), "job2 args should be included");
|
|
|
|
// Check the args are correct
|
|
assert_eq!(
|
|
job1.args.as_ref().unwrap().get("a"),
|
|
Some(&json!("value_a")),
|
|
"job1 should have correct args"
|
|
);
|
|
assert_eq!(
|
|
job2.args.as_ref().unwrap().get("b"),
|
|
Some(&json!("value_b")),
|
|
"job2 should have correct args"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
// ============================================================================
|
|
// Tests for /completed/list endpoint
|
|
// ============================================================================
|
|
|
|
/// Test that completed/list returns jobs without args by default
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_completed_list_without_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Run a job to completion
|
|
let completed_job = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
let job_id = completed_job.id;
|
|
|
|
// Call completed/list without include_args
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/completed/list",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"completed/list should succeed"
|
|
);
|
|
|
|
let jobs: Vec<CompletedJobResponse> = response.json().await?;
|
|
|
|
// Find the completed job
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the completed job");
|
|
|
|
// Args should be None when include_args is not set
|
|
assert!(
|
|
job.args.is_none(),
|
|
"args should not be included when include_args is not set"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test that completed/list returns jobs with args when include_args=true
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_completed_list_with_include_args(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Run a job to completion
|
|
let completed_job = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(x): return x * 2".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("x", json!(42))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
let job_id = completed_job.id;
|
|
|
|
// Call completed/list with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/completed/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"completed/list with include_args should succeed"
|
|
);
|
|
|
|
let jobs: Vec<CompletedJobResponse> = response.json().await?;
|
|
|
|
// Find the completed job
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j.id == job_id.to_string())
|
|
.expect("should find the completed job");
|
|
|
|
// Args should be present when include_args=true
|
|
assert!(
|
|
job.args.is_some(),
|
|
"args should be included when include_args=true"
|
|
);
|
|
|
|
let args = job.args.as_ref().unwrap();
|
|
assert_eq!(
|
|
args.get("x"),
|
|
Some(&json!(42)),
|
|
"args should contain the correct value"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Test completed/list with multiple jobs and include_args=true
|
|
#[cfg(feature = "python")]
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_completed_list_multiple_jobs_with_include_args(
|
|
db: Pool<Postgres>,
|
|
) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Run first job to completion
|
|
let completed_job1 = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(a): return a".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("a", json!("completed_a"))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
let job1_id = completed_job1.id;
|
|
|
|
// Run second job to completion
|
|
let completed_job2 = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(b): return b".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.arg("b", json!("completed_b"))
|
|
.run_until_complete(&db, false, port)
|
|
.await;
|
|
|
|
let job2_id = completed_job2.id;
|
|
|
|
// Call completed/list with include_args=true
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/completed/list?include_args=true",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(
|
|
response.status().is_success(),
|
|
"completed/list should succeed"
|
|
);
|
|
|
|
let jobs: Vec<CompletedJobResponse> = response.json().await?;
|
|
|
|
// Find both completed jobs
|
|
let job1 = jobs
|
|
.iter()
|
|
.find(|j| j.id == job1_id.to_string())
|
|
.expect("should find job1");
|
|
let job2 = jobs
|
|
.iter()
|
|
.find(|j| j.id == job2_id.to_string())
|
|
.expect("should find job2");
|
|
|
|
// Both should have args
|
|
assert!(job1.args.is_some(), "job1 args should be included");
|
|
assert!(job2.args.is_some(), "job2 args should be included");
|
|
|
|
// Check the args are correct
|
|
assert_eq!(
|
|
job1.args.as_ref().unwrap().get("a"),
|
|
Some(&json!("completed_a")),
|
|
"job1 should have correct args"
|
|
);
|
|
assert_eq!(
|
|
job2.args.as_ref().unwrap().get("b"),
|
|
Some(&json!("completed_b")),
|
|
"job2 should have correct args"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
// =============================================================================
|
|
// Labels integration tests
|
|
// =============================================================================
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_job_labels_propagated_at_push_time(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push a script job with labels
|
|
let job_id = RunJob::from(JobPayload::ScriptHash {
|
|
hash: windmill_common::scripts::ScriptHash(0),
|
|
path: "u/admin/test_labels_script".to_string(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
language: ScriptLang::Python3,
|
|
priority: None,
|
|
apply_preprocessor: false,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
labels: Some(vec!["prod".to_string(), "deploy".to_string()]),
|
|
})
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Verify labels in queue listing
|
|
let response = client
|
|
.client()
|
|
.get(format!("{}/w/test-workspace/jobs/list", client.baseurl()))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success());
|
|
let jobs: Vec<serde_json::Value> = response.json().await?;
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j["id"].as_str() == Some(&job_id.to_string()))
|
|
.expect("should find job");
|
|
|
|
let labels = job["labels"].as_array().expect("labels should be an array");
|
|
assert!(labels.contains(&json!("prod")));
|
|
assert!(labels.contains(&json!("deploy")));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_job_without_labels_has_no_labels_field(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push a job without labels
|
|
let job_id = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: "def main(): return 1".to_string(),
|
|
path: None,
|
|
language: ScriptLang::Python3,
|
|
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,
|
|
}))
|
|
.push(&db)
|
|
.await;
|
|
|
|
let response = client
|
|
.client()
|
|
.get(format!("{}/w/test-workspace/jobs/list", client.baseurl()))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success());
|
|
let jobs: Vec<serde_json::Value> = response.json().await?;
|
|
let job = jobs
|
|
.iter()
|
|
.find(|j| j["id"].as_str() == Some(&job_id.to_string()))
|
|
.expect("should find job");
|
|
|
|
// Labels should be null/missing for jobs without labels
|
|
assert!(
|
|
job.get("labels").is_none() || job["labels"].is_null(),
|
|
"job without labels should not have labels field"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_job_label_filter(db: Pool<Postgres>) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Push two jobs with different labels, then complete them via SQL
|
|
// Label filtering only works on completed jobs
|
|
let job_prod_id = RunJob::from(JobPayload::ScriptHash {
|
|
hash: windmill_common::scripts::ScriptHash(0),
|
|
path: "u/admin/prod_script".to_string(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
language: ScriptLang::Bun,
|
|
priority: None,
|
|
apply_preprocessor: false,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
labels: Some(vec!["prod".to_string()]),
|
|
})
|
|
.push(&db)
|
|
.await;
|
|
|
|
let job_staging_id = RunJob::from(JobPayload::ScriptHash {
|
|
hash: windmill_common::scripts::ScriptHash(0),
|
|
path: "u/admin/staging_script".to_string(),
|
|
cache_ttl: None,
|
|
cache_ignore_s3_path: None,
|
|
dedicated_worker: None,
|
|
language: ScriptLang::Bun,
|
|
priority: None,
|
|
apply_preprocessor: false,
|
|
concurrency_settings: windmill_common::runnable_settings::ConcurrencySettings::default()
|
|
.into(),
|
|
debouncing_settings: windmill_common::runnable_settings::DebouncingSettings::default(),
|
|
labels: Some(vec!["staging".to_string()]),
|
|
})
|
|
.push(&db)
|
|
.await;
|
|
|
|
// Complete both jobs directly via SQL so label filter can find them
|
|
for job_id in &[job_prod_id, job_staging_id] {
|
|
sqlx::query(
|
|
"INSERT INTO v2_job_completed (workspace_id, id, result, status, duration_ms) VALUES ('test-workspace', $1, '{}'::jsonb, 'success', 0)",
|
|
)
|
|
.bind(job_id)
|
|
.execute(&db)
|
|
.await?;
|
|
}
|
|
|
|
// Filter by label=prod
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs/list?label=prod",
|
|
client.baseurl()
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success());
|
|
let jobs: Vec<serde_json::Value> = response.json().await?;
|
|
|
|
// Should find the prod job
|
|
assert!(
|
|
jobs.iter()
|
|
.any(|j| j["id"].as_str() == Some(&job_prod_id.to_string())),
|
|
"prod job should appear in label=prod filter"
|
|
);
|
|
|
|
// Should NOT find the staging job
|
|
assert!(
|
|
!jobs
|
|
.iter()
|
|
.any(|j| j["id"].as_str() == Some(&job_staging_id.to_string())),
|
|
"staging job should not appear in label=prod filter"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[sqlx::test(fixtures("base"))]
|
|
async fn test_wm_labels_from_result_merged_with_static_labels(
|
|
db: Pool<Postgres>,
|
|
) -> anyhow::Result<()> {
|
|
initialize_tracing().await;
|
|
|
|
let server = ApiServer::start(db.clone()).await?;
|
|
let port = server.addr.port();
|
|
let client = windmill_api_client::create_client(
|
|
&format!("http://localhost:{port}"),
|
|
"SECRET_TOKEN".to_string(),
|
|
);
|
|
|
|
// Use Code(RawCode) to run a Bun script that returns wm_labels,
|
|
// then set static labels on the job row before execution
|
|
let job = RunJob::from(JobPayload::Code(RawCode {
|
|
hash: None,
|
|
content: r#"export async function main() { return { wm_labels: ["runtime-label"] }; }"#
|
|
.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 completed = job
|
|
.run_until_complete_with(&db, false, port, |uuid| {
|
|
let db = db.clone();
|
|
async move {
|
|
// Set static labels before the worker picks up the job
|
|
sqlx::query(
|
|
"UPDATE v2_job SET labels = ARRAY['static-label']::text[] WHERE id = $1",
|
|
)
|
|
.bind(uuid)
|
|
.execute(&db)
|
|
.await
|
|
.expect("should set labels");
|
|
}
|
|
})
|
|
.await;
|
|
|
|
// Fetch the job via API and check labels
|
|
let response = client
|
|
.client()
|
|
.get(format!(
|
|
"{}/w/test-workspace/jobs_u/get/{}",
|
|
client.baseurl(),
|
|
completed.id
|
|
))
|
|
.send()
|
|
.await?;
|
|
|
|
assert!(response.status().is_success());
|
|
let job: serde_json::Value = response.json().await?;
|
|
let labels = job["labels"].as_array().expect("labels should be an array");
|
|
|
|
// Should contain both the static label and runtime label from wm_labels
|
|
assert!(
|
|
labels.contains(&json!("static-label")),
|
|
"should contain static label set at push time, got: {:?}",
|
|
labels
|
|
);
|
|
assert!(
|
|
labels.contains(&json!("runtime-label")),
|
|
"should contain runtime label from wm_labels in result, got: {:?}",
|
|
labels
|
|
);
|
|
|
|
Ok(())
|
|
}
|