chore(deps): bump dependencies (risingwavelabs#3725)

Signed-off-by: Alex Chi <iskyzh@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
nasnoisaac · Jul 7, 2022 · 07f282b · 07f282b
1 parent 95586c8
commit 07f282b
Show file tree

Hide file tree

Showing 8 changed files with 247 additions and 247 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml
@@ -12,7 +12,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] }
 itertools = "0.10"
 log = "0.4"
 madsim = "=0.2.0-alpha.3"
-moka = { version = "0.8", features = ["future"] }
+moka = { version = "0.9", features = ["future"] }
 prometheus = { version = "0.13", features = ["process"] }
 rand = "0.8"
 risingwave_common = { path = "../common" }

diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
@@ -7,13 +7,13 @@ version = "0.1.10"
 anyhow = "1"
 async-stream = "0.3"
 async-trait = "0.1"
-aws-config = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-sdk-kinesis = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-sdk-s3 = { version = "0.12", default-features = false, features = ["rt-tokio","native-tls"] }
-aws-sdk-sqs = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-smithy-http = "0.42"
-aws-smithy-types = "0.42"
-aws-types = { version = "0.12", features = ["hardcoded-credentials"] }
+aws-config = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-sdk-kinesis = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-sdk-s3 = { version = "0.15", default-features = false, features = ["rt-tokio","native-tls"] }
+aws-sdk-sqs = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-smithy-http = "0.45"
+aws-smithy-types = "0.45"
+aws-types = { version = "0.15", features = ["hardcoded-credentials"] }
 byteorder = "1"
 bytes = { version = "1", features = ["serde"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }

diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml
@@ -6,12 +6,12 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1"
-aws-config = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-endpoint = { version = "0.12", default-features = false }
-aws-sdk-s3 = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-smithy-http = "0.42"
-aws-smithy-types = "0.42"
-aws-types = { version = "0.12", features = ["hardcoded-credentials"] }
+aws-config = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-endpoint = { version = "0.15", default-features = false }
+aws-sdk-s3 = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-smithy-http = "0.45"
+aws-smithy-types = "0.45"
+aws-types = { version = "0.15", features = ["hardcoded-credentials"] }
 bytes = { version = "1", features = ["serde"] }
 fail = "0.5"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }

diff --git a/src/object_store/src/object/error.rs b/src/object_store/src/object/error.rs
@@ -67,6 +67,10 @@ impl ObjectError {
     pub fn disk(msg: String, err: io::Error) -> Self {
         ObjectErrorInner::Disk { msg, inner: err }.into()
     }
+
+    pub fn s3(err: impl Into<BoxedError>) -> Self {
+        ObjectErrorInner::S3(err.into()).into()
+    }
 }
 
 impl<E> From<aws_smithy_http::result::SdkError<E>> for ObjectError

diff --git a/src/rpc_client/Cargo.toml b/src/rpc_client/Cargo.toml
@@ -9,7 +9,7 @@ async-trait = "0.1"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 log = "0.4"
 madsim = "=0.2.0-alpha.3"
-moka = { version = "0.8", features = ["future"] }
+moka = { version = "0.9", features = ["future"] }
 paste = "1"
 risingwave_common = { path = "../common" }
 risingwave_hummock_sdk = { path = "../storage/hummock_sdk" }

diff --git a/src/source/Cargo.toml b/src/source/Cargo.toml
@@ -8,8 +8,8 @@ anyhow = "1"
 apache-avro = { git = "https://github.com/singularity-data/avro", branch = "master", features = ["snappy", "zstandard", "bzip", "xz"] }
 async-stream = "0.3"
 async-trait = "0.1"
-aws-config = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-sdk-s3 = { version = "0.12", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-config = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-sdk-s3 = { version = "0.15", default-features = false, features = ["rt-tokio", "native-tls"] }
 byteorder = "1"
 bytes = "1"
 chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }

diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
@@ -32,7 +32,7 @@ lz4 = "1.23.1"
 madsim = "=0.2.0-alpha.3"
 memcomparable = { path = "../utils/memcomparable" }
 minstant = "0.1"
-moka = { version = "0.8", features = ["future"] }
+moka = { version = "0.9", features = ["future"] }
 nix = { version = "0.24.1", features = ["fs"] }
 num-integer = "0.1"
 num-traits = "0.2"