From d8806555f1d78a5fae7ae77acbcdad402e89951d Mon Sep 17 00:00:00 2001 From: wendrul <53628737+wendrul@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:41:16 +0100 Subject: [PATCH 01/17] fix: add workspace selector and fix css for create webhook page (#4939) * fix: add workspace selector and fix css for create webhook page * Improve the tooltip message about token generation --- .../components/sidebar/WorkspaceMenu.svelte | 13 +- .../svix/create-webhook/+page@(root).svelte | 142 ++++++++++-------- 2 files changed, 88 insertions(+), 67 deletions(-) diff --git a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte index 515d3514a6..bfa45d8d86 100644 --- a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte +++ b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte @@ -23,6 +23,9 @@ export let isCollapsed: boolean = false + // When used outside of the side bar, where links to workspace settings and such don't make as much sense. + export let strictWorkspaceSelect = false + async function toggleSwitchWorkspace(id: string) { if ($workspaceStore === id) { return @@ -76,7 +79,7 @@ {/each} - {#if isCloudHosted() || $superadmin} + {#if (isCloudHosted() || $superadmin) && !strictWorkspaceSelect}
{/if} + {#if !strictWorkspaceSelect}
- {#if $userStore?.is_admin || $superadmin} + {/if} + {#if ($userStore?.is_admin || $superadmin) && !strictWorkspaceSelect}
{/if}
- {#if isCloudHosted() && !$isPremiumStore} + {#if isCloudHosted() && !$isPremiumStore && !strictWorkspaceSelect}
{#if $workspaceStore != 'demo'} {/if} - {#if $enterpriseLicense} + {#if $enterpriseLicense && !strictWorkspaceSelect} {/if} diff --git a/frontend/src/routes/(root)/(logged)/svix/create-webhook/+page@(root).svelte b/frontend/src/routes/(root)/(logged)/svix/create-webhook/+page@(root).svelte index 500e1047b5..e68a192eaf 100644 --- a/frontend/src/routes/(root)/(logged)/svix/create-webhook/+page@(root).svelte +++ b/frontend/src/routes/(root)/(logged)/svix/create-webhook/+page@(root).svelte @@ -1,7 +1,5 @@
diff --git a/frontend/src/routes/flows/dev/+page.svelte b/frontend/src/routes/flows/dev/+page.svelte index cb984d1095..a44b9824d3 100644 --- a/frontend/src/routes/flows/dev/+page.svelte +++ b/frontend/src/routes/flows/dev/+page.svelte @@ -99,7 +99,8 @@ initialPath: '', flowInputsStore: writable({}), customUi: {}, - insertButtonOpen: writable(false) + insertButtonOpen: writable(false), + executionCount: writable(0) }) setContext('PropPickerContext', { flowPropPickerConfig: writable(undefined), From 48e68e640645482a3671fd324983c762b105a3cd Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 09:15:27 +0100 Subject: [PATCH 07/17] add fast backend checks --- .github/workflows/backend-check.yml | 116 ++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 .github/workflows/backend-check.yml diff --git a/.github/workflows/backend-check.yml b/.github/workflows/backend-check.yml new file mode 100644 index 0000000000..ae21daa923 --- /dev/null +++ b/.github/workflows/backend-check.yml @@ -0,0 +1,116 @@ +name: Backend check +on: + push: + +defaults: + run: + working-directory: ./backend + + +jobs: + check_oss: + runs-on: ubicloud-standard-8 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + cache-workspaces: backend + toolchain: 1.80.0 + - uses: Swatinem/rust-cache@v2 + with: + workspaces: backend + - name: cargo test + timeout-minutes: 16 + run: SQLX_OFFLINE=true cargo test + + check_oss_full: + runs-on: ubicloud-standard-8 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + cache-workspaces: backend + toolchain: 1.80.0 + - uses: Swatinem/rust-cache@v2 + with: + workspaces: backend + - name: cargo test + timeout-minutes: 16 + run: SQLX_OFFLINE=true cargo test --all-features + + check_ee: + runs-on: ubicloud-standard-8 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Read EE repo commit hash + run: | + echo "ee_repo_ref=$(cat ./backend/ee-repo-ref.txt)" >> "$GITHUB_ENV" + + - uses: actions/checkout@v4 + with: + repository: windmill-labs/windmill-ee-private + path: ./windmill-ee-private + ref: ${{ env.ee_repo_ref }} + token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }} + fetch-depth: 0 + + + - name: Substitute EE code (EE logic is behind feature flag) + run: | + ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private + + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + cache-workspaces: backend + toolchain: 1.80.0 + - uses: Swatinem/rust-cache@v2 + with: + workspaces: backend + - name: cargo test + timeout-minutes: 16 + run: SQLX_OFFLINE=true cargo test + + check_ee_full: + runs-on: ubicloud-standard-8 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Read EE repo commit hash + run: | + echo "ee_repo_ref=$(cat ./backend/ee-repo-ref.txt)" >> "$GITHUB_ENV" + + - uses: actions/checkout@v4 + with: + repository: windmill-labs/windmill-ee-private + path: ./windmill-ee-private + ref: ${{ env.ee_repo_ref }} + token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }} + fetch-depth: 0 + + - name: Substitute EE code (EE logic is behind feature flag) + run: | + ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private + + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + cache-workspaces: backend + toolchain: 1.80.0 + - uses: Swatinem/rust-cache@v2 + with: + workspaces: backend + - name: cargo test + timeout-minutes: 16 + run: SQLX_OFFLINE=true cargo test --all-features + + \ No newline at end of file From 21e20ee8de606e3d19b7b52cc32900e492609318 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 09:39:28 +0100 Subject: [PATCH 08/17] nit check --- .github/workflows/backend-check.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend-check.yml b/.github/workflows/backend-check.yml index ae21daa923..e1d4c75cb7 100644 --- a/.github/workflows/backend-check.yml +++ b/.github/workflows/backend-check.yml @@ -2,10 +2,6 @@ name: Backend check on: push: -defaults: - run: - working-directory: ./backend - jobs: check_oss: @@ -23,6 +19,7 @@ jobs: with: workspaces: backend - name: cargo test + working-directory: ./backend timeout-minutes: 16 run: SQLX_OFFLINE=true cargo test @@ -33,6 +30,12 @@ jobs: with: fetch-depth: 0 + + - name: install xmlsec1 + run: | + sudo apt-get update + sudo apt-get install -y libxml2-dev libxmlsec1-dev + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend @@ -41,6 +44,7 @@ jobs: with: workspaces: backend - name: cargo test + working-directory: ./backend timeout-minutes: 16 run: SQLX_OFFLINE=true cargo test --all-features @@ -68,6 +72,7 @@ jobs: run: | ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend @@ -76,6 +81,7 @@ jobs: with: workspaces: backend - name: cargo test + working-directory: ./backend timeout-minutes: 16 run: SQLX_OFFLINE=true cargo test @@ -98,6 +104,11 @@ jobs: token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }} fetch-depth: 0 + - name: install xmlsec1 + run: | + sudo apt-get update + sudo apt-get install -y libxml2-dev libxmlsec1-dev + - name: Substitute EE code (EE logic is behind feature flag) run: | ./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private @@ -111,6 +122,7 @@ jobs: workspaces: backend - name: cargo test timeout-minutes: 16 + working-directory: ./backend run: SQLX_OFFLINE=true cargo test --all-features \ No newline at end of file From fe4334dfb26aed05d6a3a41e8b0dbe28114023cb Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 09:48:35 +0100 Subject: [PATCH 09/17] test -> check --- .github/workflows/backend-check.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/backend-check.yml b/.github/workflows/backend-check.yml index e1d4c75cb7..dfdcc863c0 100644 --- a/.github/workflows/backend-check.yml +++ b/.github/workflows/backend-check.yml @@ -14,14 +14,14 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend - toolchain: 1.80.0 + toolchain: 1.82.0 - uses: Swatinem/rust-cache@v2 with: workspaces: backend - - name: cargo test + - name: cargo check working-directory: ./backend timeout-minutes: 16 - run: SQLX_OFFLINE=true cargo test + run: SQLX_OFFLINE=true cargo check check_oss_full: runs-on: ubicloud-standard-8 @@ -39,14 +39,14 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend - toolchain: 1.80.0 + toolchain: 1.82.0 - uses: Swatinem/rust-cache@v2 with: workspaces: backend - - name: cargo test + - name: cargo check working-directory: ./backend timeout-minutes: 16 - run: SQLX_OFFLINE=true cargo test --all-features + run: SQLX_OFFLINE=true cargo check --all-features check_ee: runs-on: ubicloud-standard-8 @@ -76,14 +76,14 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend - toolchain: 1.80.0 + toolchain: 1.82.0 - uses: Swatinem/rust-cache@v2 with: workspaces: backend - - name: cargo test + - name: cargo check working-directory: ./backend timeout-minutes: 16 - run: SQLX_OFFLINE=true cargo test + run: SQLX_OFFLINE=true cargo check check_ee_full: runs-on: ubicloud-standard-8 @@ -116,13 +116,13 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend - toolchain: 1.80.0 + toolchain: 1.82.0 - uses: Swatinem/rust-cache@v2 with: workspaces: backend - - name: cargo test + - name: cargo check timeout-minutes: 16 working-directory: ./backend - run: SQLX_OFFLINE=true cargo test --all-features + run: SQLX_OFFLINE=true cargo check --all-features \ No newline at end of file From a04051379119a9d0516d1607f37b90ce1d3e208f Mon Sep 17 00:00:00 2001 From: Lucas Abel <22837557+uael@users.noreply.github.com> Date: Wed, 18 Dec 2024 09:57:31 +0100 Subject: [PATCH 10/17] cache: disable caching for tests (#4943) As `#[sqlx::test]` spawn a database per test, the cache could yield unexpected results --- backend/windmill-common/src/cache.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/backend/windmill-common/src/cache.rs b/backend/windmill-common/src/cache.rs index e222d1202c..81043025c2 100644 --- a/backend/windmill-common/src/cache.rs +++ b/backend/windmill-common/src/cache.rs @@ -57,6 +57,11 @@ impl FsBackedCache { Key: Clone, F: Future>, { + if cfg!(test) { + // Disable caching in tests: since `#[sqlx::test]` spawn a database per test, the cache + // could yield unexpected results. + return with.await.map(map); + } self.cache .get_or_insert_async(&key, async { fs::import_or_insert_with(self.path(&key), with) @@ -584,7 +589,7 @@ pub mod job { raw_flow: Option>>, ) -> impl Future> + 'a { let loc = Location::caller(); - PREVIEWS.get_or_insert_async(job, async move { + let fetch = async move { match (raw_lock, raw_code, raw_flow) { (None, None, None) => sqlx::query!( "SELECT raw_code, raw_lock, raw_flow AS \"raw_flow: Json>\" \ @@ -602,7 +607,13 @@ pub mod job { Some(Json(flow)) => RawData::Flow(Arc::new(FlowData::from_raw(flow))), _ => RawData::Script(Arc::new(ScriptData::from_raw(lock, code))), }) - }) + }; + // Disable caching in tests: as `#[sqlx::test]` spawn a database per test, the cache + // could yield unexpected results. + #[cfg(test)] + return fetch; + #[cfg(not(test))] + PREVIEWS.get_or_insert_async(job, fetch) } #[track_caller] From ee28955ba46b8ada629ea38a69ffa405241d94b3 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 10:08:00 +0100 Subject: [PATCH 11/17] restrict backend ci checks to ci changes --- .github/workflows/backend-check.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend-check.yml b/.github/workflows/backend-check.yml index dfdcc863c0..c26abd93d4 100644 --- a/.github/workflows/backend-check.yml +++ b/.github/workflows/backend-check.yml @@ -1,7 +1,9 @@ name: Backend check on: push: - + paths: + - "backend/**" + - ".github/workflows/backend-check.yml" jobs: check_oss: From 13be0cd1c822d7a809dc96914dd1286510b9f9eb Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 11:29:38 +0100 Subject: [PATCH 12/17] fix: fix relative imports in cached flow scripts --- backend/tests/worker.rs | 2 ++ backend/windmill-common/src/jobs.rs | 1 + backend/windmill-queue/src/jobs.rs | 3 +- backend/windmill-worker/src/worker_flow.rs | 33 ++++++++++++++-------- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs index 559f82ecc7..c9a162635b 100644 --- a/backend/tests/worker.rs +++ b/backend/tests/worker.rs @@ -3848,6 +3848,7 @@ mod job_payload { concurrency_time_window_s: None, cache_ttl: None, dedicated_worker: None, + path: "f/system/hello/test-0".into(), }) .arg("world", json!("foo")) .run_until_complete(&db, port) @@ -3867,6 +3868,7 @@ mod job_payload { concurrency_time_window_s: None, cache_ttl: None, dedicated_worker: None, + path: "f/system/hello/test-0".into(), }) .arg("hello", json!("You know nothing Jean Neige")) .run_until_complete(&db, port) diff --git a/backend/windmill-common/src/jobs.rs b/backend/windmill-common/src/jobs.rs index 086976e701..dc371d319f 100644 --- a/backend/windmill-common/src/jobs.rs +++ b/backend/windmill-common/src/jobs.rs @@ -281,6 +281,7 @@ pub enum JobPayload { concurrency_time_window_s: Option, cache_ttl: Option, dedicated_worker: Option, + path: String, }, FlowNode { id: FlowNodeId, // flow_node(id). diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs index 9df0b70d89..ffedbda163 100644 --- a/backend/windmill-queue/src/jobs.rs +++ b/backend/windmill-queue/src/jobs.rs @@ -2852,9 +2852,10 @@ pub async fn push<'c, 'd>( concurrency_time_window_s, cache_ttl, dedicated_worker, + path, } => ( Some(id.0), - None, + Some(path), None, JobKind::FlowScript, None, diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs index 7d7ea8d0ac..01537ceb46 100644 --- a/backend/windmill-worker/src/worker_flow.rs +++ b/backend/windmill-worker/src/worker_flow.rs @@ -2978,6 +2978,18 @@ fn payload_from_modules<'a>( }) } +fn get_path(flow_job: &QueuedJob, status: &FlowStatus, module: &FlowModule) -> String { + if status + .preprocessor_module + .as_ref() + .is_some_and(|x| x.id() == module.id) + { + format!("{}/preprocessor", flow_job.script_path()) + } else { + format!("{}/step-{}", flow_job.script_path(), status.step) + } +} + async fn compute_next_flow_transform( arc_flow_job_args: Marc>>, arc_last_job_result: Arc>, @@ -3023,6 +3035,7 @@ async fn compute_next_flow_transform( if is_skipped { return trivial_next_job(JobPayload::Identity); } + match module.get_value()? { FlowModuleValue::Identity => trivial_next_job(JobPayload::Identity), FlowModuleValue::Flow { path, .. } => { @@ -3052,19 +3065,10 @@ async fn compute_next_flow_transform( concurrency_time_window_s, .. } => { - let path = path.clone().or_else(|| { - if status - .preprocessor_module - .as_ref() - .is_some_and(|x| x.id() == module.id) - { - Some(format!("{}/preprocessor", flow_job.script_path())) - } else { - Some(format!("{}/step-{}", flow_job.script_path(), status.step)) - } - }); + let path = path.unwrap_or_else(|| get_path(flow_job, status, module)); + let payload = raw_script_to_payload( - path, + Some(path), content, language, lock, @@ -3089,6 +3093,8 @@ async fn compute_next_flow_transform( concurrency_time_window_s, .. } => { + let path = get_path(flow_job, status, module); + let payload = JobPayloadWithTag { payload: JobPayload::FlowScript { id, @@ -3098,6 +3104,7 @@ async fn compute_next_flow_transform( concurrency_time_window_s, cache_ttl: module.cache_ttl.map(|x| x as i32), dedicated_worker: None, + path, }, tag: tag.clone(), delete_after_use, @@ -3699,6 +3706,8 @@ async fn payload_from_simple_module( concurrency_time_window_s, cache_ttl: module.cache_ttl.map(|x| x as i32), dedicated_worker: None, + path: inner_path + .unwrap_or_else(|| format!("{}/simple-flow", flow_job.script_path())), }, tag, delete_after_use, From d8d47d910d330d62a4cd8bd9f1ce7859e4533b80 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 11:40:33 +0100 Subject: [PATCH 13/17] chore(main): release 1.440.0 (#4931) * chore(main): release 1.440.0 * Apply automatic changes --------- Co-authored-by: rubenfiszel --- CHANGELOG.md | 13 ++ backend/Cargo.lock | 182 +++++++++--------- backend/Cargo.toml | 4 +- backend/windmill-api/openapi.yaml | 2 +- benchmarks/lib.ts | 2 +- cli/main.ts | 2 +- frontend/package-lock.json | 4 +- frontend/package.json | 2 +- lsp/Pipfile | 4 +- openflow.openapi.yaml | 2 +- .../WindmillClient/WindmillClient.psd1 | 2 +- python-client/wmill/pyproject.toml | 2 +- python-client/wmill_pg/pyproject.toml | 2 +- typescript-client/jsr.json | 2 +- typescript-client/package.json | 2 +- version.txt | 2 +- 16 files changed, 121 insertions(+), 108 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ad3331073..b22850ae69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.440.0](https://github.com/windmill-labs/windmill/compare/v1.439.0...v1.440.0) (2024-12-18) + + +### Features + +* **cache:** remove persistent raw values from queue ([#4866](https://github.com/windmill-labs/windmill/issues/4866)) ([977ac5c](https://github.com/windmill-labs/windmill/commit/977ac5c3f3c2e8224f4915e483ae60f28ce008fc)) + + +### Bug Fixes + +* add workspace selector and fix css for create webhook page ([#4939](https://github.com/windmill-labs/windmill/issues/4939)) ([d880655](https://github.com/windmill-labs/windmill/commit/d8806555f1d78a5fae7ae77acbcdad402e89951d)) +* fix relative imports in cached flow scripts ([13be0cd](https://github.com/windmill-labs/windmill/commit/13be0cd1c822d7a809dc96914dd1286510b9f9eb)) + ## [1.439.0](https://github.com/windmill-labs/windmill/compare/v1.438.0...v1.439.0) (2024-12-15) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 445350f510..c6edfef441 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -537,7 +537,7 @@ dependencies = [ "hex", "hmac", "http-types", - "hyper 0.14.31", + "hyper 0.14.32", "hyper-tls 0.5.0", "serde", "serde_json", @@ -771,9 +771,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" +checksum = "8aa8ff1492fd9fb99ae28e8467af0dbbb7c31512b16fabf1a0f10d7bb6ef78bb" dependencies = [ "futures-util", "pin-project-lite", @@ -830,9 +830,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.4" +version = "1.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45" +checksum = "431a10d0e07e09091284ef04453dae4069283aa108d209974d67e77ae1caa658" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -845,7 +845,7 @@ dependencies = [ "http-body 0.4.6", "http-body 1.0.1", "httparse", - "hyper 0.14.31", + "hyper 0.14.32", "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", @@ -874,9 +874,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.9" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510" +checksum = "8ecbf4d5dfb169812e2b240a4350f15ad3c6b03a54074e5712818801615f2dc5" dependencies = [ "base64-simd 0.8.0", "bytes", @@ -934,7 +934,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "itoa", "matchit", @@ -997,7 +997,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide 0.8.2", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -1272,7 +1272,7 @@ dependencies = [ "hex", "http 1.2.0", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-named-pipe", "hyper-util", "hyperlocal", @@ -1283,7 +1283,7 @@ dependencies = [ "serde_json", "serde_repr", "serde_urlencoded", - "thiserror 2.0.7", + "thiserror 2.0.8", "tokio", "tokio-util", "tower-service", @@ -1736,15 +1736,15 @@ checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" [[package]] name = "console" -version = "0.15.8" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" dependencies = [ "encode_unicode", - "lazy_static", "libc", - "unicode-width 0.1.14", - "windows-sys 0.52.0", + "once_cell", + "unicode-width 0.2.0", + "windows-sys 0.59.0", ] [[package]] @@ -2593,8 +2593,8 @@ dependencies = [ "hickory-resolver", "http 1.2.0", "http-body-util", - "hyper 1.5.1", - "hyper-rustls 0.27.3", + "hyper 1.5.2", + "hyper-rustls 0.27.4", "hyper-util", "ipnet", "percent-encoding", @@ -3114,9 +3114,9 @@ dependencies = [ [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" @@ -3297,7 +3297,7 @@ checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.8.0", + "miniz_oxide 0.8.2", ] [[package]] @@ -3583,7 +3583,7 @@ dependencies = [ "async-trait", "base64 0.21.7", "dirs-next", - "hyper 0.14.31", + "hyper 0.14.32", "hyper-rustls 0.24.2", "ring 0.16.20", "rustls 0.21.12", @@ -4068,11 +4068,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4203,9 +4203,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.31" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", @@ -4227,9 +4227,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", @@ -4253,7 +4253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "pin-project-lite", "tokio", @@ -4269,7 +4269,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.31", + "hyper 0.14.32", "log", "rustls 0.21.12", "rustls-native-certs 0.6.3", @@ -4279,13 +4279,13 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.3" +version = "0.27.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +checksum = "f6884a48c6826ec44f524c7456b163cebe9e55a18d7b5e307cb4f100371cc767" dependencies = [ "futures-util", "http 1.2.0", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "rustls 0.23.20", "rustls-native-certs 0.8.1", @@ -4302,7 +4302,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "pin-project-lite", "tokio", @@ -4316,7 +4316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.31", + "hyper 0.14.32", "native-tls", "tokio", "tokio-native-tls", @@ -4330,7 +4330,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "native-tls", "tokio", @@ -4349,7 +4349,7 @@ dependencies = [ "futures-util", "http 1.2.0", "http-body 1.0.1", - "hyper 1.5.1", + "hyper 1.5.2", "pin-project-lite", "socket2", "tokio", @@ -4366,7 +4366,7 @@ checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-util", "pin-project-lite", "tokio", @@ -5241,9 +5241,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] @@ -5623,7 +5623,7 @@ dependencies = [ "chrono", "futures", "humantime", - "hyper 1.5.1", + "hyper 1.5.2", "itertools 0.13.0", "md-5 0.10.6", "parking_lot", @@ -6609,7 +6609,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls 0.23.20", "socket2", - "thiserror 2.0.7", + "thiserror 2.0.8", "tokio", "tracing", ] @@ -6628,7 +6628,7 @@ dependencies = [ "rustls 0.23.20", "rustls-pki-types", "slab", - "thiserror 2.0.7", + "thiserror 2.0.8", "tinyvec", "tracing", "web-time", @@ -6636,9 +6636,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" +checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" dependencies = [ "cfg_aliases", "libc", @@ -6940,7 +6940,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.31", + "hyper 0.14.32", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -6984,8 +6984,8 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.1", - "hyper-rustls 0.27.3", + "hyper 1.5.2", + "hyper-rustls 0.27.4", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -7310,7 +7310,7 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.0.1", + "security-framework 3.1.0", ] [[package]] @@ -7592,9 +7592,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8" +checksum = "81d3f8c9bfcc3cbb6b0179eb57042d75b1582bdc65c3cb95f3fa999509c03cbc" dependencies = [ "bitflags 2.6.0", "core-foundation 0.10.0", @@ -7605,9 +7605,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -9195,11 +9195,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.7" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" dependencies = [ - "thiserror-impl 2.0.7", + "thiserror-impl 2.0.8", ] [[package]] @@ -9215,9 +9215,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.7" +version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" dependencies = [ "proc-macro2", "quote", @@ -9655,7 +9655,7 @@ dependencies = [ "http 1.2.0", "http-body 1.0.1", "http-body-util", - "hyper 1.5.1", + "hyper 1.5.2", "hyper-timeout", "hyper-util", "percent-encoding", @@ -10143,9 +10143,9 @@ checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-id" @@ -10666,7 +10666,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "axum", @@ -10707,7 +10707,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "argon2", @@ -10735,7 +10735,7 @@ dependencies = [ "hf-hub", "hmac", "http 1.2.0", - "hyper 1.5.1", + "hyper 1.5.2", "itertools 0.13.0", "jsonwebtoken", "lazy_static", @@ -10792,7 +10792,7 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.439.0" +version = "1.440.0" dependencies = [ "base64 0.22.1", "chrono", @@ -10810,7 +10810,7 @@ dependencies = [ [[package]] name = "windmill-audit" -version = "1.439.0" +version = "1.440.0" dependencies = [ "chrono", "serde", @@ -10823,7 +10823,7 @@ dependencies = [ [[package]] name = "windmill-autoscaling" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "serde", @@ -10837,7 +10837,7 @@ dependencies = [ [[package]] name = "windmill-common" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "async-stream", @@ -10857,7 +10857,7 @@ dependencies = [ "git-version", "hex", "hmac", - "hyper 1.5.1", + "hyper 1.5.2", "indexmap 2.7.0", "itertools 0.13.0", "lazy_static", @@ -10880,7 +10880,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "sqlx", - "thiserror 2.0.7", + "thiserror 2.0.8", "tikv-jemalloc-ctl", "tokio", "tonic", @@ -10895,7 +10895,7 @@ dependencies = [ [[package]] name = "windmill-git-sync" -version = "1.439.0" +version = "1.440.0" dependencies = [ "regex", "serde", @@ -10909,7 +10909,7 @@ dependencies = [ [[package]] name = "windmill-indexer" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "bytes", @@ -10932,7 +10932,7 @@ dependencies = [ [[package]] name = "windmill-macros" -version = "1.439.0" +version = "1.440.0" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -10944,7 +10944,7 @@ dependencies = [ [[package]] name = "windmill-parser" -version = "1.439.0" +version = "1.440.0" dependencies = [ "convert_case 0.6.0", "serde", @@ -10953,7 +10953,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "lazy_static", @@ -10965,7 +10965,7 @@ dependencies = [ [[package]] name = "windmill-parser-csharp" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "serde_json", @@ -10977,7 +10977,7 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "gosyn", @@ -10989,7 +10989,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "lazy_static", @@ -11001,7 +11001,7 @@ dependencies = [ [[package]] name = "windmill-parser-php" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "itertools 0.13.0", @@ -11012,7 +11012,7 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "itertools 0.13.0", @@ -11023,7 +11023,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "async-recursion", @@ -11041,7 +11041,7 @@ dependencies = [ [[package]] name = "windmill-parser-rust" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -11058,7 +11058,7 @@ dependencies = [ [[package]] name = "windmill-parser-sql" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "lazy_static", @@ -11070,7 +11070,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "lazy_static", @@ -11088,7 +11088,7 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "getrandom 0.2.15", @@ -11110,7 +11110,7 @@ dependencies = [ [[package]] name = "windmill-parser-yaml" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "serde_json", @@ -11120,7 +11120,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "async-recursion", @@ -11154,7 +11154,7 @@ dependencies = [ [[package]] name = "windmill-sql-datatype-parser-wasm" -version = "1.439.0" +version = "1.440.0" dependencies = [ "wasm-bindgen", "wasm-bindgen-test", @@ -11164,7 +11164,7 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.439.0" +version = "1.440.0" dependencies = [ "anyhow", "async-recursion", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index dcd9dcdf72..bcd058143a 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "windmill" -version = "1.439.0" +version = "1.440.0" authors.workspace = true edition.workspace = true @@ -30,7 +30,7 @@ members = [ ] [workspace.package] -version = "1.439.0" +version = "1.440.0" authors = ["Ruben Fiszel "] edition = "2021" diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml index f962affd08..357db1e483 100644 --- a/backend/windmill-api/openapi.yaml +++ b/backend/windmill-api/openapi.yaml @@ -1,7 +1,7 @@ openapi: "3.0.3" info: - version: 1.439.0 + version: 1.440.0 title: Windmill API contact: diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts index 35d4312382..94284facb6 100644 --- a/benchmarks/lib.ts +++ b/benchmarks/lib.ts @@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts"; import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts"; import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts"; -export const VERSION = "v1.439.0"; +export const VERSION = "v1.440.0"; export async function login(email: string, password: string): Promise { return await windmill.UserService.login({ diff --git a/cli/main.ts b/cli/main.ts index c2bfd62d4b..1833c18f6e 100644 --- a/cli/main.ts +++ b/cli/main.ts @@ -60,7 +60,7 @@ export { // } // }); -export const VERSION = "1.439.0"; +export const VERSION = "1.440.0"; const command = new Command() .name("wmill") diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d65a848fa8..d884bdd174 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "windmill-components", - "version": "1.439.0", + "version": "1.440.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "windmill-components", - "version": "1.439.0", + "version": "1.440.0", "license": "AGPL-3.0", "dependencies": { "@anthropic-ai/sdk": "^0.32.1", diff --git a/frontend/package.json b/frontend/package.json index 3f4295e107..b1e31348d5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "windmill-components", - "version": "1.439.0", + "version": "1.440.0", "scripts": { "dev": "vite dev", "build": "vite build", diff --git a/lsp/Pipfile b/lsp/Pipfile index 582a896ed1..2502dbee66 100644 --- a/lsp/Pipfile +++ b/lsp/Pipfile @@ -4,8 +4,8 @@ verify_ssl = true name = "pypi" [packages] -wmill = ">=1.439.0" -wmill_pg = ">=1.439.0" +wmill = ">=1.440.0" +wmill_pg = ">=1.440.0" sendgrid = "*" mysql-connector-python = "*" pymongo = "*" diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml index 4349b48d2b..c2bb755c31 100644 --- a/openflow.openapi.yaml +++ b/openflow.openapi.yaml @@ -1,7 +1,7 @@ openapi: "3.0.3" info: - version: 1.439.0 + version: 1.440.0 title: OpenFlow Spec contact: name: Ruben Fiszel diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1 index bd08255029..6273846e42 100644 --- a/powershell-client/WindmillClient/WindmillClient.psd1 +++ b/powershell-client/WindmillClient/WindmillClient.psd1 @@ -12,7 +12,7 @@ RootModule = 'WindmillClient.psm1' # Version number of this module. - ModuleVersion = '1.439.0' + ModuleVersion = '1.440.0' # Supported PSEditions # CompatiblePSEditions = @() diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml index c4d123e489..8e1731c6dc 100644 --- a/python-client/wmill/pyproject.toml +++ b/python-client/wmill/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wmill" -version = "1.439.0" +version = "1.440.0" description = "A client library for accessing Windmill server wrapping the Windmill client API" license = "Apache-2.0" homepage = "https://windmill.dev" diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml index 002f59a998..ded44e1d17 100644 --- a/python-client/wmill_pg/pyproject.toml +++ b/python-client/wmill_pg/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wmill-pg" -version = "1.439.0" +version = "1.440.0" description = "An extension client for the wmill client library focused on pg" license = "Apache-2.0" homepage = "https://windmill.dev" diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json index 721511a902..c74c155021 100644 --- a/typescript-client/jsr.json +++ b/typescript-client/jsr.json @@ -1,6 +1,6 @@ { "name": "@windmill/windmill", - "version": "1.439.0", + "version": "1.440.0", "exports": "./src/index.ts", "publish": { "exclude": ["!src", "./s3Types.ts", "./client.ts"] diff --git a/typescript-client/package.json b/typescript-client/package.json index a1b4c506a5..f7c78be73c 100644 --- a/typescript-client/package.json +++ b/typescript-client/package.json @@ -1,7 +1,7 @@ { "name": "windmill-client", "description": "Windmill SDK client for browsers and Node.js", - "version": "1.439.0", + "version": "1.440.0", "author": "Ruben Fiszel", "license": "Apache 2.0", "devDependencies": { diff --git a/version.txt b/version.txt index 4490405ded..17069f5fa8 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.439.0 +1.440.0 From bc4d13f5ff83c19c64ad7b4cfb1cfcd00de0dc84 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 11:49:44 +0100 Subject: [PATCH 14/17] nits cleanup --- backend/windmill-worker/src/worker_flow.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs index 01537ceb46..9f71a7d807 100644 --- a/backend/windmill-worker/src/worker_flow.rs +++ b/backend/windmill-worker/src/worker_flow.rs @@ -3068,7 +3068,7 @@ async fn compute_next_flow_transform( let path = path.unwrap_or_else(|| get_path(flow_job, status, module)); let payload = raw_script_to_payload( - Some(path), + path, content, language, lock, @@ -3468,7 +3468,7 @@ async fn next_loop_iteration( }; return Ok(NextFlowTransform::Continue( ContinuePayload::SingleJob( - payload_from_simple_module(value, db, flow_job, module, Some(inner_path())).await?, + payload_from_simple_module(value, db, flow_job, module, inner_path()).await?, ), NextStatus::NextLoopIteration { next: ns, simple_input_transforms }, )); @@ -3659,7 +3659,7 @@ async fn payload_from_simple_module( db: &sqlx::Pool, flow_job: &QueuedJob, module: &FlowModule, - inner_path: Option, + inner_path: String, ) -> Result { let delete_after_use = module.delete_after_use.unwrap_or(false); Ok(match value { @@ -3678,7 +3678,7 @@ async fn payload_from_simple_module( concurrency_time_window_s, .. } => raw_script_to_payload( - path.or(inner_path), + path.unwrap_or_else(|| inner_path), content, language, lock, @@ -3706,8 +3706,7 @@ async fn payload_from_simple_module( concurrency_time_window_s, cache_ttl: module.cache_ttl.map(|x| x as i32), dedicated_worker: None, - path: inner_path - .unwrap_or_else(|| format!("{}/simple-flow", flow_job.script_path())), + path: inner_path, }, tag, delete_after_use, @@ -3718,7 +3717,7 @@ async fn payload_from_simple_module( } fn raw_script_to_payload( - path: Option, + path: String, content: String, language: windmill_common::scripts::ScriptLang, lock: Option, @@ -3732,7 +3731,7 @@ fn raw_script_to_payload( JobPayloadWithTag { payload: JobPayload::Code(RawCode { hash: None, - path, + path: Some(path), content, language, lock, From 02a8f1f86453a5f8769364ba3798998b8830d086 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 12:01:36 +0100 Subject: [PATCH 15/17] fix(internal): updating rust to 1.82 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ef2f7a721e..7e31a571dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG DEBIAN_IMAGE=debian:bookworm-slim -ARG RUST_IMAGE=rust:1.80-slim-bookworm +ARG RUST_IMAGE=rust:1.82-slim-bookworm ARG PYTHON_IMAGE=python:3.11.10-slim-bookworm FROM ${RUST_IMAGE} AS rust_base From fb72e89d49cc56e4178d4b199d7d0c5db13d96be Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 12:29:23 +0100 Subject: [PATCH 16/17] chore(main): release 1.440.1 (#4948) * chore(main): release 1.440.1 * Apply automatic changes --------- Co-authored-by: rubenfiszel --- CHANGELOG.md | 7 +++ backend/Cargo.lock | 50 +++++++++---------- backend/Cargo.toml | 4 +- backend/windmill-api/openapi.yaml | 2 +- benchmarks/lib.ts | 2 +- cli/main.ts | 2 +- frontend/package-lock.json | 4 +- frontend/package.json | 2 +- lsp/Pipfile | 4 +- openflow.openapi.yaml | 2 +- .../WindmillClient/WindmillClient.psd1 | 2 +- python-client/wmill/pyproject.toml | 2 +- python-client/wmill_pg/pyproject.toml | 2 +- typescript-client/jsr.json | 2 +- typescript-client/package.json | 2 +- version.txt | 2 +- 16 files changed, 49 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b22850ae69..a5beb3719e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.440.1](https://github.com/windmill-labs/windmill/compare/v1.440.0...v1.440.1) (2024-12-18) + + +### Bug Fixes + +* **internal:** updating rust to 1.82 ([02a8f1f](https://github.com/windmill-labs/windmill/commit/02a8f1f86453a5f8769364ba3798998b8830d086)) + ## [1.440.0](https://github.com/windmill-labs/windmill/compare/v1.439.0...v1.440.0) (2024-12-18) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index c6edfef441..09049c2df1 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -10666,7 +10666,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "axum", @@ -10707,7 +10707,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "argon2", @@ -10792,7 +10792,7 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.440.0" +version = "1.440.1" dependencies = [ "base64 0.22.1", "chrono", @@ -10810,7 +10810,7 @@ dependencies = [ [[package]] name = "windmill-audit" -version = "1.440.0" +version = "1.440.1" dependencies = [ "chrono", "serde", @@ -10823,7 +10823,7 @@ dependencies = [ [[package]] name = "windmill-autoscaling" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "serde", @@ -10837,7 +10837,7 @@ dependencies = [ [[package]] name = "windmill-common" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "async-stream", @@ -10895,7 +10895,7 @@ dependencies = [ [[package]] name = "windmill-git-sync" -version = "1.440.0" +version = "1.440.1" dependencies = [ "regex", "serde", @@ -10909,7 +10909,7 @@ dependencies = [ [[package]] name = "windmill-indexer" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "bytes", @@ -10932,7 +10932,7 @@ dependencies = [ [[package]] name = "windmill-macros" -version = "1.440.0" +version = "1.440.1" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -10944,7 +10944,7 @@ dependencies = [ [[package]] name = "windmill-parser" -version = "1.440.0" +version = "1.440.1" dependencies = [ "convert_case 0.6.0", "serde", @@ -10953,7 +10953,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "lazy_static", @@ -10965,7 +10965,7 @@ dependencies = [ [[package]] name = "windmill-parser-csharp" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "serde_json", @@ -10977,7 +10977,7 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "gosyn", @@ -10989,7 +10989,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "lazy_static", @@ -11001,7 +11001,7 @@ dependencies = [ [[package]] name = "windmill-parser-php" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "itertools 0.13.0", @@ -11012,7 +11012,7 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "itertools 0.13.0", @@ -11023,7 +11023,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "async-recursion", @@ -11041,7 +11041,7 @@ dependencies = [ [[package]] name = "windmill-parser-rust" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -11058,7 +11058,7 @@ dependencies = [ [[package]] name = "windmill-parser-sql" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "lazy_static", @@ -11070,7 +11070,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "lazy_static", @@ -11088,7 +11088,7 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "getrandom 0.2.15", @@ -11110,7 +11110,7 @@ dependencies = [ [[package]] name = "windmill-parser-yaml" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "serde_json", @@ -11120,7 +11120,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "async-recursion", @@ -11154,7 +11154,7 @@ dependencies = [ [[package]] name = "windmill-sql-datatype-parser-wasm" -version = "1.440.0" +version = "1.440.1" dependencies = [ "wasm-bindgen", "wasm-bindgen-test", @@ -11164,7 +11164,7 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.440.0" +version = "1.440.1" dependencies = [ "anyhow", "async-recursion", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index bcd058143a..2c2dd24c09 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "windmill" -version = "1.440.0" +version = "1.440.1" authors.workspace = true edition.workspace = true @@ -30,7 +30,7 @@ members = [ ] [workspace.package] -version = "1.440.0" +version = "1.440.1" authors = ["Ruben Fiszel "] edition = "2021" diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml index 357db1e483..72c92db707 100644 --- a/backend/windmill-api/openapi.yaml +++ b/backend/windmill-api/openapi.yaml @@ -1,7 +1,7 @@ openapi: "3.0.3" info: - version: 1.440.0 + version: 1.440.1 title: Windmill API contact: diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts index 94284facb6..887644c2ff 100644 --- a/benchmarks/lib.ts +++ b/benchmarks/lib.ts @@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts"; import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts"; import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts"; -export const VERSION = "v1.440.0"; +export const VERSION = "v1.440.1"; export async function login(email: string, password: string): Promise { return await windmill.UserService.login({ diff --git a/cli/main.ts b/cli/main.ts index 1833c18f6e..cff86d6365 100644 --- a/cli/main.ts +++ b/cli/main.ts @@ -60,7 +60,7 @@ export { // } // }); -export const VERSION = "1.440.0"; +export const VERSION = "1.440.1"; const command = new Command() .name("wmill") diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d884bdd174..02632ec441 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "windmill-components", - "version": "1.440.0", + "version": "1.440.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "windmill-components", - "version": "1.440.0", + "version": "1.440.1", "license": "AGPL-3.0", "dependencies": { "@anthropic-ai/sdk": "^0.32.1", diff --git a/frontend/package.json b/frontend/package.json index b1e31348d5..e70039c21b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "windmill-components", - "version": "1.440.0", + "version": "1.440.1", "scripts": { "dev": "vite dev", "build": "vite build", diff --git a/lsp/Pipfile b/lsp/Pipfile index 2502dbee66..5635f71723 100644 --- a/lsp/Pipfile +++ b/lsp/Pipfile @@ -4,8 +4,8 @@ verify_ssl = true name = "pypi" [packages] -wmill = ">=1.440.0" -wmill_pg = ">=1.440.0" +wmill = ">=1.440.1" +wmill_pg = ">=1.440.1" sendgrid = "*" mysql-connector-python = "*" pymongo = "*" diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml index c2bb755c31..ff249852ca 100644 --- a/openflow.openapi.yaml +++ b/openflow.openapi.yaml @@ -1,7 +1,7 @@ openapi: "3.0.3" info: - version: 1.440.0 + version: 1.440.1 title: OpenFlow Spec contact: name: Ruben Fiszel diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1 index 6273846e42..7e97f85577 100644 --- a/powershell-client/WindmillClient/WindmillClient.psd1 +++ b/powershell-client/WindmillClient/WindmillClient.psd1 @@ -12,7 +12,7 @@ RootModule = 'WindmillClient.psm1' # Version number of this module. - ModuleVersion = '1.440.0' + ModuleVersion = '1.440.1' # Supported PSEditions # CompatiblePSEditions = @() diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml index 8e1731c6dc..53c5cbc2c2 100644 --- a/python-client/wmill/pyproject.toml +++ b/python-client/wmill/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wmill" -version = "1.440.0" +version = "1.440.1" description = "A client library for accessing Windmill server wrapping the Windmill client API" license = "Apache-2.0" homepage = "https://windmill.dev" diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml index ded44e1d17..bbc9908f80 100644 --- a/python-client/wmill_pg/pyproject.toml +++ b/python-client/wmill_pg/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wmill-pg" -version = "1.440.0" +version = "1.440.1" description = "An extension client for the wmill client library focused on pg" license = "Apache-2.0" homepage = "https://windmill.dev" diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json index c74c155021..b9b808770a 100644 --- a/typescript-client/jsr.json +++ b/typescript-client/jsr.json @@ -1,6 +1,6 @@ { "name": "@windmill/windmill", - "version": "1.440.0", + "version": "1.440.1", "exports": "./src/index.ts", "publish": { "exclude": ["!src", "./s3Types.ts", "./client.ts"] diff --git a/typescript-client/package.json b/typescript-client/package.json index f7c78be73c..3b43a12caa 100644 --- a/typescript-client/package.json +++ b/typescript-client/package.json @@ -1,7 +1,7 @@ { "name": "windmill-client", "description": "Windmill SDK client for browsers and Node.js", - "version": "1.440.0", + "version": "1.440.1", "author": "Ruben Fiszel", "license": "Apache 2.0", "devDependencies": { diff --git a/version.txt b/version.txt index 17069f5fa8..f5823e14fb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.440.0 +1.440.1 From 48385bffd1748f68b22025d10b03b9b5d91b27b3 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 18 Dec 2024 12:35:22 +0100 Subject: [PATCH 17/17] update backend tests to 1.82.0 --- .github/workflows/backend-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index 63fcc8fee9..ade607cfa6 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -54,7 +54,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@v1 with: cache-workspaces: backend - toolchain: 1.80.0 + toolchain: 1.82.0 - uses: Swatinem/rust-cache@v2 with: workspaces: backend