From df9f827d103def27166a767044373bd0754285e2 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 7 May 2025 12:59:33 +0200 Subject: [PATCH] fix: fix azure object storage regression due to object_store regression --- backend/Cargo.lock | 7 ++++--- backend/Cargo.toml | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 2fd1e186e3..77d2170699 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -8453,8 +8453,7 @@ dependencies = [ [[package]] name = "object_store" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ce831b09395f933addbc56d894d889e4b226eba304d4e7adbab591e26daf1e" +source = "git+https://github.com/apache/arrow-rs-object-store?rev=36752c975d4f29e20b57c91f81a10872dcd48ae7#36752c975d4f29e20b57c91f81a10872dcd48ae7" dependencies = [ "async-trait", "base64 0.22.1", @@ -8472,7 +8471,7 @@ dependencies = [ "parking_lot 0.12.3", "percent-encoding", "quick-xml 0.37.5", - "rand 0.8.5", + "rand 0.9.0", "reqwest 0.12.15", "ring 0.17.14", "serde", @@ -8483,6 +8482,8 @@ dependencies = [ "tracing", "url", "walkdir", + "wasm-bindgen-futures", + "web-time", ] [[package]] diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 313fc9c844..a457343a1c 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -96,6 +96,9 @@ java = ["windmill-worker/java"] all_languages = [ "python", "deno_core", "rust", "mysql", "oracledb", "mssql", "bigquery", "csharp", "nu", "php", "java"] +[patch.crates-io] +object_store = { git = "https://github.com/apache/arrow-rs-object-store", rev = "36752c975d4f29e20b57c91f81a10872dcd48ae7" } + [dependencies] anyhow.workspace = true tokio.workspace = true @@ -334,7 +337,7 @@ nkeys = "0.4.4" nu-parser = { version = "0.101.0", default-features = false } datafusion = "47.0.0" -object_store = { version = "0.12.0", features = ["aws", "azure"] } +object_store = { git = "https://github.com/apache/arrow-rs-object-store", rev = "36752c975d4f29e20b57c91f81a10872dcd48ae7", features = ["aws", "azure"] } openidconnect = { version = "4.0.0-rc.1" } aws-config = "^1" aws-sdk-sqs = "1.57.0"