From 86f41ffcdea5a256980f43cf213c32175f501155 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 27 Aug 2025 15:08:58 +0000 Subject: [PATCH] minor nits fix --- ...e0971a187c0909617da55251e97180babf6ac9e8068f26d73d.json} | 4 ++-- ...9e9aa9dcbac0a54154267a7db96cc0fb3ebaac95635e24da29.json} | 4 ++-- ...8b199471b30c2baf124affa2eaf56c801c8dac3264c584f981.json} | 4 ++-- backend/ee-repo-ref.txt | 2 +- backend/windmill-api/src/scripts.rs | 3 +++ backend/windmill-api/src/variables.rs | 6 +++++- backend/windmill-common/src/variables.rs | 2 ++ 7 files changed, 17 insertions(+), 8 deletions(-) rename backend/.sqlx/{query-434d8dfbc25cf7e92de51d763d3a2904ccc2e95ecc3d90b43a6394a7bb4d26ab.json => query-2367e7c0f7fbafe0971a187c0909617da55251e97180babf6ac9e8068f26d73d.json} (69%) rename backend/.sqlx/{query-e77fcf4e0d58855542605d13177df61671334418820ca942b442adfab413cbae.json => query-8d119104337bf99e9aa9dcbac0a54154267a7db96cc0fb3ebaac95635e24da29.json} (70%) rename backend/.sqlx/{query-f04632c3a8e0d7c5b48cdd26a99bb1dc5bd12df221f82405d663b8f15f5c0c3a.json => query-f37140fcdc721a8b199471b30c2baf124affa2eaf56c801c8dac3264c584f981.json} (69%) diff --git a/backend/.sqlx/query-434d8dfbc25cf7e92de51d763d3a2904ccc2e95ecc3d90b43a6394a7bb4d26ab.json b/backend/.sqlx/query-2367e7c0f7fbafe0971a187c0909617da55251e97180babf6ac9e8068f26d73d.json similarity index 69% rename from backend/.sqlx/query-434d8dfbc25cf7e92de51d763d3a2904ccc2e95ecc3d90b43a6394a7bb4d26ab.json rename to backend/.sqlx/query-2367e7c0f7fbafe0971a187c0909617da55251e97180babf6ac9e8068f26d73d.json index 0c657d6911..d643e4b8f8 100644 --- a/backend/.sqlx/query-434d8dfbc25cf7e92de51d763d3a2904ccc2e95ecc3d90b43a6394a7bb4d26ab.json +++ b/backend/.sqlx/query-2367e7c0f7fbafe0971a187c0909617da55251e97180babf6ac9e8068f26d73d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO deployment_metadata (workspace_id, path, flow_version, callback_job_ids, deployment_msg) VALUES ($1, $2, $3, $4, $5)\n ON CONFLICT (workspace_id, path) DO UPDATE SET callback_job_ids = $4, deployment_msg = $5", + "query": "INSERT INTO deployment_metadata (workspace_id, path, flow_version, callback_job_ids, deployment_msg) VALUES ($1, $2, $3, $4, $5)\n ON CONFLICT (workspace_id, path, flow_version) WHERE flow_version IS NOT NULL DO UPDATE SET callback_job_ids = $4, deployment_msg = $5", "describe": { "columns": [], "parameters": { @@ -14,5 +14,5 @@ }, "nullable": [] }, - "hash": "434d8dfbc25cf7e92de51d763d3a2904ccc2e95ecc3d90b43a6394a7bb4d26ab" + "hash": "2367e7c0f7fbafe0971a187c0909617da55251e97180babf6ac9e8068f26d73d" } diff --git a/backend/.sqlx/query-e77fcf4e0d58855542605d13177df61671334418820ca942b442adfab413cbae.json b/backend/.sqlx/query-8d119104337bf99e9aa9dcbac0a54154267a7db96cc0fb3ebaac95635e24da29.json similarity index 70% rename from backend/.sqlx/query-e77fcf4e0d58855542605d13177df61671334418820ca942b442adfab413cbae.json rename to backend/.sqlx/query-8d119104337bf99e9aa9dcbac0a54154267a7db96cc0fb3ebaac95635e24da29.json index de37a2fc04..1c2f9a9f33 100644 --- a/backend/.sqlx/query-e77fcf4e0d58855542605d13177df61671334418820ca942b442adfab413cbae.json +++ b/backend/.sqlx/query-8d119104337bf99e9aa9dcbac0a54154267a7db96cc0fb3ebaac95635e24da29.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO deployment_metadata (workspace_id, path, script_hash, callback_job_ids, deployment_msg) VALUES ($1, $2, $3, $4, $5) \n ON CONFLICT (workspace_id, path) DO UPDATE SET callback_job_ids = $4, deployment_msg = $5", + "query": "INSERT INTO deployment_metadata (workspace_id, path, script_hash, callback_job_ids, deployment_msg) VALUES ($1, $2, $3, $4, $5) \n ON CONFLICT (workspace_id, script_hash) WHERE script_hash IS NOT NULL DO UPDATE SET callback_job_ids = $4, deployment_msg = $5", "describe": { "columns": [], "parameters": { @@ -14,5 +14,5 @@ }, "nullable": [] }, - "hash": "e77fcf4e0d58855542605d13177df61671334418820ca942b442adfab413cbae" + "hash": "8d119104337bf99e9aa9dcbac0a54154267a7db96cc0fb3ebaac95635e24da29" } diff --git a/backend/.sqlx/query-f04632c3a8e0d7c5b48cdd26a99bb1dc5bd12df221f82405d663b8f15f5c0c3a.json b/backend/.sqlx/query-f37140fcdc721a8b199471b30c2baf124affa2eaf56c801c8dac3264c584f981.json similarity index 69% rename from backend/.sqlx/query-f04632c3a8e0d7c5b48cdd26a99bb1dc5bd12df221f82405d663b8f15f5c0c3a.json rename to backend/.sqlx/query-f37140fcdc721a8b199471b30c2baf124affa2eaf56c801c8dac3264c584f981.json index aa8d76b04f..ace3edec94 100644 --- a/backend/.sqlx/query-f04632c3a8e0d7c5b48cdd26a99bb1dc5bd12df221f82405d663b8f15f5c0c3a.json +++ b/backend/.sqlx/query-f37140fcdc721a8b199471b30c2baf124affa2eaf56c801c8dac3264c584f981.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO deployment_metadata (workspace_id, path, app_version, callback_job_ids, deployment_msg) VALUES ($1, $2, $3, $4, $5)\n ON CONFLICT (workspace_id, path) DO UPDATE SET callback_job_ids = $4, deployment_msg = $5", + "query": "INSERT INTO deployment_metadata (workspace_id, path, app_version, callback_job_ids, deployment_msg) VALUES ($1, $2, $3, $4, $5)\n ON CONFLICT (workspace_id, path, app_version) WHERE app_version IS NOT NULL DO UPDATE SET callback_job_ids = $4, deployment_msg = $5", "describe": { "columns": [], "parameters": { @@ -14,5 +14,5 @@ }, "nullable": [] }, - "hash": "f04632c3a8e0d7c5b48cdd26a99bb1dc5bd12df221f82405d663b8f15f5c0c3a" + "hash": "f37140fcdc721a8b199471b30c2baf124affa2eaf56c801c8dac3264c584f981" } diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 40f7e37b75..111a3f2d18 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -eabd52eaa454c37a5beb1f456c1ea649052eb58a +6396854336ae27fb14ccb792d80c31ff614b2afa \ No newline at end of file diff --git a/backend/windmill-api/src/scripts.rs b/backend/windmill-api/src/scripts.rs index de2533a954..db4cb4e1e6 100644 --- a/backend/windmill-api/src/scripts.rs +++ b/backend/windmill-api/src/scripts.rs @@ -45,6 +45,7 @@ use windmill_worker::process_relative_imports; use windmill_common::{ assets::{clear_asset_usage, insert_asset_usage, AssetUsageKind, AssetWithAltAccessType}, error::to_anyhow, + utils::WarnAfterExt, worker::CLOUD_HOSTED, }; @@ -1447,6 +1448,7 @@ async fn raw_script_by_path_internal( w_id ) .fetch_optional(&mut *tx) + .warn_after_seconds(5) .await?; tx.commit().await?; @@ -1457,6 +1459,7 @@ async fn raw_script_by_path_internal( w_id ) .fetch_one(&db) + .warn_after_seconds(5) .await? .unwrap_or(false); diff --git a/backend/windmill-api/src/variables.rs b/backend/windmill-api/src/variables.rs index 919396b7ec..12791753d0 100644 --- a/backend/windmill-api/src/variables.rs +++ b/backend/windmill-api/src/variables.rs @@ -24,7 +24,10 @@ use serde_json::Value; use windmill_audit::audit_oss::{audit_log, AuditAuthorable}; use windmill_audit::ActionKind; use windmill_common::{ - db::UserDB, error::{Error, JsonResult, Result}, utils::{not_found_if_none, paginate, Pagination, StripPath}, variables::{ + db::UserDB, + error::{Error, JsonResult, Result}, + utils::{not_found_if_none, paginate, Pagination, StripPath, WarnAfterExt}, + variables::{ build_crypt, get_reserved_variables, ContextualVariable, CreateVariable, ListableVariable, }, worker::CLOUD_HOSTED, @@ -693,6 +696,7 @@ pub async fn get_value_internal<'c>( LEFT JOIN account ON variable.account = account.id WHERE variable.path = $1 AND variable.workspace_id = $2", path, w_id ) .fetch_optional(&mut *tx) + .warn_after_seconds(5) .await?; let variable = if let Some(variable) = variable_o { diff --git a/backend/windmill-common/src/variables.rs b/backend/windmill-common/src/variables.rs index 1dfa1438d8..740c82366a 100644 --- a/backend/windmill-common/src/variables.rs +++ b/backend/windmill-common/src/variables.rs @@ -7,6 +7,7 @@ */ use crate::error; +use crate::utils::WarnAfterExt; use crate::worker::Connection; use crate::{worker::WORKER_GROUP, BASE_URL, DB}; use chrono::{SecondsFormat, Utc}; @@ -106,6 +107,7 @@ pub async fn get_workspace_key(w_id: &str, db: &DB) -> crate::error::Result