From 98fc2e554f1d3f64c81e9b7b3c3e705354456b63 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Mon, 8 Apr 2024 12:01:57 +0800 Subject: [PATCH 1/2] fix(storage): Don't return empty credential while loading failed Signed-off-by: Xuanwo --- Cargo.lock | 5 +++++ Cargo.toml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 46c889da88f89..c90a2801f5d9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15099,3 +15099,8 @@ dependencies = [ "cc", "pkg-config", ] + +[[patch.unused]] +name = "opendal" +version = "0.45.1" +source = "git+https://github.com/apache/opendal?rev=53377ca#53377ca873c2928ce519ca57a939f89af1a76c47" diff --git a/Cargo.toml b/Cargo.toml index b8b1a8ce41a34..5b2d30af63479 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -268,4 +268,6 @@ async-backtrace = { git = "https://github.com/zhang2014/async-backtrace.git", re z3 = { git = "https://github.com/prove-rs/z3.rs", rev = "247d308" } z3-sys = { git = "https://github.com/prove-rs/z3.rs", rev = "247d308" } geozero = { git = "https://github.com/georust/geozero", rev = "1d78b36" } +# Hot fix for cos, remove this during opendal 0.46 upgrade. +opendal = { git = "https://github.com/apache/opendal", rev = "53377ca" } # proj = { git = "https://github.com/ariesdevil/proj", rev = "51e1c60" } From 59a79af0675a3f3841fa5a12530da8eb5b49cb46 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Mon, 8 Apr 2024 12:10:22 +0800 Subject: [PATCH 2/2] Fix lock Signed-off-by: Xuanwo --- Cargo.lock | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 46c889da88f89..6334fb8270a26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9675,9 +9675,8 @@ dependencies = [ [[package]] name = "opendal" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3350be0d4ba326017ce22c98a9e94d21b069160fcd95bbe6c2555dac4e93c47a" +version = "0.45.1" +source = "git+https://github.com/apache/opendal?rev=53377ca#53377ca873c2928ce519ca57a939f89af1a76c47" dependencies = [ "anyhow", "async-backtrace", @@ -9700,7 +9699,7 @@ dependencies = [ "prometheus", "prometheus-client", "prost 0.11.9", - "quick-xml 0.30.0", + "quick-xml 0.31.0", "reqsign", "reqwest", "serde", @@ -11181,16 +11180,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "quick-xml" version = "0.31.0"